summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.cpp
diff options
context:
space:
mode:
authorJani Hautakangas <jani.hautakangas@nokia.com>2010-10-19 15:48:01 (GMT)
committerJani Hautakangas <jani.hautakangas@nokia.com>2010-10-20 08:41:29 (GMT)
commit26b5a9c67f8c4f8bf4cace5c189f506d3f89f3ce (patch)
tree8c930b985c5779e13ad4b319f94b7423ae748b21 /src/opengl/qgl.cpp
parent4d93a4eccb462ce3bee75f0c3961901d60bcae02 (diff)
downloadQt-26b5a9c67f8c4f8bf4cace5c189f506d3f89f3ce.zip
Qt-26b5a9c67f8c4f8bf4cace5c189f506d3f89f3ce.tar.gz
Qt-26b5a9c67f8c4f8bf4cace5c189f506d3f89f3ce.tar.bz2
Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.
GL_OES_element_index_uint detection was not working because EGL config wasn't yet resolved. In addition QFrameBufferObject should use 24bit depth render buffer if extension is available. Task-number: QTBUG-14542 Reviewed-by: Gunnar
Diffstat (limited to 'src/opengl/qgl.cpp')
-rw-r--r--src/opengl/qgl.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 7f25887..62eff6e 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -5292,6 +5292,12 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions()
#if defined(QT_OPENGL_ES)
if (extensions.match("GL_OES_packed_depth_stencil"))
glExtensions |= PackedDepthStencil;
+ if (extensions.match("GL_OES_element_index_uint"))
+ glExtensions |= ElementIndexUint;
+ if (extensions.match("GL_OES_depth24"))
+ glExtensions |= Depth24;
+#else
+ glExtensions |= ElementIndexUint;
#endif
if (extensions.match("GL_ARB_framebuffer_object")) {
// ARB_framebuffer_object also includes EXT_framebuffer_blit.