display reconstructed (face) normals when per-vertex aren't available

Author: devsh

12_MeshLoaders/main.cpp

@@ -17,7 +17,7 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 	public:
 		inline MeshLoadersApp(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD)
 			: IApplicationFramework(_localInputCWD, _localOutputCWD, _sharedInputCWD, _sharedOutputCWD),
-			device_base_t({1280,720}, EF_UNKNOWN, _localInputCWD, _localOutputCWD, _sharedInputCWD, _sharedOutputCWD) {}
+			device_base_t({1280,720}, EF_D32_SFLOAT, _localInputCWD, _localOutputCWD, _sharedInputCWD, _sharedOutputCWD) {}
 
 		inline bool onAppInitialized(smart_refctd_ptr<ISystem>&& system) override
 		{

common/include/nbl/examples/geometry/CSimpleDebugRenderer.hpp

@@ -161,7 +161,7 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 
 			// create pipeline layout
 			const SPushConstantRange ranges[] = {{
-				.stageFlags = hlsl::ShaderStage::ESS_VERTEX,
+				.stageFlags = hlsl::ShaderStage::ESS_VERTEX|hlsl::ShaderStage::ESS_FRAGMENT,
 				.offset = 0,
 				.size = sizeof(SInstance::SPushConstants),
 			}};
@@ -386,7 +386,7 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 				const auto* geo = instance.packedGeo;
 				cmdbuf->bindGraphicsPipeline(geo->pipeline.get());
 				const auto pc = instance.computePushConstants(viewParams);
-				cmdbuf->pushConstants(layout,hlsl::ShaderStage::ESS_VERTEX,0,sizeof(pc),&pc);
+				cmdbuf->pushConstants(layout,hlsl::ShaderStage::ESS_VERTEX|hlsl::ShaderStage::ESS_FRAGMENT,0,sizeof(pc),&pc);
 				if (geo->indexBuffer)
 				{
 					cmdbuf->bindIndexBuffer(geo->indexBuffer,geo->indexType);

common/include/nbl/examples/geometry/SPushConstants.hlsl

@@ -22,10 +22,7 @@ struct SInstanceMatrices
 
 struct SPushConstants
 {
-	// no idea if DXC still has this bug with Push Constant static variables
-#ifndef __HLSL_VERSiON
 	NBL_CONSTEXPR_STATIC_INLINE uint32_t DescriptorCount = 255;
-#endif
 
 	SInstanceMatrices matrices;
 	uint32_t positionView : 11;

common/src/nbl/examples/geometry/shaders/unified.hlsl

@@ -4,34 +4,47 @@ using namespace nbl::hlsl;
 using namespace nbl::hlsl::examples::geometry_creator_scene;
 
 // for dat sweet programmable pulling
-[[vk::binding(0)]] Buffer<float32_t4> utbs[/*SPushConstants::DescriptorCount*/255];
+[[vk::binding(0)]] Buffer<float32_t4> utbs[SPushConstants::DescriptorCount];
 
 //
 [[vk::push_constant]] SPushConstants pc;
 
 //
 struct SInterpolants
 {
-	float32_t4 position : SV_Position;
-	float32_t3 meta : COLOR0;
+	float32_t4 ndc : SV_Position;
+	float32_t3 meta : COLOR1;
 };
 #include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
 
+float32_t3 reconstructGeometricNormal(float32_t3 pos)
+{
+    const float32_t2x3 dPos_dScreen = float32_t2x3(
+        ddx(pos),
+        ddy(pos)
+    );
+    return cross(dPos_dScreen[0],dPos_dScreen[1]);
+}
+
 //
 [shader("vertex")]
 SInterpolants BasicVS(uint32_t VertexIndex : SV_VertexID)
 {
     const float32_t3 position = utbs[pc.positionView][VertexIndex].xyz;
 
     SInterpolants output;
-    output.position = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
-    output.meta = mul(pc.matrices.normal,utbs[pc.normalView][VertexIndex].xyz);
+    output.ndc = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
+    if (pc.normalView<SPushConstants::DescriptorCount)
+        output.meta = mul(pc.matrices.normal,utbs[pc.normalView][VertexIndex].xyz);
+    else
+        output.meta = mul(inverse(transpose(pc.matrices.normal)),position);
     return output;
 }
 [shader("pixel")]
 float32_t4 BasicFS(SInterpolants input) : SV_Target0
 {
-    return float32_t4(normalize(input.meta)*0.5f+promote<float32_t3>(0.5f),1.f);
+    const float32_t3 normal = pc.normalView<SPushConstants::DescriptorCount ? input.meta:reconstructGeometricNormal(input.meta);
+    return float32_t4(normalize(normal)*0.5f+promote<float32_t3>(0.5f),1.f);
 }
 
 // TODO: do smooth normals on the cone
@@ -41,17 +54,13 @@ SInterpolants ConeVS(uint32_t VertexIndex : SV_VertexID)
     const float32_t3 position = utbs[pc.positionView][VertexIndex].xyz;
 
     SInterpolants output;
-    output.position = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
+    output.ndc = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
     output.meta = mul(inverse(transpose(pc.matrices.normal)),position);
     return output;
 }
 [shader("pixel")]
 float32_t4 ConeFS(SInterpolants input) : SV_Target0
 {
-    const float32_t2x3 dViewPos_dScreen = float32_t2x3(
-        ddx(input.meta),
-        ddy(input.meta)
-    );
-    const float32_t3 normal = cross(dViewPos_dScreen[0],dViewPos_dScreen[1]);
+    const float32_t3 normal = reconstructGeometricNormal(input.meta);
     return float32_t4(normalize(normal)*0.5f+promote<float32_t3>(0.5f),1.f);
 }