Remore normal type unknown from demo

Author: kevyuu

67_RayQueryGeometry/app_resources/common.hlsl

@@ -9,7 +9,6 @@ enum NormalType : uint32_t
 {
     NT_R8G8B8A8_SNORM,
     NT_R32G32B32_SFLOAT,
-    NT_UNKNOWN
 };
 
 // we need bitfield support in NBL_HLSL_DECLARE_STRUCT it seems
@@ -19,7 +18,7 @@ struct SGeomInfo
     uint64_t indexBufferAddress;
     uint64_t normalBufferAddress;
 
-    uint32_t normalType : 2;
+    uint32_t normalType : 1;
     uint32_t indexType : 1; // 16 bit, 32 bit
 };
 

67_RayQueryGeometry/app_resources/render.comp.hlsl

@@ -53,7 +53,7 @@ float3 calculateNormals(int primID, SGeomInfo geom, float2 bary)
         }
     }
 
-    if (normalBufferAddress == 0 || normalType == NT_UNKNOWN)
+    if (normalBufferAddress == 0)
     {
         float3 v0 = vk::RawBufferLoad<float3>(vertexBufferAddress + indices[0] * 12);
         float3 v1 = vk::RawBufferLoad<float3>(vertexBufferAddress + indices[1] * 12);

67_RayQueryGeometry/main.cpp

@@ -847,19 +847,9 @@ class RayQueryGeometryApp final : public SimpleWindowedApplication, public Built
 					const auto& normalView = gpuPolygon->getNormalView();
 					const uint64_t normalBufferAddress = normalView ? normalView.src.buffer->getDeviceAddress() + normalView.src.offset : 0;
 
-					const auto normalType = [&normalView]
-					{
-            if (!normalView) return NT_UNKNOWN;
-						switch (normalView.composed.format)
-						{
-						case EF_R32G32B32_SFLOAT:
-							return NT_R32G32B32_SFLOAT;
-						case EF_R8G8B8A8_SNORM:
-							return NT_R8G8B8A8_SNORM;
-						default:
-							return NT_UNKNOWN;
-						}
-					}();
+					auto normalType = NT_R32G32B32_SFLOAT;
+					if (normalView && normalView.composed.format == EF_R8G8B8A8_SNORM)
+						normalType = NT_R8G8B8A8_SNORM;
 
 					const auto& indexBufferBinding = gpuTriangles.indexData;
 					auto& geomInfo = geomInfos[i];

71_RayTracingPipeline/app_resources/common.hlsl

@@ -90,7 +90,6 @@ enum NormalType : uint32_t
 {
     NT_R8G8B8A8_SNORM,
     NT_R32G32B32_SFLOAT,
-    NT_UNKNOWN
 };
 
 struct STriangleGeomInfo
@@ -100,7 +99,7 @@ struct STriangleGeomInfo
     uint64_t indexBufferAddress;
     uint64_t normalBufferAddress;
 
-    uint32_t normalType : 2;
+    uint32_t normalType : 1;
     uint32_t indexType : 1; // 16 bit, 32 bit
 
 };

71_RayTracingPipeline/app_resources/raytrace.rchit.hlsl

@@ -32,7 +32,7 @@ float3 calculateNormals(int primID, STriangleGeomInfo geom, float2 bary)
         }
     }
 
-    if (normalBufferAddress == 0 || normalType == NT_UNKNOWN)
+    if (normalBufferAddress == 0)
     {
         float3 v0 = vk::RawBufferLoad<float3>(vertexBufferAddress + indices[0] * 12);
         float3 v1 = vk::RawBufferLoad<float3>(vertexBufferAddress + indices[1] * 12);

71_RayTracingPipeline/main.cpp

@@ -1444,19 +1444,9 @@ class RaytracingPipelineApp final : public SimpleWindowedApplication, public Bui
 
 				const auto& normalView = gpuPolygon->getNormalView();
 				const uint64_t normalBufferAddress = normalView ? normalView.src.buffer->getDeviceAddress() + normalView.src.offset : 0;
-        const auto normalType = [&normalView]
-        {
-          if (!normalView) return NT_UNKNOWN;
-          switch (normalView.composed.format)
-          {
-          case EF_R32G32B32_SFLOAT:
-            return NT_R32G32B32_SFLOAT;
-          case EF_R8G8B8A8_SNORM:
-            return NT_R8G8B8A8_SNORM;
-          default:
-            return NT_UNKNOWN;
-          }
-        }();
+        auto normalType = NT_R32G32B32_SFLOAT;
+        if (normalView && normalView.composed.format == EF_R8G8B8A8_SNORM)
+          normalType = NT_R8G8B8A8_SNORM;
 
 				const auto& indexBufferBinding = gpuTriangles.indexData;
 				auto& geomInfo = geomInfos[i];