Renamed HIT_GROUP_BINDING_MODE_PER_ACCEL_STRUCT to HIT_GROUP_BINDING_MODE_PER_TLAS

3 files changed, 9 insertions, 9 deletions

diff --git a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp
index 8b3eda8d..6af272e9 100644
--- a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp
+++ b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp
@@ -292,7 +292,7 @@ public:
         const auto Info      = pTLASImpl->GetBuildInfo();
         VERIFY_EXPR(Info.BindingMode == HIT_GROUP_BINDING_MODE_PER_GEOMETRY ||
                     Info.BindingMode == HIT_GROUP_BINDING_MODE_PER_INSTANCE ||
-                    Info.BindingMode == HIT_GROUP_BINDING_MODE_PER_ACCEL_STRUCT);
+                    Info.BindingMode == HIT_GROUP_BINDING_MODE_PER_TLAS);
         VERIFY_EXPR(RayOffsetInHitGroupIndex < Info.HitGroupStride);
 
         const Uint32 GroupSize = this->m_pDevice->GetProperties().ShaderGroupHandleSize;
diff --git a/Graphics/GraphicsEngine/include/TopLevelASBase.hpp b/Graphics/GraphicsEngine/include/TopLevelASBase.hpp
index ff062aad..41a0785b 100644
--- a/Graphics/GraphicsEngine/include/TopLevelASBase.hpp
+++ b/Graphics/GraphicsEngine/include/TopLevelASBase.hpp
@@ -131,7 +131,7 @@ public:
 
             VERIFY_EXPR(this->m_StringPool.GetRemainingSize() == 0);
 
-            InstanceOffset = InstanceOffset + (BindingMode == HIT_GROUP_BINDING_MODE_PER_ACCEL_STRUCT ? HitGroupStride : 0) - 1;
+            InstanceOffset = InstanceOffset + (BindingMode == HIT_GROUP_BINDING_MODE_PER_TLAS ? HitGroupStride : 0) - 1;
 
             this->m_BuildInfo.HitGroupStride                   = HitGroupStride;
             this->m_BuildInfo.FirstContributionToHitGroupIndex = BaseContributionToHitGroupIndex;
@@ -193,7 +193,7 @@ public:
 #endif
         }
 
-        InstanceOffset = InstanceOffset + (BindingMode == HIT_GROUP_BINDING_MODE_PER_ACCEL_STRUCT ? HitGroupStride : 0) - 1;
+        InstanceOffset = InstanceOffset + (BindingMode == HIT_GROUP_BINDING_MODE_PER_TLAS ? HitGroupStride : 0) - 1;
 
 #ifdef DILIGENT_DEVELOPMENT
         Changed = Changed || (this->m_BuildInfo.HitGroupStride != HitGroupStride);
@@ -358,7 +358,7 @@ private:
                 // clang-format off
                 case HIT_GROUP_BINDING_MODE_PER_GEOMETRY:     InstanceOffset += Desc.pBLAS->GetActualGeometryCount() * HitGroupStride;                            break;
                 case HIT_GROUP_BINDING_MODE_PER_INSTANCE:     InstanceOffset += HitGroupStride;                                                                   break;
-                case HIT_GROUP_BINDING_MODE_PER_ACCEL_STRUCT: /* InstanceOffset is a constant */                                                                  break;
+                case HIT_GROUP_BINDING_MODE_PER_TLAS:         /* InstanceOffset is constant */                                                                  break;
                 case HIT_GROUP_BINDING_MODE_USER_DEFINED:     UNEXPECTED("TLAS_INSTANCE_OFFSET_AUTO is not compatible with HIT_GROUP_BINDING_MODE_USER_DEFINED"); break;
                 default:                                      UNEXPECTED("Unknown ray tracing shader binding mode");
                     // clang-format on
diff --git a/Graphics/GraphicsEngine/interface/TopLevelAS.h b/Graphics/GraphicsEngine/interface/TopLevelAS.h
index 5a803b69..2f596aa2 100644
--- a/Graphics/GraphicsEngine/interface/TopLevelAS.h
+++ b/Graphics/GraphicsEngine/interface/TopLevelAS.h
@@ -68,7 +68,7 @@ struct TopLevelASDesc DILIGENT_DERIVE(DeviceObjectAttribs)
 typedef struct TopLevelASDesc TopLevelASDesc;
 
 
-/// Defines shader binding mode.
+/// Defines hit group binding mode used by the top-level AS.
 DILIGENT_TYPED_ENUM(HIT_GROUP_BINDING_MODE, Uint8)
 {
     /// Each geometry in every instance may use a unique hit shader group.
@@ -84,10 +84,10 @@ DILIGENT_TYPED_ENUM(HIT_GROUP_BINDING_MODE, Uint8)
     HIT_GROUP_BINDING_MODE_PER_INSTANCE,
  
     /// All instances in each TLAS will use the same hit group.
-    /// In this mode, the SBT reserves a single slot for one hit group for each TLAS,
+    /// In this mode, the SBT reserves a single slot for one hit group for each TLAS
     /// and uses least memory.
     /// See IShaderBindingTable::BindHitGroupForTLAS().
-    HIT_GROUP_BINDING_MODE_PER_ACCEL_STRUCT,
+    HIT_GROUP_BINDING_MODE_PER_TLAS,
 
     /// The user must specify TLASBuildInstanceData::ContributionToHitGroupIndex 
     /// and only use IShaderBindingTable::BindHitGroupByIndex().
@@ -104,9 +104,9 @@ struct TLASBuildInfo
     Uint32                 InstanceCount                    DEFAULT_INITIALIZER(0);
     
     /// The number of hit shader groups, same as BuildTLASAttribs::HitGroupStride.
-    Uint32                 HitGroupStride            DEFAULT_INITIALIZER(0);
+    Uint32                 HitGroupStride                   DEFAULT_INITIALIZER(0);
     
-    /// Hit shader binding mode, same as BuildTLASAttribs::BindingMode.
+    /// Hit group binding mode, same as BuildTLASAttribs::BindingMode.
     HIT_GROUP_BINDING_MODE BindingMode                      DEFAULT_INITIALIZER(HIT_GROUP_BINDING_MODE_PER_GEOMETRY);
 
     /// First hit group location, same as BuildTLASAttribs::BaseContributionToHitGroupIndex.