Added comments and updated optional stream buffer bitmasks

2021-06-23 18:46:04 -07:00
parent 22ab33a3f4
commit 95582453d4
14 changed files with 7 additions and 7 deletions
@@ -152,10 +152,10 @@ ShaderResourceGroup RayTracingSceneSrg : SRG_RayTracingScene
    #define MESH_POSITION_BUFFER_OFFSET     1
    #define MESH_NORMAL_BUFFER_OFFSET       2   

-    // buffer flag bits indicating if optional buffers are present
-    #define MESH_BUFFER_FLAG_TANGENT        1
-    #define MESH_BUFFER_FLAG_BITANGENT      2
-    #define MESH_BUFFER_FLAG_UV             3
+    // buffer flag bits indicating if optional buffers are present (note: these are bit masks)
+    #define MESH_BUFFER_FLAG_TANGENT        (1 << 0)
+    #define MESH_BUFFER_FLAG_BITANGENT      (1 << 1)
+    #define MESH_BUFFER_FLAG_UV             (1 << 2)

    // Unbounded array of mesh stream buffers:
    // - Index, Position, Normal stream buffers are always present
@@ -33,9 +33,9 @@ struct VertexData
 {
    float3 m_position;
    float3 m_normal;
-    float4 m_tangent;
-    float3 m_bitangent;
-    float2 m_uv;
+    float4 m_tangent;       // optional: use only if MESH_BUFFER_FLAG_TANGENT in MeshData.m_bufferFlags is set
+    float3 m_bitangent;     // optional: use only if MESH_BUFFER_FLAG_BITANGENT in MeshData.m_bufferFlags is set
+    float2 m_uv;            // optional: use only if MESH_BUFFER_FLAG_UV in MeshData.m_bufferFlags is set
 };

 VertexData GetHitInterpolatedVertexData(RayTracingSceneSrg::MeshInfo meshInfo, float2 builtInBarycentrics)