diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-05 00:00:12 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-05 00:00:12 (GMT) |
| commit | 6968b3fe1354c289767b2b21bc723bb5fd1576ae (patch) | |
| tree | e67246d5f8d459a547152390660c560bf25660ae /src | |
| parent | 15551027a8fe91ce3ee04ed81f482f0dc5aca026 (diff) | |
| parent | 1e50b6abb78ce92241270474fa5b0cc4e568dc18 (diff) | |
| download | Qt-6968b3fe1354c289767b2b21bc723bb5fd1576ae.zip Qt-6968b3fe1354c289767b2b21bc723bb5fd1576ae.tar.gz Qt-6968b3fe1354c289767b2b21bc723bb5fd1576ae.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qgl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 08b9ca3..2fc3dea 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; @@ -5540,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; |