62_CAD: now it works

Author: alichraghi

62_CAD/main.cpp

@@ -861,8 +861,8 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 			pipelineLayout = m_device->createPipelineLayout({}, core::smart_refctd_ptr(descriptorSetLayout0), core::smart_refctd_ptr(descriptorSetLayout1), nullptr, nullptr);
 		}
 
-		smart_refctd_ptr<IGPUShader> mainPipelineShader = {};
-		smart_refctd_ptr<IGPUShader> mainPipelineResolveAlphasShader = {};
+		smart_refctd_ptr<IGPUShader> mainPipelineFragmentShaders = {};
+		smart_refctd_ptr<IGPUShader> mainPipelineVertexShader = {};
 		std::array<smart_refctd_ptr<IGPUShader>, 2u> geoTexturePipelineShaders = {};
 		{
 			smart_refctd_ptr<IShaderCompiler::CCache> shaderReadCache = nullptr;
@@ -916,10 +916,12 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 					return m_device->createShader({ cpuShader.get(), nullptr, shaderReadCache.get(), shaderWriteCache.get() });
 				};
 
-			mainPipelineShader = loadCompileAndCreateShader("../shaders/main_pipeline/vs_fs.hlsl", IShader::E_SHADER_STAGE::ESS_ALL_OR_LIBRARY);
-			mainPipelineResolveAlphasShader = loadCompileAndCreateShader("../shaders/main_pipeline/resolve_alphas.hlsl", IShader::E_SHADER_STAGE::ESS_FRAGMENT);
+			mainPipelineFragmentShaders = loadCompileAndCreateShader("../shaders/main_pipeline/fragment.hlsl", IShader::E_SHADER_STAGE::ESS_ALL_OR_LIBRARY);
+			mainPipelineVertexShader = loadCompileAndCreateShader("../shaders/main_pipeline/vertex_shader.hlsl", IShader::E_SHADER_STAGE::ESS_VERTEX);
 			geoTexturePipelineShaders[0] = loadCompileAndCreateShader(GeoTextureRenderer::VertexShaderRelativePath, IShader::E_SHADER_STAGE::ESS_VERTEX);
 			geoTexturePipelineShaders[1] = loadCompileAndCreateShader(GeoTextureRenderer::FragmentShaderRelativePath, IShader::E_SHADER_STAGE::ESS_FRAGMENT);
+
+			mainPipelineFragmentShaders->setShaderStage(IShader::E_SHADER_STAGE::ESS_FRAGMENT);
 
 			core::smart_refctd_ptr<system::IFile> shaderWriteCacheFile;
 			{
@@ -963,7 +965,7 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 			// Load FSTri Shader
 			ext::FullScreenTriangle::ProtoPipeline fsTriangleProtoPipe(m_assetMgr.get(),m_device.get(),m_logger.get());
 
-			const IGPUShader::SSpecInfo fragSpec = { .shader = mainPipelineResolveAlphasShader.get() };
+			const IGPUShader::SSpecInfo fragSpec = { .entryPoint = "resolveAlphaMain", .shader = mainPipelineFragmentShaders.get() };
 
 			resolveAlphaGraphicsPipeline = fsTriangleProtoPipe.createPipeline(fragSpec, pipelineLayout.get(), compatibleRenderPass.get(), 0u, blendParams);
 			if (!resolveAlphaGraphicsPipeline)
@@ -976,12 +978,12 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 
 			IGPUShader::SSpecInfo specInfo[2] = {
 				{
-					.entryPoint = "vertMain",
-					.shader = mainPipelineShader.get()
+					.entryPoint = "main",
+					.shader = mainPipelineVertexShader.get()
 				},
 				{
 					.entryPoint = "fragMain",
-					.shader = mainPipelineShader.get()
+					.shader = mainPipelineFragmentShaders.get()
 				},
 			};
 

62_CAD/shaders/main_pipeline/vs_fs.hlsl renamed to 62_CAD/shaders/main_pipeline/fragment.hlsl

@@ -1,3 +1,4 @@
-#include "vertex_shader.hlsl"
-#include "fragment_shader.hlsl"
-#include "fragment_shader_debug.hlsl"
+#include "fragment_shader.hlsl"
+#include "fragment_shader_debug.hlsl"
+#include "resolve_alphas.hlsl"
+

62_CAD/shaders/main_pipeline/fragment_shader.hlsl

@@ -398,7 +398,7 @@ float32_t4 calculateFinalColor<true>(const uint2 fragCoord, const float localAlp
 
 [[vk::spvexecutionmode(spv::ExecutionModePixelInterlockOrderedEXT)]]
 [shader("pixel")]
-float4 fragmentMain(PSInput input) : SV_TARGET
+float4 fragMain(PSInput input) : SV_TARGET
 {
     float localAlpha = 0.0f;
     ObjectType objType = input.getObjType();

62_CAD/shaders/main_pipeline/fragment_shader_debug.hlsl

@@ -7,7 +7,7 @@ struct PSInputDebug
 };
 
 [shader("pixel")]
-float4 fragmentDebugMain(PSInputDebug input) : SV_TARGET
+float4 fragDebugMain(PSInputDebug input) : SV_TARGET
 {
     return float4(1.0, 1.0, 1.0, 1.0);
 // return input.color;

62_CAD/shaders/main_pipeline/resolve_alphas.hlsl

@@ -1,5 +1,3 @@
-#pragma shader_stage(fragment)
-
 #include "common.hlsl"
 #include <nbl/builtin/hlsl/spirv_intrinsics/fragment_shader_pixel_interlock.hlsl>
 #include <nbl/builtin/hlsl/jit/device_capabilities.hlsl>
@@ -19,7 +17,6 @@ float32_t4 calculateFinalColor<true>(const uint2 fragCoord)
 {
     float32_t4 color;
 
-    nbl::hlsl::spirv::execution_mode::PixelInterlockOrderedEXT();
     nbl::hlsl::spirv::beginInvocationInterlockEXT();
 
     const uint32_t packedData = pseudoStencil[fragCoord];
@@ -41,7 +38,9 @@ float32_t4 calculateFinalColor<true>(const uint2 fragCoord)
     return color;
 }
 
-float4 main(float4 position : SV_Position) : SV_TARGET
+[[vk::spvexecutionmode(spv::ExecutionModePixelInterlockOrderedEXT)]]
+[shader("pixel")]
+float4 resolveAlphaMain(float4 position : SV_Position) : SV_TARGET
 {
     return calculateFinalColor<nbl::hlsl::jit::device_capabilities::fragmentShaderPixelInterlock>(position.xy);
 }

62_CAD/shaders/main_pipeline/vertex_shader.hlsl

@@ -85,8 +85,7 @@ void dilateHatch<false>(out float2 outOffsetVec, out float2 outUV, const float2
     // Or optionally we could dilate and stuff when we know this hatch is opaque (alpha = 1.0)
 }
 
-[shader("vertex")]
-PSInput vertMain(uint vertexID : SV_VertexID)
+PSInput main(uint vertexID : SV_VertexID)
 {
     const uint vertexIdx = vertexID & 0x3u;
     const uint objectID = vertexID >> 2;