From bf0c29b3840bb0a5837f61f1be1bc01cfb571e9f Mon Sep 17 00:00:00 2001 From: BZLZHH <69153940+BZLZHH@users.noreply.github.com> Date: Sat, 5 Jul 2025 12:25:22 +0800 Subject: [PATCH] [Fix] (MG_Util/Program): Completely fix uniform conflicting. --- MG/MG_UTIL/Program/GLSLTool.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MG/MG_UTIL/Program/GLSLTool.cpp b/MG/MG_UTIL/Program/GLSLTool.cpp index cb03f6fd..675415bc 100644 --- a/MG/MG_UTIL/Program/GLSLTool.cpp +++ b/MG/MG_UTIL/Program/GLSLTool.cpp @@ -804,7 +804,7 @@ namespace MG_Util::Program { spvc_basetype base_type = spvc_type_get_basetype(type); GLenum gl_type = GL_NONE; - if (spirv_location > 0 && base_type != SPVC_BASETYPE_SAMPLED_IMAGE) { + if (spirv_location >= 0 && base_type != SPVC_BASETYPE_SAMPLED_IMAGE) { auto conflict_it = used_locations.find(spirv_location); if (conflict_it != used_locations.end()) { // Check if the conflicting uniform is a sampler @@ -1095,4 +1095,4 @@ namespace MG_Util::Program { return essl; } -} \ No newline at end of file +}