From 73fd82a29d3175e156754010f5de261d6f561f16 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sun, 4 Oct 2020 16:59:33 -0700 Subject: A few random fixes to ray tracing API and implementation --- Graphics/ShaderTools/src/GLSLangUtils.cpp | 2 +- Graphics/ShaderTools/src/SPIRVShaderResources.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Graphics/ShaderTools') 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 -- cgit v1.2.3