From 7c414463063b979afb0b5184a48a13fcaf5b8af7 Mon Sep 17 00:00:00 2001 From: cheneym2 Date: Fri, 8 Nov 2024 14:03:06 -0500 Subject: Require GL_EXT_samplerless_texture_functions only if needed (#5527) * Require GL_EXT_samplerless_texture_functions only if needed This extension is only necessary when using texture functions on non-combined texture/samplers. Fixes #5518 --- source/slang/slang-core-module-textures.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/slang/slang-core-module-textures.cpp') diff --git a/source/slang/slang-core-module-textures.cpp b/source/slang/slang-core-module-textures.cpp index 0d20cc1dd..e0b8d2b27 100644 --- a/source/slang/slang-core-module-textures.cpp +++ b/source/slang/slang-core-module-textures.cpp @@ -374,6 +374,8 @@ void TextureTypeInfo::writeGetDimensionFunctions() glsl << ", ($" << aa++ << " = textureQueryLevels($0))"; } }; + glsl << "if (isCombined == 0) { " + "__requireGLSLExtension(\"GL_EXT_samplerless_texture_functions\"); }\n"; glsl << "if (access == " << kCoreModule_ResourceAccessReadOnly << ") __intrinsic_asm \""; emitIntrinsic(toSlice("textureSize"), !isMultisample); @@ -491,7 +493,6 @@ void TextureTypeInfo::writeGetDimensionFunctions() } sb << " __glsl_version(450)\n"; - sb << " __glsl_extension(GL_EXT_samplerless_texture_functions)\n"; sb << " [require(cpp"; if (glsl.getLength()) -- cgit v1.2.3