summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_p.h
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-27 10:14:56 (GMT)
committerTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-27 10:21:14 (GMT)
commit5ff714badf06f492c3f6f8282b64181cc93faadb (patch)
tree0b7273a962ef7c0ccbcfe778def46d20e4913f13 /src/opengl/qgl_p.h
parent52e36c493d579323a09957028b0fd5ebc4d43021 (diff)
downloadQt-5ff714badf06f492c3f6f8282b64181cc93faadb.zip
Qt-5ff714badf06f492c3f6f8282b64181cc93faadb.tar.gz
Qt-5ff714badf06f492c3f6f8282b64181cc93faadb.tar.bz2
Don't disable texture_from_pixmap on GLX/X11 by default.
We made a mistake of trying to make use of the texture_from_pixmap extension by default when binding textures in Qt. The extension have several limitation and using it produces crashes with certain drivers/graphic card combos, but we can't change this now since it will break existing apps using well behaved drivers. We'll fix this for 4.8 with either a QGL::BindOption or configure flag. Revert "Don't try to use the texture_from_pixmap extension in GL on desktop/X11." This reverts commit 07c5429d5aacab932cd912e66287d66fb952e7c4.
Diffstat (limited to 'src/opengl/qgl_p.h')
-rw-r--r--src/opengl/qgl_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 6323ce2..623eeaf 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -401,6 +401,9 @@ public:
uint workaround_brokenFBOReadBack : 1;
uint workaroundsCached : 1;
+ uint workaround_brokenTextureFromPixmap : 1;
+ uint workaround_brokenTextureFromPixmap_init : 1;
+
QPaintDevice *paintDevice;
QColor transpColor;
QGLContext *q_ptr;