summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorStefano Pironato <stefano.pironato@nokia.com>2009-10-28 12:48:44 (GMT)
committerStefano Pironato <stefano.pironato@nokia.com>2009-10-28 13:14:17 (GMT)
commit69216ca888373e8ca82dfe75fd940fc2ab824c2c (patch)
tree5ff6457dd2d689d607b1619b3add1c2aa42786d4 /src/opengl
parent5a5990b8cd3c580e3325a7c3878275196ceb86dd (diff)
downloadQt-69216ca888373e8ca82dfe75fd940fc2ab824c2c.zip
Qt-69216ca888373e8ca82dfe75fd940fc2ab824c2c.tar.gz
Qt-69216ca888373e8ca82dfe75fd940fc2ab824c2c.tar.bz2
Fix bug for message error "Texture updload failed, error code 0x500"
The error message come from the QGLContextPrivate::bindTexture. But since OpenGl errors are retains until glGetError is called the actual error was happening somewhere else. After adding in all the gl* call a check for a gl error, I was able to get the place where opengl fail with a GL_INVALID_ENUM. This happen in the call of glEnable(GL_TEXTURE_2D) in the file qgl_x11egl.cpp. This glEnable call does not need: removed. Reviewed-by: Tom Cooksey
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl_x11egl.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 3894ed1..7180682 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -589,7 +589,6 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmapData* pd, cons
GLuint textureId;
glGenTextures(1, &textureId);
- glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, textureId);
// bind the egl pixmap surface to a texture