GLSL Utils: allow separate image samplers when converting HLSL to GLSL

TheMostDiligent · TheMostDiligent · commit 0b4e8512be6f · 2025-03-20T19:29:31.000-07:00
diff --git a/Graphics/ShaderTools/src/GLSLUtils.cpp b/Graphics/ShaderTools/src/GLSLUtils.cpp
@@ -364,7 +364,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
 #if DILIGENT_NO_HLSL
         LOG_ERROR_AND_THROW("Unable to convert HLSL source to GLSL: HLSL support is disabled");
 #else
-        if (!ShaderCI.Desc.UseCombinedTextureSamplers)
+        if (!ShaderCI.Desc.UseCombinedTextureSamplers && (ShaderCI.CompileFlags & SHADER_COMPILE_FLAG_HLSL_TO_SPIRV_VIA_GLSL) == 0)
         {
             LOG_ERROR_AND_THROW("Combined texture samplers are required to convert HLSL source to GLSL");
         }

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce`
`364`	`364`	`#if DILIGENT_NO_HLSL`
`365`	`365`	`LOG_ERROR_AND_THROW("Unable to convert HLSL source to GLSL: HLSL support is disabled");`
`366`	`366`	`#else`
`367`		`- if (!ShaderCI.Desc.UseCombinedTextureSamplers)`
	`367`	`+ if (!ShaderCI.Desc.UseCombinedTextureSamplers && (ShaderCI.CompileFlags & SHADER_COMPILE_FLAG_HLSL_TO_SPIRV_VIA_GLSL) == 0)`
`368`	`368`	`{`
`369`	`369`	`LOG_ERROR_AND_THROW("Combined texture samplers are required to convert HLSL source to GLSL");`
`370`	`370`	`}`