From a7c9d5ca9c754902baa0fa5a6ba8b28864611ca5 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Fri, 30 Nov 2012 10:48:54 +0000 Subject: OpenGL: Remove bogus error in textures example on ES 2 platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The call to glGetBooleanv(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT) in QGLExtensions::currentContextExtensions() was resulting in an invalid enum on ES 2 systems. This was not being cleared and subsequentally being interpreted as a failed texture upload in the textures example. This enum doesn't exist on ES 2 so don't query it. Change-Id: I84f9c4b0aa8b11b6036eeed1f9378d110d9ea69d Reviewed-by: Samuel Rødal --- src/opengl/qgl.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/opengl') diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 583ecb69a8..8c98a0ea3a 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -4798,12 +4798,14 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() if (extensions.match("GL_EXT_bgra")) glExtensions |= BGRATextureFormat; +#if !defined(QT_OPENGL_ES) { GLboolean srgbCapableFramebuffers = false; glGetBooleanv(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT, &srgbCapableFramebuffers); if (srgbCapableFramebuffers) glExtensions |= SRGBFrameBuffer; } +#endif return glExtensions; } -- cgit v1.2.3