From 4be57d78e98c267c57343573757010deff7acc49 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Fri, 8 Dec 2023 17:25:44 +0100 Subject: [PATCH] opengl/glshadermanager: check opengl instead of glsl version Whether or not mix with bvec is supported depends on the OpenGL version and not on the glsl version --- src/opengl/glshadermanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengl/glshadermanager.cpp b/src/opengl/glshadermanager.cpp index 3c52955502..9ef4a8a68b 100644 --- a/src/opengl/glshadermanager.cpp +++ b/src/opengl/glshadermanager.cpp @@ -130,7 +130,7 @@ QByteArray ShaderManager::generateFragmentSource(ShaderTraits traits) const textureLookup = glsl_es_300 ? QByteArrayLiteral("texture") : QByteArrayLiteral("texture2D"); output = glsl_es_300 ? QByteArrayLiteral("fragColor") : QByteArrayLiteral("gl_FragColor"); } - if (!gl->isGLES() || gl->glslVersion() >= Version(3, 0)) { + if (!gl->isGLES() || gl->glVersion() >= Version(3, 0)) { stream << "\n"; stream << "vec3 doMix(vec3 left, vec3 right, bvec3 rightFactor) {\n"; stream << " return mix(left, right, rightFactor);\n";