From 89c8e61abd0c6549cdc6e51502e38599d348f9a7 Mon Sep 17 00:00:00 2001 From: Christophe Dehais Date: Tue, 26 Oct 2021 19:07:27 +0200 Subject: [PATCH] Strip flags from UniformType before calling getUniformTypeName() (#2635) --- tools/shaderc/shaderc_hlsl.cpp | 2 +- tools/shaderc/shaderc_spirv.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/shaderc/shaderc_hlsl.cpp b/tools/shaderc/shaderc_hlsl.cpp index 3c7571656..ad1cf8fd2 100644 --- a/tools/shaderc/shaderc_hlsl.cpp +++ b/tools/shaderc/shaderc_hlsl.cpp @@ -753,7 +753,7 @@ namespace bgfx { namespace hlsl BX_TRACE("%s, %s, %d, %d, %d" , un.name.c_str() - , getUniformTypeName(un.type) + , getUniformTypeName(UniformType::Enum(un.type & ~kUniformMask)) , un.num , un.regIndex , un.regCount diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp index 8484cbace..53f69eecd 100644 --- a/tools/shaderc/shaderc_spirv.cpp +++ b/tools/shaderc/shaderc_spirv.cpp @@ -355,7 +355,7 @@ namespace bgfx { namespace spirv BX_TRACE("%s, %s, %d, %d, %d" , un.name.c_str() - , getUniformTypeName(un.type) + , getUniformTypeName(UniformType::Enum(un.type & ~kUniformMask)) , un.num , un.regIndex , un.regCount