From 669afa2337ad5791502fe3af2e3de648cb60ea9b Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Wed, 16 Sep 2009 08:40:46 +1000
Subject: 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
---
 src/opengl/qpixmapdata_gl.cpp | 4 ++--
 1 file 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
-- 
cgit v0.12