diff options
| author | Yong He <yonghe@outlook.com> | 2021-12-09 10:46:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 10:46:41 -0800 |
| commit | 1c99a986ae12a3f1ce4cee86191052183d37208a (patch) | |
| tree | e9903d1e569badef813e3f5f33696683bd34f3b0 /examples/ray-tracing-pipeline/main.cpp | |
| parent | 4ca37fea2829ad9c623b94d77bb0311f76ad0971 (diff) | |
Remove `PipelineType` from gfx header. (#2051)
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'examples/ray-tracing-pipeline/main.cpp')
| -rw-r--r-- | examples/ray-tracing-pipeline/main.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/examples/ray-tracing-pipeline/main.cpp b/examples/ray-tracing-pipeline/main.cpp index f83025b52..9ae44a3fc 100644 --- a/examples/ray-tracing-pipeline/main.cpp +++ b/examples/ray-tracing-pipeline/main.cpp @@ -155,9 +155,7 @@ void diagnoseIfNeeded(slang::IBlob* diagnosticsBlob) // Load and compile shader code from souce. gfx::Result loadShaderProgram( - gfx::IDevice* device, - gfx::PipelineType pipelineType, - gfx::IShaderProgram** outProgram) + gfx::IDevice* device, bool isRayTracingPipeline, gfx::IShaderProgram** outProgram) { ComPtr<slang::ISession> slangSession; slangSession = device->getSlangSession(); @@ -170,7 +168,7 @@ gfx::Result loadShaderProgram( Slang::List<slang::IComponentType*> componentTypes; componentTypes.add(module); - if (pipelineType == PipelineType::RayTracing) + if (isRayTracingPipeline) { ComPtr<slang::IEntryPoint> entryPoint; SLANG_RETURN_ON_FAIL(module->findEntryPointByName("rayGenShader", entryPoint.writeRef())); @@ -203,7 +201,6 @@ gfx::Result loadShaderProgram( SLANG_RETURN_ON_FAIL(result); gfx::IShaderProgram::Desc programDesc = {}; - programDesc.pipelineType = pipelineType; programDesc.slangProgram = linkedProgram; SLANG_RETURN_ON_FAIL(device->createProgram(programDesc, outProgram)); @@ -512,7 +509,7 @@ Slang::Result initialize() return SLANG_FAIL; ComPtr<IShaderProgram> shaderProgram; - SLANG_RETURN_ON_FAIL(loadShaderProgram(gDevice, PipelineType::Graphics, shaderProgram.writeRef())); + SLANG_RETURN_ON_FAIL(loadShaderProgram(gDevice, false, shaderProgram.writeRef())); GraphicsPipelineStateDesc desc; desc.inputLayout = inputLayout; desc.program = shaderProgram; @@ -523,7 +520,7 @@ Slang::Result initialize() ComPtr<IShaderProgram> rayTracingProgram; SLANG_RETURN_ON_FAIL( - loadShaderProgram(gDevice, PipelineType::RayTracing, rayTracingProgram.writeRef())); + loadShaderProgram(gDevice, true, rayTracingProgram.writeRef())); RayTracingPipelineStateDesc rtpDesc = {}; rtpDesc.program = rayTracingProgram; rtpDesc.hitGroupCount = 2; |