Fix example to use reworked shader spec itnerface

kevyuu · kevyuu · commit b9f3f13bc421 · 2025-06-13T17:16:05.000+07:00
diff --git a/02_HelloCompute/main.cpp b/02_HelloCompute/main.cpp
@@ -169,7 +169,6 @@ class HelloComputeApp final : public nbl::application_templates::MonoSystemMonoL
 					// Theoretically a blob of SPIR-V can contain multiple named entry points and one has to be chosen, in practice most compilers only support outputting one (and glslang used to require it be called "main")
 					params.shader.entryPoint = "main";
 					params.shader.shader = shader.get();
-					params.shader.stage = hlsl::ESS_COMPUTE;
 					// we'll cover the specialization constant API in another example
 					if (!device->createComputePipelines(nullptr,{&params,1},&pipeline))
 						return logFail("Failed to create pipelines (compile & link shaders)!\n");
diff --git a/03_DeviceSelectionAndSharedSources/Testers.h b/03_DeviceSelectionAndSharedSources/Testers.h
@@ -254,10 +254,9 @@ class PredefinedLayoutTester final : public IntrospectionTesterBase
 		bool pplnCreationSuccess[MERGE_TEST_SHADERS_CNT];
 		for (uint32_t i = 0u; i < MERGE_TEST_SHADERS_CNT; ++i)
 		{
-			IPipelineBase::SShaderSpecInfo specInfo;
+			ICPUPipelineBase::SShaderSpecInfo specInfo;
 			specInfo.entryPoint = "main";
-			specInfo.shader = sources[i].get();
-			specInfo.stage = hlsl::ShaderStage::ESS_COMPUTE;
+			specInfo.shader = sources[i];
 			pplnCreationSuccess[i] = static_cast<bool>(introspector[i].createApproximateComputePipelineFromIntrospection(specInfo, core::smart_refctd_ptr<ICPUPipelineLayout>(predefinedPplnLayout)));
 		}
 
diff --git a/03_DeviceSelectionAndSharedSources/main.cpp b/03_DeviceSelectionAndSharedSources/main.cpp
@@ -61,10 +61,9 @@ class DeviceSelectionAndSharedSourcesApp final : public application_templates::M
 		//shaderIntrospection->debugPrint(m_logger.get());
 
 		// We've now skipped the manual creation of a descriptor set layout, pipeline layout
-		IPipelineBase::SShaderSpecInfo specInfo;
+		ICPUPipelineBase::SShaderSpecInfo specInfo;
 		specInfo.entryPoint = "main";
-		specInfo.shader = source.get();
-		specInfo.stage = hlsl::ShaderStage::ESS_COMPUTE;
+		specInfo.shader = source;
 
 		smart_refctd_ptr<nbl::asset::ICPUComputePipeline> cpuPipeline = introspector.createApproximateComputePipelineFromIntrospection(specInfo);
 
diff --git a/05_StreamingAndBufferDeviceAddressApp/main.cpp b/05_StreamingAndBufferDeviceAddressApp/main.cpp
@@ -135,7 +135,6 @@ class StreamingAndBufferDeviceAddressApp final : public application_templates::M
 				params.layout = layout.get();
 				params.shader.shader = shader.get();
 				params.shader.entryPoint = "main";
-				params.shader.stage = hlsl::ShaderStage::ESS_COMPUTE;
 				if (!m_device->createComputePipelines(nullptr,{&params,1},&m_pipeline))
 					return logFail("Failed to create compute pipeline!\n");
 			}
diff --git a/07_StagingAndMultipleQueues/main.cpp b/07_StagingAndMultipleQueues/main.cpp
@@ -311,7 +311,6 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
 			// Theoretically a blob of SPIR-V can contain multiple named entry points and one has to be chosen, in practice most compilers only support outputting one (and glslang used to require it be called "main")
 			params.shader.entryPoint = "main";
 			params.shader.shader = shader.get();
-			params.shader.stage = hlsl::ShaderStage::ESS_COMPUTE;
 			// we'll cover the specialization constant API in another example
 			if (!m_device->createComputePipelines(nullptr,{&params,1},&pipeline))
 				logFailAndTerminate("Failed to create pipelines (compile & link shaders)!\n");
diff --git a/10_CountingSort/main.cpp b/10_CountingSort/main.cpp
@@ -92,10 +92,9 @@ class CountingSortApp final : public application_templates::MonoDeviceApplicatio
 				params.layout = layout.get();
 				params.shader.shader = prefixSumShader.get();
 				params.shader.entryPoint = "main";
-				params.shader.stage = hlsl::ShaderStage::ESS_COMPUTE;
 				params.shader.entries = nullptr;
-				params.shader.requireFullSubgroups = true;
-				params.shader.requiredSubgroupSize = static_cast<IPipelineBase::SShaderSpecInfo::SUBGROUP_SIZE>(5);
+				params.shader.requiredSubgroupSize = static_cast<IPipelineBase::SUBGROUP_SIZE>(5);
+				params.cached.requireFullSubgroups = true;
 				if (!m_device->createComputePipelines(nullptr, { &params,1 }, &prefixSumPipeline))
 					return logFail("Failed to create compute pipeline!\n");
 				params.shader.shader = scatterShader.get();
diff --git a/11_FFT/main.cpp b/11_FFT/main.cpp
@@ -133,9 +133,8 @@ class FFT_Test final : public application_templates::MonoDeviceApplication, publ
 			params.layout = layout.get();
 			params.shader.shader = shader.get();
 			params.shader.entryPoint = "main";
-			params.shader.stage = hlsl::ESS_COMPUTE;
-			params.shader.requiredSubgroupSize = static_cast<IPipelineBase::SShaderSpecInfo::SUBGROUP_SIZE>(hlsl::findMSB(m_physicalDevice->getLimits().maxSubgroupSize));
-			params.shader.requireFullSubgroups = true;
+			params.shader.requiredSubgroupSize = static_cast<IPipelineBase::SUBGROUP_SIZE>(hlsl::findMSB(m_physicalDevice->getLimits().maxSubgroupSize));
+			params.cached.requireFullSubgroups = true;
 			if (!m_device->createComputePipelines(nullptr, { &params,1 }, &m_pipeline))
 				return logFail("Failed to create compute pipeline!\n");
 		}
diff --git a/22_CppCompat/ITester.h b/22_CppCompat/ITester.h
@@ -113,7 +113,6 @@ class ITester
             params.layout = m_pplnLayout.get();
             params.shader.entryPoint = "main";
             params.shader.shader = shader.get();
-            params.shader.stage = shaderStage;
             if (!m_device->createComputePipelines(nullptr, { &params,1 }, &m_pipeline))
                 logFail("Failed to create pipelines (compile & link shaders)!\n");
         }
diff --git a/22_CppCompat/main.cpp b/22_CppCompat/main.cpp
@@ -128,7 +128,6 @@ class CompatibilityTest final : public MonoDeviceApplication, public MonoAssetMa
             params.layout = layout.get();
             params.shader.shader = shader.get();
             params.shader.entryPoint = "main";
-            params.shader.stage = hlsl::ShaderStage::ESS_COMPUTE;
             if (!m_device->createComputePipelines(nullptr, { &params,1 }, &m_pipeline))
                 return logFail("Failed to create compute pipeline!\n");
         }
diff --git a/23_ArithmeticUnitTest/main.cpp b/23_ArithmeticUnitTest/main.cpp
@@ -284,11 +284,10 @@ class ArithmeticUnitTestApp final : public application_templates::BasicMultiQueu
 		params.shader = {
 			.shader = shader.get(),
 			.entryPoint = "main",
-			.stage = hlsl::ESS_COMPUTE,
-			.requiredSubgroupSize = static_cast<IPipelineBase::SShaderSpecInfo::SUBGROUP_SIZE>(subgroupSizeLog2),
-			.requireFullSubgroups = true,
+			.requiredSubgroupSize = static_cast<IPipelineBase::SUBGROUP_SIZE>(subgroupSizeLog2),
 			.entries = nullptr,
 		};
+		params.cached.requireFullSubgroups = true;
 		core::smart_refctd_ptr<IGPUComputePipeline> pipeline;
 		if (!m_device->createComputePipelines(m_spirv_isa_cache.get(),{&params,1},&pipeline))
 			return nullptr;
diff --git a/24_ColorSpaceTest/main.cpp b/24_ColorSpaceTest/main.cpp
@@ -260,10 +260,9 @@ class ColorSpaceTestSampleApp final : public examples::SimpleWindowedApplication
 						.size = sizeof(push_constants_t)
 					};
 					auto layout = m_device->createPipelineLayout({ &range,1 }, nullptr, nullptr, nullptr, core::smart_refctd_ptr(dsLayout));
-					const IPipelineBase::SShaderSpecInfo fragSpec = {
+					const IGPUPipelineBase::SShaderSpecInfo fragSpec = {
 						.shader = fragmentShader.get(),
 						.entryPoint = "main",
-						.stage = ESS_FRAGMENT,
 					};
 					m_pipeline = fsTriProtoPPln.createPipeline(fragSpec, layout.get(), scResources->getRenderpass()/*,default is subpass 0*/);
 					if (!m_pipeline)
diff --git a/26_Blur/main.cpp b/26_Blur/main.cpp
@@ -282,8 +282,7 @@ class BlurApp final : public examples::SimpleWindowedApplication, public applica
 				params.layout = layout.get();
 				params.shader.shader = shader.get();
 				params.shader.entryPoint = "main";
-				params.shader.stage = hlsl::ShaderStage::ESS_COMPUTE;
-				params.shader.requireFullSubgroups = true;
+				params.cached.requireFullSubgroups = true;
 				if (!m_device->createComputePipelines(nullptr, { &params, 1 }, &m_ppln))
 					return logFail("Failed to create Pipeline");
 			}
diff --git a/27_MPMCScheduler/main.cpp b/27_MPMCScheduler/main.cpp
@@ -115,8 +115,7 @@ class MPMCSchedulerApp final : public examples::SimpleWindowedApplication, publi
 				params.layout = layout.get();
 				params.shader.shader = shader.get();
 				params.shader.entryPoint = "main";
-				params.shader.stage = hlsl::ShaderStage::ESS_COMPUTE;
-				params.shader.requireFullSubgroups = true;
+				params.cached.requireFullSubgroups = true;
 				if (!m_device->createComputePipelines(nullptr, { &params, 1 }, &m_ppln))
 					return logFail("Failed to create Pipeline");
 			}
diff --git a/30_ComputeShaderPathTracer/main.cpp b/30_ComputeShaderPathTracer/main.cpp
@@ -351,10 +351,9 @@ class ComputeShaderPathtracer final : public examples::SimpleWindowedApplication
 						params.layout = ptPipelineLayout.get();
 						params.shader.shader = ptShader.get();
 						params.shader.entryPoint = "main";
-						params.shader.stage = ESS_COMPUTE;
 						params.shader.entries = nullptr;
-						params.shader.requireFullSubgroups = true;
-						params.shader.requiredSubgroupSize = static_cast<IPipelineBase::SShaderSpecInfo::SUBGROUP_SIZE>(5);
+						params.cached.requireFullSubgroups = true;
+						params.shader.requiredSubgroupSize = static_cast<IPipelineBase::SUBGROUP_SIZE>(5);
 						if (!m_device->createComputePipelines(nullptr, { &params, 1 }, m_PTPipelines.data() + index)) {
 							return logFail("Failed to create compute pipeline!\n");
 						}
@@ -373,10 +372,9 @@ class ComputeShaderPathtracer final : public examples::SimpleWindowedApplication
 					if (!fragmentShader)
 						return logFail("Failed to Load and Compile Fragment Shader: lumaMeterShader!");
 
-					const IPipelineBase::SShaderSpecInfo fragSpec = {
+					const IGPUPipelineBase::SShaderSpecInfo fragSpec = {
 						.shader = fragmentShader.get(),
 						.entryPoint = "main",
-						.stage = ESS_FRAGMENT,
 					};
 
 					auto presentLayout = m_device->createPipelineLayout(
diff --git a/67_RayQueryGeometry/main.cpp b/67_RayQueryGeometry/main.cpp
@@ -203,7 +203,6 @@ class RayQueryGeometryApp final : public examples::SimpleWindowedApplication, pu
 				params.layout = pipelineLayout.get();
 				params.shader.shader = shader.get();
 				params.shader.entryPoint = "main";
-				params.shader.stage = ESS_COMPUTE;
 				if (!m_device->createComputePipelines(nullptr, { &params, 1 }, &renderPipeline))
 					return logFail("Failed to create compute pipeline");
 			}
diff --git a/common/include/CGeomtryCreatorScene.hpp b/common/include/CGeomtryCreatorScene.hpp
@@ -824,7 +824,6 @@ class ResourceBuilder
 			{
 				SBlendParams blend;
 				SRasterizationParams rasterization;
-				typename Types::graphics_pipeline_t::SCreationParams pipeline;
 			} params;
 				
 			{
@@ -842,28 +841,35 @@ class ResourceBuilder
 
 			params.rasterization.faceCullingMode = EFCM_NONE;
 			{
-				const IPipelineBase::SShaderSpecInfo info [] =
-				{
-					{.shader = scratch.shaders[inGeometry.shadersType].vertex.get(), .entryPoint = "VSMain", .stage = hlsl::ShaderStage::ESS_VERTEX},
-					{.shader = scratch.shaders[inGeometry.shadersType].fragment.get(), .entryPoint = "PSMain", .stage = hlsl::ShaderStage::ESS_FRAGMENT},
-				};
-
-				params.pipeline.layout = scratch.pipelineLayout.get();
-				params.pipeline.shaders = info;
-				params.pipeline.renderpass = scratch.renderpass.get();
-				params.pipeline.cached = { .vertexInput = inGeometry.data.inputParams, .primitiveAssembly = inGeometry.data.assemblyParams, .rasterization = params.rasterization, .blend = params.blend, .subpassIx = 0u };
 
 				obj.indexCount = inGeometry.data.indexCount;
 				obj.indexType = inGeometry.data.indexType;
 
 				// TODO: cache pipeline & try lookup for existing one first maybe
 
 				// similar issue like with shaders again, in this case gpu contructor allows for extra cache parameters + there is no constructor you can use to fire make_smart_refctd_ptr yourself for cpu
-				if constexpr (withAssetConverter)
-					obj.pipeline = ICPUGraphicsPipeline::create(params.pipeline);
+				if constexpr (withAssetConverter) {
+
+					obj.pipeline = ICPUGraphicsPipeline::create(scratch.pipelineLayout.get(), scratch.renderpass.get());
+					obj.pipeline->getCachedCreationParams() = {
+            .vertexInput = inGeometry.data.inputParams, 
+						.primitiveAssembly = inGeometry.data.assemblyParams, 
+						.rasterization = params.rasterization, 
+						.blend = params.blend, 
+						.subpassIx = 0u 
+					};
+					*obj.pipeline->getSpecInfo(hlsl::ESS_VERTEX) = { .shader = scratch.shaders[inGeometry.shadersType].vertex, .entryPoint = "VSMain" };
+					*obj.pipeline->getSpecInfo(hlsl::ESS_FRAGMENT) = { .shader = scratch.shaders[inGeometry.shadersType].fragment, .entryPoint = "PSMain" };
+				}
 				else
 				{
-					const std::array<const IGPUGraphicsPipeline::SCreationParams,1> info = { { params.pipeline } };
+					IGPUGraphicsPipeline::SCreationParams createParams = {};
+          createParams.layout = scratch.pipelineLayout.get();
+          createParams.vertexShader = {.shader = scratch.shaders[inGeometry.shadersType].vertex.get(), .entryPoint = "VSMain" };
+          createParams.fragmentShader = { .shader = scratch.shaders[inGeometry.shadersType].fragment.get(), .entryPoint = "PSMain" };
+          createParams.renderpass = scratch.renderpass.get();
+          createParams.cached = { .vertexInput = inGeometry.data.inputParams, .primitiveAssembly = inGeometry.data.assemblyParams, .rasterization = params.rasterization, .blend = params.blend, .subpassIx = 0u };
+					const std::array<const IGPUGraphicsPipeline::SCreationParams,1> info = { { createParams } };
 					utilities->getLogicalDevice()->createGraphicsPipelines(nullptr, info, &obj.pipeline);
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -254,10 +254,9 @@ class PredefinedLayoutTester final : public IntrospectionTesterBase`
`254`	`254`	`bool pplnCreationSuccess[MERGE_TEST_SHADERS_CNT];`
`255`	`255`	`for (uint32_t i = 0u; i < MERGE_TEST_SHADERS_CNT; ++i)`
`256`	`256`	`{`
`257`		`- IPipelineBase::SShaderSpecInfo specInfo;`
	`257`	`+ ICPUPipelineBase::SShaderSpecInfo specInfo;`
`258`	`258`	`specInfo.entryPoint = "main";`
`259`		`- specInfo.shader = sources[i].get();`
`260`		`- specInfo.stage = hlsl::ShaderStage::ESS_COMPUTE;`
	`259`	`+ specInfo.shader = sources[i];`
`261`	`260`	`pplnCreationSuccess[i] = static_cast<bool>(introspector[i].createApproximateComputePipelineFromIntrospection(specInfo, core::smart_refctd_ptr<ICPUPipelineLayout>(predefinedPplnLayout)));`
`262`	`261`	`}`
`263`	`262`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,6 @@ class StreamingAndBufferDeviceAddressApp final : public application_templates::M`
`135`	`135`	`params.layout = layout.get();`
`136`	`136`	`params.shader.shader = shader.get();`
`137`	`137`	`params.shader.entryPoint = "main";`
`138`		`- params.shader.stage = hlsl::ShaderStage::ESS_COMPUTE;`
`139`	`138`	`if (!m_device->createComputePipelines(nullptr,{&params,1},&m_pipeline))`
`140`	`139`	`return logFail("Failed to create compute pipeline!\n");`
`141`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ class ITester`
`113`	`113`	`params.layout = m_pplnLayout.get();`
`114`	`114`	`params.shader.entryPoint = "main";`
`115`	`115`	`params.shader.shader = shader.get();`
`116`		`- params.shader.stage = shaderStage;`
`117`	`116`	`if (!m_device->createComputePipelines(nullptr, { &params,1 }, &m_pipeline))`
`118`	`117`	`logFail("Failed to create pipelines (compile & link shaders)!\n");`
`119`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,6 @@ class CompatibilityTest final : public MonoDeviceApplication, public MonoAssetMa`
`128`	`128`	`params.layout = layout.get();`
`129`	`129`	`params.shader.shader = shader.get();`
`130`	`130`	`params.shader.entryPoint = "main";`
`131`		`- params.shader.stage = hlsl::ShaderStage::ESS_COMPUTE;`
`132`	`131`	`if (!m_device->createComputePipelines(nullptr, { &params,1 }, &m_pipeline))`
`133`	`132`	`return logFail("Failed to create compute pipeline!\n");`
`134`	`133`	`}`