summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2009-10-15 08:46:59 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2009-10-15 08:51:20 (GMT)
commit342a1233df813f00df475b713fa1c6252ee4dcd0 (patch)
tree95bdcf38e8ca4a425480215c81d483b937f14e7c
parentd83761cf3ddd301545ebd9981b9d0547e636e3b4 (diff)
downloadQt-342a1233df813f00df475b713fa1c6252ee4dcd0.zip
Qt-342a1233df813f00df475b713fa1c6252ee4dcd0.tar.gz
Qt-342a1233df813f00df475b713fa1c6252ee4dcd0.tar.bz2
Fixed buggy bitmap drawing in GL 2 engine on X11.
Don't use texture_from_pixmap extension for QBitmaps. Reviewed-by: Tom
-rw-r--r--src/opengl/qgl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 8aef8b4..1be2073 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2352,7 +2352,7 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target,
#if defined(Q_WS_X11)
// Try to use texture_from_pixmap
- if (pd->classId() == QPixmapData::X11Class) {
+ if (pd->classId() == QPixmapData::X11Class && pd->pixelType() == QPixmapData::PixmapType) {
texture = bindTextureFromNativePixmap(pd, key, options);
if (texture) {
texture->options |= QGLContext::MemoryManagedBindOption;