summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngine
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2021-01-06 22:33:30 +0000
committerassiduous <assiduous@diligentgraphics.com>2021-01-06 22:33:30 +0000
commitef742a210982281e3b44db2706d54273ac48bb24 (patch)
tree0bb7de6fa83ad756cf92670c57fee685c52f4532 /Graphics/GraphicsEngine
parentImproved method names in IShaderBindingTable interface (diff)
downloadDiligentCore-ef742a210982281e3b44db2706d54273ac48bb24.tar.gz
DiligentCore-ef742a210982281e3b44db2706d54273ac48bb24.zip
Renamed SHADER_BINDING_VALIDATION_FLAGS to VERIFY_SBT_FLAGS
Diffstat (limited to 'Graphics/GraphicsEngine')
-rw-r--r--Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp8
-rw-r--r--Graphics/GraphicsEngine/interface/ShaderBindingTable.h30
-rw-r--r--Graphics/GraphicsEngine/src/DeviceContextBase.cpp2
3 files changed, 20 insertions, 20 deletions
diff --git a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp
index 2fe16c45..8b3eda8d 100644
--- a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp
+++ b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp
@@ -333,7 +333,7 @@ public:
}
- Bool DILIGENT_CALL_TYPE Verify(SHADER_BINDING_VALIDATION_FLAGS Flags) const override final
+ Bool DILIGENT_CALL_TYPE Verify(VERIFY_SBT_FLAGS Flags) const override final
{
#ifdef DILIGENT_DEVELOPMENT
static_assert(EmptyElem != 0, "must not be zero");
@@ -344,7 +344,7 @@ public:
{
for (size_t i = 0; i < Data.size(); i += Stride)
{
- if (Flags & SHADER_BINDING_VALIDATION_SHADER_ONLY)
+ if (Flags & VERIFY_SBT_FLAG_SHADER_ONLY)
{
Uint32 Count = 0;
for (size_t j = 0; j < ShSize; ++j)
@@ -357,7 +357,7 @@ public:
}
}
- if ((Flags & SHADER_BINDING_VALIDATION_SHADER_RECORD) && this->m_ShaderRecordSize > 0)
+ if ((Flags & VERIFY_SBT_FLAG_SHADER_RECORD) && this->m_ShaderRecordSize > 0)
{
Uint32 Count = 0;
for (size_t j = ShSize; j < Stride; ++j)
@@ -380,7 +380,7 @@ public:
return false;
}
- if (Flags & SHADER_BINDING_VALIDATION_TLAS)
+ if (Flags & VERIFY_SBT_FLAG_TLAS)
{
for (size_t i = 0; i < m_DbgHitGroupBindings.size(); ++i)
{
diff --git a/Graphics/GraphicsEngine/interface/ShaderBindingTable.h b/Graphics/GraphicsEngine/interface/ShaderBindingTable.h
index 4353a405..11870442 100644
--- a/Graphics/GraphicsEngine/interface/ShaderBindingTable.h
+++ b/Graphics/GraphicsEngine/interface/ShaderBindingTable.h
@@ -60,24 +60,24 @@ typedef struct ShaderBindingTableDesc ShaderBindingTableDesc;
/// Defines shader binding table validation flags, see IShaderBindingTable::Verify().
-DILIGENT_TYPED_ENUM(SHADER_BINDING_VALIDATION_FLAGS, Uint8)
+DILIGENT_TYPED_ENUM(VERIFY_SBT_FLAGS, Uint32)
{
- /// Checks that all shaders are bound or inactive.
- SHADER_BINDING_VALIDATION_SHADER_ONLY = 0x1,
+ /// Check that all shaders are bound or inactive.
+ VERIFY_SBT_FLAG_SHADER_ONLY = 0x1,
- /// Checks that shader record data are initialized.
- SHADER_BINDING_VALIDATION_SHADER_RECORD = 0x2,
+ /// Check that shader record data are initialized.
+ VERIFY_SBT_FLAG_SHADER_RECORD = 0x2,
- /// Checks that all TLASes that were used in the SBT are alive and
+ /// Check that all TLASes that were used in the SBT are alive and
/// shader binding indices have not changed.
- SHADER_BINDING_VALIDATION_TLAS = 0x4,
+ VERIFY_SBT_FLAG_TLAS = 0x4,
- // Enable all validations.
- SHADER_BINDING_VALIDATION_ALL = SHADER_BINDING_VALIDATION_SHADER_ONLY |
- SHADER_BINDING_VALIDATION_SHADER_RECORD |
- SHADER_BINDING_VALIDATION_TLAS
+ /// Enable all validations.
+ VERIFY_SBT_FLAG_ALL = VERIFY_SBT_FLAG_SHADER_ONLY |
+ VERIFY_SBT_FLAG_SHADER_RECORD |
+ VERIFY_SBT_FLAG_TLAS
};
-DEFINE_FLAG_ENUM_OPERATORS(SHADER_BINDING_VALIDATION_FLAGS)
+DEFINE_FLAG_ENUM_OPERATORS(VERIFY_SBT_FLAGS)
#define DILIGENT_INTERFACE_NAME IShaderBindingTable
@@ -99,13 +99,13 @@ DILIGENT_BEGIN_INTERFACE(IShaderBindingTable, IDeviceObject)
/// Checks that all shaders are bound, instances and geometries have not changed, shader record data are initialized.
- /// \param [in] Flags - Flags used for validation.
- /// \return True if SBT content is valid.
+ /// \param [in] Flags - Flags that specify which type of validation to perform.
+ /// \return True if SBT content is valid, and false otherwise.
///
/// \note Access to the SBT must be externally synchronized.
/// This method implemented only for development build and has no effect in release build.
VIRTUAL Bool METHOD(Verify)(THIS_
- SHADER_BINDING_VALIDATION_FLAGS Flags) CONST PURE;
+ VERIFY_SBT_FLAGS Flags) CONST PURE;
/// Resets the SBT with the new pipeline state. This is more effecient than creating a new SBT.
diff --git a/Graphics/GraphicsEngine/src/DeviceContextBase.cpp b/Graphics/GraphicsEngine/src/DeviceContextBase.cpp
index 9859c2ed..814d1e34 100644
--- a/Graphics/GraphicsEngine/src/DeviceContextBase.cpp
+++ b/Graphics/GraphicsEngine/src/DeviceContextBase.cpp
@@ -761,7 +761,7 @@ bool VerifyTraceRaysAttribs(const TraceRaysAttribs& Attribs)
CHECK_TRACE_RAYS_ATTRIBS(Attribs.pSBT != nullptr, "pSBT must not be null.");
#ifdef DILIGENT_DEVELOPMENT
- CHECK_TRACE_RAYS_ATTRIBS(Attribs.pSBT->Verify(SHADER_BINDING_VALIDATION_SHADER_ONLY | SHADER_BINDING_VALIDATION_TLAS),
+ CHECK_TRACE_RAYS_ATTRIBS(Attribs.pSBT->Verify(VERIFY_SBT_FLAG_SHADER_ONLY | VERIFY_SBT_FLAG_TLAS),
"not all shaders in SBT are bound or instance to shader mapping is incorrect.");
#endif // DILIGENT_DEVELOPMENT