From bc874b5a7158309b8c5469f64f015d739fd3b610 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Thu, 3 Nov 2011 20:48:01 +0200 Subject: Add GL_EXT_texture_format_BGRA8888 support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtOpenGL supports GL_IMG_texture_format_BGRA8888 but GL_EXT_texture_format_BGRA8888 is missing. These extensions are essentially the same. Task-number: QTBUG-22538 Reviewed-by: Samuel Rødal --- src/opengl/qgl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 08b9ca3..db3a7ac 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -5499,7 +5499,8 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() glExtensions |= NVFloatBuffer; if (extensions.match("GL_ARB_pixel_buffer_object")) glExtensions |= PixelBufferObject; - if (extensions.match("GL_IMG_texture_format_BGRA8888")) + if (extensions.match("GL_IMG_texture_format_BGRA8888") + || extensions.match("GL_EXT_texture_format_BGRA8888")) glExtensions |= BGRATextureFormat; #if defined(QT_OPENGL_ES_2) glExtensions |= FramebufferObject; -- cgit v0.12 From f92483c3922763a5f5d1500f4892be8b214fe299 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Thu, 3 Nov 2011 20:51:51 +0200 Subject: Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT glGetBooleanv generates an error if this param isn't supported. This error generates wrong warnings in later states. Reviewed-by: Eskil --- src/opengl/qgl.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index db3a7ac..2fc3dea 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -5541,6 +5541,9 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() glGetBooleanv(FRAMEBUFFER_SRGB_CAPABLE_EXT, &srgbCapableFramebuffers); if (srgbCapableFramebuffers) glExtensions |= SRGBFrameBuffer; + // Clear possible error which is generated if + // FRAMEBUFFER_SRGB_CAPABLE_EXT isn't supported. + glGetError(); } return glExtensions; -- cgit v0.12