summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_p.h
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-23 12:49:18 (GMT)
committerTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-23 12:51:57 (GMT)
commit07c5429d5aacab932cd912e66287d66fb952e7c4 (patch)
tree5ed4f1a69ea33a86c5bd07d7de4cd74d960aefe1 /src/opengl/qgl_p.h
parent82d28ac2065f348e7eacb20c455894ab349b666e (diff)
downloadQt-07c5429d5aacab932cd912e66287d66fb952e7c4.zip
Qt-07c5429d5aacab932cd912e66287d66fb952e7c4.tar.gz
Qt-07c5429d5aacab932cd912e66287d66fb952e7c4.tar.bz2
Don't try to use the texture_from_pixmap extension in GL on desktop/X11.
There are far too many problems with this extension for it to be usable on desktop at the moment, so disable on desktop GL for now. It's still enabled for EGL, where it seems to have better driver support. Task-number: related to QTBUG-11158 Reviewed-by: Samuel
Diffstat (limited to 'src/opengl/qgl_p.h')
-rw-r--r--src/opengl/qgl_p.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 623eeaf..6323ce2 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -401,9 +401,6 @@ public:
uint workaround_brokenFBOReadBack : 1;
uint workaroundsCached : 1;
- uint workaround_brokenTextureFromPixmap : 1;
- uint workaround_brokenTextureFromPixmap_init : 1;
-
QPaintDevice *paintDevice;
QColor transpColor;
QGLContext *q_ptr;