summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorninerider <qt-info@nokia.com>2010-02-27 11:13:01 (GMT)
committerninerider <qt-info@nokia.com>2010-02-27 11:13:01 (GMT)
commit6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29 (patch)
tree6a232be656ad332c74a0a352b2552bcef5610a7b /src/opengl
parent30abadd0d0a190889dab6d1c154053a25e060042 (diff)
downloadQt-6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29.zip
Qt-6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29.tar.gz
Qt-6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29.tar.bz2
Preparation to enable OpenGLES 2.0 for Windows Mobile.
As there are no SDKs available for our test device (HTC HD2) that support OpenGL, we had to construct the libraries by extracting them from the ROM image. This is still work in progress at this time.
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl_p.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 0d5a54a..80217c0 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -80,13 +80,19 @@
#define q_vertexTypeEnum GL_FIXED
#endif //QT_OPENGL_ES_1_CL
-#ifdef QT_OPENGL_ES
+#if defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2)
QT_BEGIN_INCLUDE_NAMESPACE
+
#if defined(QT_OPENGL_ES_2)
-#include <EGL/egl.h>
+# include <GLES2/gl2.h>
+#endif
+
+#if defined(QT_GLES_EGL)
+# include <GLES/egl.h>
#else
-#include <GLES/egl.h>
+# include <EGL/egl.h>
#endif
+
QT_END_INCLUDE_NAMESPACE
#endif