Use nbl::hlsl::_static_cast for converting MaterialPacked to Material and vice versa

Author: kevyuu

71_RayTracingPipeline/app_resources/common.hlsl

@@ -2,6 +2,7 @@
 #define RQG_COMMON_HLSL
 
 #include "nbl/builtin/hlsl/cpp_compat.hlsl"
+#include "nbl/builtin/hlsl/cpp_compat/basic.h"
 
 NBL_CONSTEXPR uint32_t WorkgroupSize = 16;
 NBL_CONSTEXPR uint32_t MAX_UNORM_10 = 1023;
@@ -67,28 +68,6 @@ struct MaterialPacked
     }
 };
 
-inline MaterialPacked packMaterial(Material material)
-{
-    MaterialPacked packed;
-    packed.ambient = packUnorm3x10(material.ambient);      
-    packed.diffuse = packUnorm3x10(material.diffuse);
-    packed.specular = packUnorm3x10(material.specular);      
-    packed.shininess = packUnorm22(material.shininess);
-    packed.alpha = packUnorm10(material.alpha);
-    return packed;
-}
-
-inline Material unpackMaterial(MaterialPacked packed)
-{
-    Material material;
-    material.ambient = unpackUnorm3x10(packed.ambient);
-    material.diffuse = unpackUnorm3x10(packed.diffuse);
-    material.specular = unpackUnorm3x10(packed.specular);
-    material.shininess = unpackUnorm22(packed.shininess);
-    material.alpha = unpackUnorm10(packed.alpha);
-    return material;
-}
-
 struct SProceduralGeomInfo
 {
     MaterialPacked material;
@@ -236,4 +215,45 @@ float32_t3 computeSpecular(Material mat, float32_t3 view_dir,
 }
 #endif
 
+namespace nbl
+{
+namespace hlsl
+{
+namespace impl
+{
+
+template<>
+struct static_cast_helper<Material, MaterialPacked>
+{
+    static inline Material cast(MaterialPacked packed)
+    {
+        Material material;
+        material.ambient = unpackUnorm3x10(packed.ambient);
+        material.diffuse = unpackUnorm3x10(packed.diffuse);
+        material.specular = unpackUnorm3x10(packed.specular);
+        material.shininess = unpackUnorm22(packed.shininess);
+        material.alpha = unpackUnorm10(packed.alpha);
+        return material;
+    }
+};
+
+template<>
+struct static_cast_helper<MaterialPacked, Material>
+{
+    static inline MaterialPacked cast(Material material)
+    {
+        MaterialPacked packed;
+        packed.ambient = packUnorm3x10(material.ambient);
+        packed.diffuse = packUnorm3x10(material.diffuse);
+        packed.specular = packUnorm3x10(material.specular);
+        packed.shininess = packUnorm22(material.shininess);
+        packed.alpha = packUnorm10(material.alpha);
+        return packed;
+    }
+};
+
+}
+}
+}
+
 #endif  // RQG_COMMON_HLSL

71_RayTracingPipeline/app_resources/raytrace.rahit.hlsl

@@ -7,7 +7,7 @@ void main(inout PrimaryPayload payload, in BuiltInTriangleIntersectionAttributes
 {
     const int instID = InstanceID();
     const STriangleGeomInfo geom = vk::RawBufferLoad < STriangleGeomInfo > (pc.triangleGeomInfoBuffer + instID * sizeof(STriangleGeomInfo));
-    const Material material = unpackMaterial(geom.material);
+    const Material material = nbl::hlsl::_static_cast<Material>(geom.material);
 
     if (material.alpha > payload.alphaThreshold)
     {

71_RayTracingPipeline/app_resources/raytrace.rgen.hlsl

@@ -72,7 +72,7 @@ void main()
 
         const float32_t3 worldPosition = pc.camPos + (camDirection * payload.rayDistance);
         const float32_t3 worldNormal = payload.worldNormal;
-        const Material material = unpackMaterial(payload.material);
+        const Material material = nbl::hlsl::_static_cast<Material>(payload.material);
         RayLight cLight;
         cLight.inHitPosition = worldPosition;
         CallShader(pc.light.type, cLight);

71_RayTracingPipeline/app_resources/raytrace_shadow.rahit.hlsl

@@ -7,7 +7,7 @@ void main(inout OcclusionPayload payload, in BuiltInTriangleIntersectionAttribut
 {
     const int instID = InstanceID();
     const STriangleGeomInfo geom = vk::RawBufferLoad < STriangleGeomInfo > (pc.triangleGeomInfoBuffer + instID * sizeof(STriangleGeomInfo));
-    const Material material = unpackMaterial(geom.material);
+    const Material material = nbl::hlsl::_static_cast<Material>(geom.material);
 
     payload.attenuation = material.alpha * payload.attenuation;
     IgnoreHit();

71_RayTracingPipeline/main.cpp

@@ -1253,7 +1253,7 @@ class RaytracingPipelineApp final : public examples::SimpleWindowedApplication,
           .vertexStride = cpuObject.data.inputParams.bindings[0].stride,
           .indexType = cpuObject.data.indexType,
           .indexCount = cpuObject.data.indexCount,
-          .material = packMaterial(cpuObject.material),
+          .material = hlsl::_static_cast<MaterialPacked>(cpuObject.material),
           .transform = cpuObject.transform,
           });
       }
@@ -1292,7 +1292,7 @@ class RaytracingPipelineApp final : public examples::SimpleWindowedApplication,
       {
         const auto middle_i = NumberOfProceduralGeometries / 2.0;
         SProceduralGeomInfo sphere = {
-          .material = packMaterial({
+          .material = hlsl::_static_cast<MaterialPacked>(Material{
             .ambient = {0.1, 0.05 * i, 0.1},
             .diffuse = {0.3, 0.2 * i, 0.3},
             .specular = {0.8, 0.8, 0.8},