QWindowContext / QWindowFormat refactor.

To enable having a single GL context used for multiple drawables we need
to de-couple the context class a bit more from the window class in the
plugin API. Now contexts are created stand-alone based on a GL format
and a share context, and when calling makeCurrent() a desired surface
is specified. This maps well to GLX, EGL, Cocoa, AGL, and WGL, which all
support this use case.

QWindowContext is renamed to QGuiGLContext, and QWindowFormat is renamed
to QGuiGLFormat. We have the ability to introduce a pbuffer or similar
other offscreen GL drawable abstraction in the future.

1 files changed, 35 insertions, 82 deletions

diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
index aa26971021..5d4cf7a567 100644
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
@@ -39,114 +39,67 @@
 **
 ****************************************************************************/
 
+#include <QtCore/QDebug>
+
 #include "qwaylandxcompositeglxcontext.h"
 
 #include "qwaylandxcompositeglxwindow.h"
-#include "qwaylandxcompositebuffer.h"
 
-#include "wayland-xcomposite-client-protocol.h"
-#include <QtCore/QDebug>
-#include <QtGui/QRegion>
-
-#include <X11/extensions/Xcomposite.h>
-
-QWaylandXCompositeGLXContext::QWaylandXCompositeGLXContext(QWaylandXCompositeGLXIntegration *glxIntegration, QWaylandXCompositeGLXWindow *window)
-    : QPlatformGLContext()
-    , mGlxIntegration(glxIntegration)
-    , mWindow(window)
-    , mBuffer(0)
-    , mXWindow(0)
-    , mConfig(qglx_findConfig(glxIntegration->xDisplay(),glxIntegration->screen(),window->window()->requestedWindowFormat()))
-    , mWaitingForSyncCallback(false)
-{
-    XVisualInfo *visualInfo = glXGetVisualFromFBConfig(glxIntegration->xDisplay(),mConfig);
-    mContext = glXCreateContext(glxIntegration->xDisplay(),visualInfo,0,TRUE);
+#include <QRegion>
 
-    geometryChanged();
-}
-
-void QWaylandXCompositeGLXContext::makeCurrent()
+QWaylandXCompositeGLXSurface::QWaylandXCompositeGLXSurface(QWaylandXCompositeGLXWindow *window)
+    : m_window(window)
 {
-    glXMakeCurrent(mGlxIntegration->xDisplay(),mXWindow,mContext);
 }
 
-void QWaylandXCompositeGLXContext::doneCurrent()
+Window QWaylandXCompositeGLXSurface::xWindow() const
 {
-    glXMakeCurrent(mGlxIntegration->xDisplay(),0,0);
-    QPlatformGLContext::doneCurrent();
+    return m_window->xWindow();
 }
 
-void QWaylandXCompositeGLXContext::swapBuffers()
+QWaylandXCompositeGLXContext::QWaylandXCompositeGLXContext(const QGuiGLFormat &format, QPlatformGLContext *share, Display *display, int screen)
+    : m_display(display)
 {
-    QSize size = mWindow->geometry().size();
+    GLXContext shareContext = share ? static_cast<QWaylandXCompositeGLXContext *>(share)->m_context : 0;
 
-    glXSwapBuffers(mGlxIntegration->xDisplay(),mXWindow);
-    mWindow->damage(QRegion(QRect(QPoint(0,0),size)));
-    mWindow->waitForFrameSync();
+    GLXFBConfig config = qglx_findConfig(display, screen, format);
+    XVisualInfo *visualInfo = glXGetVisualFromFBConfig(display, config);
+    m_context = glXCreateContext(display, visualInfo, shareContext, true);
+    m_format = qglx_guiGLFormatFromGLXFBConfig(display, config, m_context);
 }
 
-void * QWaylandXCompositeGLXContext::getProcAddress(const QString &procName)
+bool QWaylandXCompositeGLXContext::makeCurrent(const QPlatformGLSurface &surface)
 {
-    return (void *) glXGetProcAddress(reinterpret_cast<GLubyte *>(procName.toLatin1().data()));
+    Window xWindow = static_cast<const QWaylandXCompositeGLXSurface &>(surface).xWindow();
+
+    return glXMakeCurrent(m_display, xWindow, m_context);
 }
 
-QWindowFormat QWaylandXCompositeGLXContext::windowFormat() const
+void QWaylandXCompositeGLXContext::doneCurrent()
 {
-    return qglx_platformWindowFromGLXFBConfig(mGlxIntegration->xDisplay(),mConfig,mContext);
+    glXMakeCurrent(m_display, 0, 0);
 }
 
-void QWaylandXCompositeGLXContext::sync_function(void *data)
+void QWaylandXCompositeGLXContext::swapBuffers(const QPlatformGLSurface &surface)
 {
-    QWaylandXCompositeGLXContext *that = static_cast<QWaylandXCompositeGLXContext *>(data);
-    that->mWaitingForSyncCallback = false;
+    const QWaylandXCompositeGLXSurface &s =
+        static_cast<const QWaylandXCompositeGLXSurface &>(surface);
+
+    QSize size = s.window()->geometry().size();
+
+    glXSwapBuffers(m_display, s.xWindow());
+
+    s.window()->damage(QRect(QPoint(), size));
+    s.window()->waitForFrameSync();
 }
 
-void QWaylandXCompositeGLXContext::waitForSync()
+void (*QWaylandXCompositeGLXContext::getProcAddress(const QByteArray &procName)) ()
 {
-    wl_display_sync_callback(mGlxIntegration->waylandDisplay()->wl_display(),
-                             QWaylandXCompositeGLXContext::sync_function,
-                             this);
-    mWaitingForSyncCallback = true;
-    wl_display_sync(mGlxIntegration->waylandDisplay()->wl_display(),0);
-    mGlxIntegration->waylandDisplay()->flushRequests();
-    while (mWaitingForSyncCallback) {
-        mGlxIntegration->waylandDisplay()->readEvents();
-    }
+    return glXGetProcAddress(reinterpret_cast<const GLubyte *>(procName.constData()));
 }
 
-void QWaylandXCompositeGLXContext::geometryChanged()
+QGuiGLFormat QWaylandXCompositeGLXContext::format() const
 {
-    QSize size(mWindow->geometry().size());
-    if (size.isEmpty()) {
-        //QGLWidget wants a context for a window without geometry
-        size = QSize(1,1);
-    }
-
-    delete mBuffer;
-    //XFreePixmap deletes the glxPixmap as well
-    if (mXWindow) {
-        XDestroyWindow(mGlxIntegration->xDisplay(),mXWindow);
-    }
-
-    XVisualInfo *visualInfo = glXGetVisualFromFBConfig(mGlxIntegration->xDisplay(),mConfig);
-    Colormap cmap = XCreateColormap(mGlxIntegration->xDisplay(),mGlxIntegration->rootWindow(),visualInfo->visual,AllocNone);
-
-    XSetWindowAttributes a;
-    a.background_pixel = WhitePixel(mGlxIntegration->xDisplay(), mGlxIntegration->screen());
-    a.border_pixel = BlackPixel(mGlxIntegration->xDisplay(), mGlxIntegration->screen());
-    a.colormap = cmap;
-    mXWindow = XCreateWindow(mGlxIntegration->xDisplay(), mGlxIntegration->rootWindow(),0, 0, size.width(), size.height(),
-                             0, visualInfo->depth, InputOutput, visualInfo->visual,
-                             CWBackPixel|CWBorderPixel|CWColormap, &a);
-
-    XCompositeRedirectWindow(mGlxIntegration->xDisplay(), mXWindow, CompositeRedirectManual);
-    XMapWindow(mGlxIntegration->xDisplay(), mXWindow);
-
-    XSync(mGlxIntegration->xDisplay(),False);
-    mBuffer = new QWaylandXCompositeBuffer(mGlxIntegration->waylandXComposite(),
-                                           (uint32_t)mXWindow,
-                                           size,
-                                           mGlxIntegration->waylandDisplay()->argbVisual());
-    mWindow->attach(mBuffer);
-    waitForSync();
+    return m_format;
 }
+