summaryrefslogtreecommitdiffstats
path: root/Graphics/ShaderTools
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-10-04 23:59:33 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-10-04 23:59:33 +0000
commit73fd82a29d3175e156754010f5de261d6f561f16 (patch)
treef04b71a06b71addb56d2a79885e53d253caa417e /Graphics/ShaderTools
parentAdded KHR extension emulation via NV extension (diff)
downloadDiligentCore-73fd82a29d3175e156754010f5de261d6f561f16.tar.gz
DiligentCore-73fd82a29d3175e156754010f5de261d6f561f16.zip
A few random fixes to ray tracing API and implementation
Diffstat (limited to 'Graphics/ShaderTools')
-rw-r--r--Graphics/ShaderTools/src/GLSLangUtils.cpp2
-rw-r--r--Graphics/ShaderTools/src/SPIRVShaderResources.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/ShaderTools/src/GLSLangUtils.cpp b/Graphics/ShaderTools/src/GLSLangUtils.cpp
index 4382f67f..f23a46a3 100644
--- a/Graphics/ShaderTools/src/GLSLangUtils.cpp
+++ b/Graphics/ShaderTools/src/GLSLangUtils.cpp
@@ -70,7 +70,7 @@ void FinalizeGlslang()
static EShLanguage ShaderTypeToShLanguage(SHADER_TYPE ShaderType)
{
- static_assert(SHADER_TYPE_LAST == 0x2000, "Please handle the new shader type in the switch below");
+ static_assert(SHADER_TYPE_LAST == SHADER_TYPE_CALLABLE, "Please handle the new shader type in the switch below");
switch (ShaderType)
{
// clang-format off
diff --git a/Graphics/ShaderTools/src/SPIRVShaderResources.cpp b/Graphics/ShaderTools/src/SPIRVShaderResources.cpp
index b20394a4..f21d2075 100644
--- a/Graphics/ShaderTools/src/SPIRVShaderResources.cpp
+++ b/Graphics/ShaderTools/src/SPIRVShaderResources.cpp
@@ -150,7 +150,7 @@ ShaderResourceDesc SPIRVShaderResourceAttribs::GetResourceDesc() const
static spv::ExecutionModel ShaderTypeToExecutionModel(SHADER_TYPE ShaderType)
{
- static_assert(SHADER_TYPE_LAST == 0x2000, "Please handle the new shader type in the switch below");
+ static_assert(SHADER_TYPE_LAST == SHADER_TYPE_CALLABLE, "Please handle the new shader type in the switch below");
switch (ShaderType)
{
// clang-format off