summaryrefslogtreecommitdiffstats
path: root/src/opengl/qpixmapdata_x11gl_p.h
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2010-03-05 16:29:53 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2010-03-05 16:31:28 (GMT)
commit7d587efef35b3adbb3433a4baec1c5ee7105cf0b (patch)
tree9a91ea4dd498684fb5236512f427d2dc2ea03b47 /src/opengl/qpixmapdata_x11gl_p.h
parentee07fff45d49e69d9a4f4474861a219af8d557f2 (diff)
downloadQt-7d587efef35b3adbb3433a4baec1c5ee7105cf0b.zip
Qt-7d587efef35b3adbb3433a4baec1c5ee7105cf0b.tar.gz
Qt-7d587efef35b3adbb3433a4baec1c5ee7105cf0b.tar.bz2
Port QX11GLPixmapData & QX11GLWindowSurface to new QEgl API
It's still just as buggy, but at least it allows us to remove a lot of crud from qgl_x11egl.cpp. Reviewed-By: TrustMe
Diffstat (limited to 'src/opengl/qpixmapdata_x11gl_p.h')
-rw-r--r--src/opengl/qpixmapdata_x11gl_p.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/opengl/qpixmapdata_x11gl_p.h b/src/opengl/qpixmapdata_x11gl_p.h
index c9f4f56..83cd780 100644
--- a/src/opengl/qpixmapdata_x11gl_p.h
+++ b/src/opengl/qpixmapdata_x11gl_p.h
@@ -59,6 +59,10 @@
#include <qgl.h>
+#ifndef QT_NO_EGL
+#include <QtGui/private/qeglcontext_p.h>
+#endif
+
QT_BEGIN_NAMESPACE
class QX11GLPixmapData : public QX11PixmapData, public QGLPaintDevice
@@ -76,6 +80,11 @@ public:
static bool hasX11GLPixmaps();
static QGLFormat glFormat();
+
+#ifndef QT_NO_EGL
+ static QEglContext* rgbContext;
+ static QEglContext* argbContext;
+#endif
private:
mutable QGLContext* ctx;
};