summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-09-15 22:40:46 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-09-15 22:40:46 (GMT)
commit669afa2337ad5791502fe3af2e3de648cb60ea9b (patch)
treea72cc70f4ab780b72194f86aad7409902a023703 /src/opengl
parent115dc0d8337049b54dd9e7527cb68ace841e6df3 (diff)
downloadQt-669afa2337ad5791502fe3af2e3de648cb60ea9b.zip
Qt-669afa2337ad5791502fe3af2e3de648cb60ea9b.tar.gz
Qt-669afa2337ad5791502fe3af2e3de648cb60ea9b.tar.bz2
Fix glMatrixMode() arguments for desktop OpenGL
The defines are GL_MODELVIEW/GL_PROJECTION, not GL_MODELVIEW_MATRIX/etc. The _MATRIX defines are for fetching the matrix, not setting it. Reviewed-by: trustme
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qpixmapdata_gl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 4351c0b..3bc0d4f 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -163,10 +163,10 @@ void QGLPixmapGLPaintDevice::beginPaint()
glDisable(GL_BLEND);
#if !defined(QT_OPENGL_ES_2)
- glMatrixMode(GL_MODELVIEW_MATRIX);
+ glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
- glMatrixMode(GL_PROJECTION_MATRIX);
+ glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glOrtho(0, data->width(), data->height(), 0, -999999, 999999);
#endif