From 1c99a986ae12a3f1ce4cee86191052183d37208a Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Thu, 9 Dec 2021 10:46:41 -0800
Subject: Remove `PipelineType` from gfx header. (#2051)

Co-authored-by: Yong He <yhe@nvidia.com>
---
 tools/render-test/render-test-main.cpp | 26 +++++++-------------------
 tools/render-test/slang-support.cpp    |  5 +----
 tools/render-test/slang-support.h      |  2 --
 3 files changed, 8 insertions(+), 25 deletions(-)

(limited to 'tools/render-test')

diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
index 78fa149e8..16a725f2b 100644
--- a/tools/render-test/render-test-main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -80,6 +80,13 @@ struct ShaderOutputPlan
     List<Item> items;
 };
 
+enum class PipelineType
+{
+    Graphics,
+    Compute,
+    RayTracing,
+};
+
 class RenderTestApp
 {
 public:
@@ -1229,25 +1236,6 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi
             break;
     }
 
-    switch( options.shaderType )
-    {
-    case Options::ShaderProgramType::Graphics:
-    case Options::ShaderProgramType::GraphicsCompute:
-        input.pipelineType = PipelineType::Graphics;
-        break;
-
-    case Options::ShaderProgramType::Compute:
-        input.pipelineType = PipelineType::Compute;
-        break;
-
-    case Options::ShaderProgramType::RayTracing:
-        input.pipelineType = PipelineType::RayTracing;
-        break;
-
-    default:
-        break;
-    }
-
     if (options.sourceLanguage != SLANG_SOURCE_LANGUAGE_UNKNOWN)
     {
         input.sourceLanguage = options.sourceLanguage;
diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp
index f479218f7..8240212ec 100644
--- a/tools/render-test/slang-support.cpp
+++ b/tools/render-test/slang-support.cpp
@@ -51,18 +51,15 @@ gfx::StageType translateStage(SlangStage slangStage)
 }
 
 void ShaderCompilerUtil::Output::set(
-    PipelineType                        pipelineType,
     slang::IComponentType*              inSlangProgram)
 {
     slangProgram = inSlangProgram;
-    desc.pipelineType = pipelineType;
     desc.slangProgram = inSlangProgram;
 }
 
 void ShaderCompilerUtil::Output::reset()
 {
     {
-        desc.pipelineType = PipelineType::Unknown;
         desc.slangProgram = nullptr;
     }
 
@@ -266,7 +263,7 @@ void ShaderCompilerUtil::Output::reset()
             outDiagnostic.writeRef());
         linkedSlangProgram = newProgram;
     }
-    out.set(input.pipelineType, linkedSlangProgram);
+    out.set(linkedSlangProgram);
     return SLANG_OK;
 }
 
diff --git a/tools/render-test/slang-support.h b/tools/render-test/slang-support.h
index 7770bada4..9e06ef77c 100644
--- a/tools/render-test/slang-support.h
+++ b/tools/render-test/slang-support.h
@@ -57,14 +57,12 @@ struct ShaderCompilerUtil
         SlangCompileTarget          target;
         SlangSourceLanguage         sourceLanguage;
         SlangPassThrough            passThrough;
-        PipelineType                pipelineType = PipelineType::Unknown;
         Slang::String               profile;
     };
 
     struct Output
     {
         void set(
-            PipelineType                        pipelineType,
             slang::IComponentType*              slangProgram);
         void reset();
         ~Output()
-- 
cgit v1.2.3