From 20b07bfa305153b8d828e133bb7dda838c2166c6 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 9 Jan 2025 12:15:23 +0100 Subject: [PATCH] Drop a limitation for R8/RG8 formats for Mesa in hasOpenGLFeature The mentioned version is from 2015. Pick-to: 6.9 Change-Id: I330bd8ec08ab815a85d3e4e5afc44f314ade2ef6 Reviewed-by: Kristoffer Skau Reviewed-by: Andy Nichols --- src/gui/opengl/qopenglfunctions.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 5e86b561072..7eef9956b65 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -239,12 +239,8 @@ static int qt_gl_resolve_features() if (extensions.match("GL_OES_texture_npot")) features |= QOpenGLFunctions::NPOTTextures | QOpenGLFunctions::NPOTTextureRepeat; - if (ctx->format().majorVersion() >= 3 || extensions.match("GL_EXT_texture_rg")) { - // Mesa's GLES implementation (as of 10.6.0) is unable to handle this, even though it provides 3.0. - const char *renderer = reinterpret_cast(ctx->functions()->glGetString(GL_RENDERER)); - if (!(renderer && strstr(renderer, "Mesa"))) - features |= QOpenGLFunctions::TextureRGFormats; - } + if (ctx->format().majorVersion() >= 3 || extensions.match("GL_EXT_texture_rg")) + features |= QOpenGLFunctions::TextureRGFormats; if (ctx->format().majorVersion() >= 3) { features |= QOpenGLFunctions::MultipleRenderTargets; if (ctx->format().minorVersion() >= 2 && extensions.match("GL_KHR_blend_equation_advanced_coherent")) {