Do not claim TextureRGFormats on Mesa with GLES
Mesa provides GL ES 3.0 so using GL_RED in place of GL_ALPHA should work. This is apparently not the case. Task-number: QTBUG-46605 Change-Id: I4f661487b47e9cc11f5de110196ec37150c99c7f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
This commit is contained in:
parent
8aaf8d33e1
commit
706af26acc
@ -289,8 +289,12 @@ 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"))
|
||||
features |= QOpenGLFunctions::TextureRGFormats;
|
||||
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<const char *>(ctx->functions()->glGetString(GL_RENDERER));
|
||||
if (!(renderer && strstr(renderer, "Mesa")))
|
||||
features |= QOpenGLFunctions::TextureRGFormats;
|
||||
}
|
||||
return features;
|
||||
} else {
|
||||
// OpenGL
|
||||
|
Loading…
Reference in New Issue
Block a user