summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-22 14:11:02 (GMT)
committerTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-22 14:16:27 (GMT)
commit88b5af89e35584f12330bc6932176d5df413d1b1 (patch)
tree91c57b512a0f364560060613a7e7bd28ec20dc38 /src/opengl/gl2paintengineex
parent571f0dc0a33b22bfc1f1ffd4521e7c4e5151647c (diff)
downloadQt-88b5af89e35584f12330bc6932176d5df413d1b1.zip
Qt-88b5af89e35584f12330bc6932176d5df413d1b1.tar.gz
Qt-88b5af89e35584f12330bc6932176d5df413d1b1.tar.bz2
Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.
A regression from 4.6.x. This is an X11-only problem caused by the separate masks that an X11 QPixmap can contain. These masks we're not taken into account when a number optimizations were done for 4.7. Introduction of the texture-from-pixmap extension in 4.6 also broke masked pixmaps under X11. Task-number: QTBUG-13814 Reviewed-by: Samuel
Diffstat (limited to 'src/opengl/gl2paintengineex')
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index aa217f6..6eb5a36 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1314,7 +1314,7 @@ void QGL2PaintEngineEx::drawPixmap(const QRectF& dest, const QPixmap & pixmap, c
QGLRect srcRect(src.left(), top, src.right(), bottom);
bool isBitmap = pixmap.isQBitmap();
- bool isOpaque = !isBitmap && !pixmap.hasAlphaChannel();
+ bool isOpaque = !isBitmap && !pixmap.hasAlphaChannel() && !pixmap.pixmapData()->hasMask();
d->updateTextureFilter(GL_TEXTURE_2D, GL_CLAMP_TO_EDGE,
state()->renderHints & QPainter::SmoothPixmapTransform, texture->id);