QX11GL: Move the shared context ownership into a seperate class

This patch moves initialisation into a new QX11GLSharedContexts
class which is created as a Q_GLOBAL_STATIC. This class owns both
the RGB/ARGB EGL contexts and the QGLContext used for sharing.
Finally, the shared QGLContext is make a valid context wrapping the
RGB EGL context and a small pixmap surface. This makes the shared
QGLContext the QGLContextGroup master, so when it is deleted, it
can be made current to delete the GL resources. Among other benefits,
this patch stops apps seg-faulting when they gracefully quit.

Reviewed-By: TrustMe

1 files changed, 3 insertions, 4 deletions

diff --git a/src/opengl/qpixmapdata_x11gl_p.h b/src/opengl/qpixmapdata_x11gl_p.h
index b613eba..2d1336b 100644
--- a/src/opengl/qpixmapdata_x11gl_p.h
+++ b/src/opengl/qpixmapdata_x11gl_p.h
@@ -65,6 +65,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QX11GLSharedContexts;
+
 class QX11GLPixmapData : public QX11PixmapData, public QGLPaintDevice
 {
 public:
@@ -84,11 +86,8 @@ public:
 
     static bool hasX11GLPixmaps();
     static QGLFormat glFormat();
+    static QX11GLSharedContexts* sharedContexts();
 
-#ifndef QT_NO_EGL
-    static QEglContext* rgbContext;
-    static QEglContext* argbContext;
-#endif
 private:
     mutable QGLContext* ctx;
 };