SPIRV Resources: fix UB name detection for byte code produced by slang (close #698)

TheMostDiligent · TheMostDiligent · commit f4c246007833 · 2025-08-18T07:11:24.000-07:00
diff --git a/Graphics/ShaderTools/src/SPIRVShaderResources.cpp b/Graphics/ShaderTools/src/SPIRVShaderResources.cpp
@@ -259,7 +259,7 @@ const std::string& GetUBName(diligent_spirv_cross::Compiler&               Compi
     // use UB.name even if the instance name is present
 
     const std::string& instance_name = Compiler.get_name(UB.id);
-    return (IRSource.hlsl && !instance_name.empty()) ? instance_name : UB.name;
+    return ((IRSource.hlsl || IRSource.lang == spv::SourceLanguageSlang) && !instance_name.empty()) ? instance_name : UB.name;
 }
 
 static SHADER_CODE_BASIC_TYPE SpirvBaseTypeToShaderCodeBasicType(diligent_spirv_cross::SPIRType::BaseType SpvBaseType)
diff --git a/ThirdParty/SPIRV-Cross b/ThirdParty/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit d8e3e2b141b8c8a167b2e3984736a6baacff316c
+Subproject commit 0a88b2d5c08708d45692b7096a0a84e7bfae366c

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ const std::string& GetUBName(diligent_spirv_cross::Compiler& Compi`
`259`	`259`	`// use UB.name even if the instance name is present`
`260`	`260`
`261`	`261`	`const std::string& instance_name = Compiler.get_name(UB.id);`
`262`		`- return (IRSource.hlsl && !instance_name.empty()) ? instance_name : UB.name;`
	`262`	`+ return ((IRSource.hlsl \|\| IRSource.lang == spv::SourceLanguageSlang) && !instance_name.empty()) ? instance_name : UB.name;`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`static SHADER_CODE_BASIC_TYPE SpirvBaseTypeToShaderCodeBasicType(diligent_spirv_cross::SPIRType::BaseType SpvBaseType)`