Fix compile error for example 23 and 29

Author: kevyuu

23_Arithmetic2UnitTest/main.cpp

@@ -157,7 +157,7 @@ class Workgroup2ScanTestApp final : public application_templates::BasicMultiQueu
 				exit(-1);
 			}
 			auto firstAssetInBundle = bundle.getContents()[0];
-			return smart_refctd_ptr_static_cast<ICPUShader>(firstAssetInBundle);
+			return smart_refctd_ptr_static_cast<IShader>(firstAssetInBundle);
 		};
 
 		auto subgroupTestSource = getShaderSource("app_resources/testSubgroup.comp.hlsl");
@@ -263,26 +263,26 @@ class Workgroup2ScanTestApp final : public application_templates::BasicMultiQueu
 	}
 
 	// create pipeline (specialized every test) [TODO: turn into a future/async]
-	smart_refctd_ptr<IGPUComputePipeline> createPipeline(const ICPUShader* overridenUnspecialized, const uint8_t subgroupSizeLog2)
+	smart_refctd_ptr<IGPUComputePipeline> createPipeline(const IShader* overridenUnspecialized, const uint8_t subgroupSizeLog2)
 	{
-		auto shader = m_device->createShader(overridenUnspecialized);
+		auto shader = m_device->compileShader({ overridenUnspecialized });
 		IGPUComputePipeline::SCreationParams params = {};
 		params.layout = pipelineLayout.get();
 		params.shader = {
-			.entryPoint = "main",
 			.shader = shader.get(),
+			.entryPoint = "main",
+			.requiredSubgroupSize = static_cast<IPipelineBase::SUBGROUP_SIZE>(subgroupSizeLog2),
 			.entries = nullptr,
-			.requiredSubgroupSize = static_cast<IGPUShader::SSpecInfo::SUBGROUP_SIZE>(subgroupSizeLog2),
-			.requireFullSubgroups = true
 		};
+		params.cached.requireFullSubgroups = true;
 		core::smart_refctd_ptr<IGPUComputePipeline> pipeline;
 		if (!m_device->createComputePipelines(m_spirv_isa_cache.get(),{&params,1},&pipeline))
 			return nullptr;
 		return pipeline;
 	}
 
 	template<template<class> class Arithmetic, bool WorkgroupTest>
-	bool runTest(const smart_refctd_ptr<const ICPUShader>& source, const uint32_t elementCount, const uint8_t subgroupSizeLog2, const uint32_t workgroupSize, bool useNative, uint32_t itemsPerWG, uint32_t itemsPerInvoc = 1u)
+	bool runTest(const smart_refctd_ptr<const IShader>& source, const uint32_t elementCount, const uint8_t subgroupSizeLog2, const uint32_t workgroupSize, bool useNative, uint32_t itemsPerWG, uint32_t itemsPerInvoc = 1u)
 	{
 		std::string arith_name = Arithmetic<arithmetic::bit_xor<float>>::name;
 		const uint32_t workgroupSizeLog2 = hlsl::findMSB(workgroupSize);
@@ -305,7 +305,7 @@ class Workgroup2ScanTestApp final : public application_templates::BasicMultiQueu
 		auto* includeFinder = compiler->getDefaultIncludeFinder();
 		options.preprocessorOptions.includeFinder = includeFinder;
 
-		smart_refctd_ptr<ICPUShader> overriddenUnspecialized;
+		smart_refctd_ptr<IShader> overriddenUnspecialized;
 		if constexpr (WorkgroupTest)
 		{
 			hlsl::workgroup2::SArithmeticConfiguration wgConfig;

29_Arithmetic2Bench/main.cpp

@@ -346,12 +346,12 @@ class ArithmeticBenchApp final : public examples::SimpleWindowedApplication, pub
 				exit(-1);
 			}
 			auto firstAssetInBundle = bundle.getContents()[0];
-			return smart_refctd_ptr_static_cast<ICPUShader>(firstAssetInBundle);
+			return smart_refctd_ptr_static_cast<IShader>(firstAssetInBundle);
 		};
 
 		// for each workgroup size (manually adjust items per invoc, operation else uses up a lot of ram)
 		const auto MaxSubgroupSize = m_physicalDevice->getLimits().maxSubgroupSize;
-		smart_refctd_ptr<ICPUShader> shaderSource;
+		smart_refctd_ptr<IShader> shaderSource;
 		if constexpr (DoWorkgroupBenchmarks)
 			shaderSource = getShaderSource("app_resources/benchmarkWorkgroup.comp.hlsl");
 		else
@@ -496,18 +496,18 @@ class ArithmeticBenchApp final : public examples::SimpleWindowedApplication, pub
 
 private:
 	// create pipeline (specialized every test) [TODO: turn into a future/async]
-	smart_refctd_ptr<IGPUComputePipeline> createPipeline(const ICPUShader* overridenUnspecialized, const IGPUPipelineLayout* layout, const uint8_t subgroupSizeLog2)
+	smart_refctd_ptr<IGPUComputePipeline> createPipeline(const IShader* overridenUnspecialized, const IGPUPipelineLayout* layout, const uint8_t subgroupSizeLog2)
 	{
-		auto shader = m_device->createShader(overridenUnspecialized);
+		auto shader = m_device->compileShader({ overridenUnspecialized });
 		IGPUComputePipeline::SCreationParams params = {};
 		params.layout = layout;
 		params.shader = {
-			.entryPoint = "main",
 			.shader = shader.get(),
+			.entryPoint = "main",
+			.requiredSubgroupSize = static_cast<IPipelineBase::SUBGROUP_SIZE>(subgroupSizeLog2),
 			.entries = nullptr,
-			.requiredSubgroupSize = static_cast<IGPUShader::SSpecInfo::SUBGROUP_SIZE>(subgroupSizeLog2),
-			.requireFullSubgroups = true
 		};
+		params.cached.requireFullSubgroups = true;
 		core::smart_refctd_ptr<IGPUComputePipeline> pipeline;
 		if (!m_device->createComputePipelines(nullptr,{&params,1},&pipeline))
 			return nullptr;
@@ -522,7 +522,7 @@ class ArithmeticBenchApp final : public examples::SimpleWindowedApplication, pub
 	};
 
 	template<bool WorkgroupBench>
-	BenchmarkSet createBenchmarkPipelines(const smart_refctd_ptr<const ICPUShader>&source, const IGPUPipelineLayout* layout, const uint32_t elementCount, const std::string& arith_name, const uint8_t subgroupSizeLog2, const uint32_t workgroupSize, uint32_t itemsPerInvoc = 1u, uint32_t numLoops = 8u)
+	BenchmarkSet createBenchmarkPipelines(const smart_refctd_ptr<const IShader>&source, const IGPUPipelineLayout* layout, const uint32_t elementCount, const std::string& arith_name, const uint8_t subgroupSizeLog2, const uint32_t workgroupSize, uint32_t itemsPerInvoc = 1u, uint32_t numLoops = 8u)
 	{
 		auto compiler = make_smart_refctd_ptr<asset::CHLSLCompiler>(smart_refctd_ptr(m_system));
 		CHLSLCompiler::SOptions options = {};
@@ -547,7 +547,7 @@ class ArithmeticBenchApp final : public examples::SimpleWindowedApplication, pub
 		hlsl::workgroup2::SArithmeticConfiguration wgConfig;
 	    wgConfig.init(workgroupSizeLog2, subgroupSizeLog2, itemsPerInvoc);
 		const uint32_t itemsPerWG = wgConfig.VirtualWorkgroupSize * wgConfig.ItemsPerInvocation_0;
-		smart_refctd_ptr<ICPUShader> overriddenUnspecialized;
+		smart_refctd_ptr<IShader> overriddenUnspecialized;
 		if constexpr (WorkgroupBench)
 		{
 			const std::string definitions[4] = {