summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/gpu-printing/main.cpp1
-rw-r--r--examples/model-viewer/main.cpp1
-rw-r--r--examples/ray-tracing-pipeline/main.cpp11
-rw-r--r--examples/ray-tracing/main.cpp12
-rw-r--r--examples/shader-object/main.cpp1
-rw-r--r--examples/shader-toy/main.cpp1
-rw-r--r--examples/triangle/main.cpp1
7 files changed, 8 insertions, 20 deletions
diff --git a/examples/gpu-printing/main.cpp b/examples/gpu-printing/main.cpp
index 03ab5b51f..f39c56c9b 100644
--- a/examples/gpu-printing/main.cpp
+++ b/examples/gpu-printing/main.cpp
@@ -73,7 +73,6 @@ ComPtr<gfx::IShaderProgram> loadComputeProgram(slang::IModule* slangModule, char
gGPUPrinting.loadStrings(linkedProgram->getLayout());
gfx::IShaderProgram::Desc programDesc = {};
- programDesc.pipelineType = gfx::PipelineType::Compute;
programDesc.slangProgram = linkedProgram;
auto shaderProgram = gDevice->createProgram(programDesc);
diff --git a/examples/model-viewer/main.cpp b/examples/model-viewer/main.cpp
index 76b8fca05..bd8e2ad2f 100644
--- a/examples/model-viewer/main.cpp
+++ b/examples/model-viewer/main.cpp
@@ -108,7 +108,6 @@ struct RendererContext
// We can create a `gfx::IShaderProgram` object from `composedProgram`
// so it may be used by the graphics layer.
gfx::IShaderProgram::Desc programDesc = {};
- programDesc.pipelineType = gfx::PipelineType::Graphics;
programDesc.slangProgram = composedProgram.get();
shaderProgram = device->createProgram(programDesc);
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;
diff --git a/examples/ray-tracing/main.cpp b/examples/ray-tracing/main.cpp
index 2d947e567..1285be866 100644
--- a/examples/ray-tracing/main.cpp
+++ b/examples/ray-tracing/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 isComputePipeline, 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::Compute)
+ if (isComputePipeline)
{
ComPtr<slang::IEntryPoint> computeEntryPoint;
SLANG_RETURN_ON_FAIL(module->findEntryPointByName("computeMain", computeEntryPoint.writeRef()));
@@ -195,7 +193,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));
@@ -504,7 +501,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;
@@ -514,8 +511,7 @@ Slang::Result initialize()
return SLANG_FAIL;
ComPtr<IShaderProgram> computeProgram;
- SLANG_RETURN_ON_FAIL(
- loadShaderProgram(gDevice, PipelineType::Compute, computeProgram.writeRef()));
+ SLANG_RETURN_ON_FAIL(loadShaderProgram(gDevice, true, computeProgram.writeRef()));
ComputePipelineStateDesc computeDesc;
computeDesc.program = computeProgram;
gRenderPipelineState = gDevice->createComputePipelineState(computeDesc);
diff --git a/examples/shader-object/main.cpp b/examples/shader-object/main.cpp
index 14835f0c8..eaf56cc00 100644
--- a/examples/shader-object/main.cpp
+++ b/examples/shader-object/main.cpp
@@ -120,7 +120,6 @@ Result loadShaderProgram(
// We can create a `gfx::IShaderProgram` object from `composedProgram`
// so it may be used by the graphics layer.
gfx::IShaderProgram::Desc programDesc = {};
- programDesc.pipelineType = gfx::PipelineType::Compute;
programDesc.slangProgram = composedProgram.get();
auto shaderProgram = device->createProgram(programDesc);
diff --git a/examples/shader-toy/main.cpp b/examples/shader-toy/main.cpp
index e4e2cafcc..facaeb75f 100644
--- a/examples/shader-toy/main.cpp
+++ b/examples/shader-toy/main.cpp
@@ -263,7 +263,6 @@ Result loadShaderProgram(gfx::IDevice* device, ComPtr<gfx::IShaderProgram>& outS
SLANG_RETURN_ON_FAIL(result);
gfx::IShaderProgram::Desc programDesc = {};
- programDesc.pipelineType = gfx::PipelineType::Graphics;
programDesc.slangProgram = linkedProgram.get();
auto shaderProgram = device->createProgram(programDesc);
outShaderProgram = shaderProgram;
diff --git a/examples/triangle/main.cpp b/examples/triangle/main.cpp
index f182e0a0a..51d355e50 100644
--- a/examples/triangle/main.cpp
+++ b/examples/triangle/main.cpp
@@ -181,7 +181,6 @@ gfx::Result loadShaderProgram(
// program representation.
//
gfx::IShaderProgram::Desc programDesc = {};
- programDesc.pipelineType = gfx::PipelineType::Graphics;
programDesc.slangProgram = linkedProgram;
SLANG_RETURN_ON_FAIL(device->createProgram(programDesc, outProgram));
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-02 13:49:25 +0000