summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-09-15 22:31:47 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-09-15 22:31:47 (GMT)
commit115dc0d8337049b54dd9e7527cb68ace841e6df3 (patch)
tree7f3dc58301edbb8d0aa26fae1e8ba0ebdf8ea80c
parentd67d287c0fdff332cda673a18e0bb1617c3d2e17 (diff)
downloadQt-115dc0d8337049b54dd9e7527cb68ace841e6df3.zip
Qt-115dc0d8337049b54dd9e7527cb68ace841e6df3.tar.gz
Qt-115dc0d8337049b54dd9e7527cb68ace841e6df3.tar.bz2
Compilation fix for OpenGL/ES 2.0
Matrix functions do not exist under OpenGL/ES 2.0. Reviewed-by: trustme
-rw-r--r--src/opengl/qpixmapdata_gl.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 5eff237..4351c0b 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -162,12 +162,14 @@ void QGLPixmapGLPaintDevice::beginPaint()
glDisable(GL_SCISSOR_TEST);
glDisable(GL_BLEND);
+#if !defined(QT_OPENGL_ES_2)
glMatrixMode(GL_MODELVIEW_MATRIX);
glLoadIdentity();
glMatrixMode(GL_PROJECTION_MATRIX);
glLoadIdentity();
glOrtho(0, data->width(), data->height(), 0, -999999, 999999);
+#endif
glViewport(0, 0, data->width(), data->height());