1 files changed, 36 insertions, 65 deletions

diff --git a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
index 857c1db6e3..850e7bb0ac 100644
--- a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
@@ -41,9 +41,10 @@
 
 #include "qwaylandreadbackglxcontext.h"
 
-#include "qwaylandshmsurface.h"
+#include "qwaylandshmbackingstore.h"
 #include "qwaylandreadbackglxwindow.h"
 
+#include <QtGui/QOpenGLContext>
 #include <QtCore/QDebug>
 
 static inline void qgl_byteSwapImage(QImage &img, GLenum pixel_type)
@@ -68,96 +69,66 @@ static inline void qgl_byteSwapImage(QImage &img, GLenum pixel_type)
     }
 }
 
-QWaylandReadbackGlxContext::QWaylandReadbackGlxContext(QWaylandReadbackGlxIntegration *glxIntegration, QWaylandReadbackGlxWindow *window)
-    : QPlatformGLContext()
-    , mGlxIntegration(glxIntegration)
-    , mWindow(window)
-    , mBuffer(0)
-    , mPixmap(0)
-    , mConfig(qglx_findConfig(glxIntegration->xDisplay(),glxIntegration->screen(),window->widget()->platformWindowFormat(),GLX_PIXMAP_BIT))
-    , mGlxPixmap(0)
+QWaylandReadbackGlxContext::QWaylandReadbackGlxContext(const QSurfaceFormat &format,
+        QPlatformOpenGLContext *share, Display *display, int screen)
+    : m_display(display)
 {
-    XVisualInfo *visualInfo = glXGetVisualFromFBConfig(glxIntegration->xDisplay(),mConfig);
-    mContext = glXCreateContext(glxIntegration->xDisplay(),visualInfo,0,TRUE);
+    GLXFBConfig config = qglx_findConfig(display, screen, format, GLX_PIXMAP_BIT);
 
-    geometryChanged();
+    GLXContext shareContext = share ? static_cast<QWaylandReadbackGlxContext *>(share)->m_context : 0;
+
+    XVisualInfo *visualInfo = glXGetVisualFromFBConfig(display, config);
+    m_context = glXCreateContext(display, visualInfo, shareContext, TRUE);
+    m_format = qglx_surfaceFormatFromGLXFBConfig(display, config, m_context);
+}
+
+QSurfaceFormat QWaylandReadbackGlxContext::format() const
+{
+    return m_format;
 }
 
-void QWaylandReadbackGlxContext::makeCurrent()
+bool QWaylandReadbackGlxContext::makeCurrent(QPlatformSurface *surface)
 {
-    QPlatformGLContext::makeCurrent();
+    GLXPixmap glxPixmap = static_cast<QWaylandReadbackGlxWindow *>(surface)->glxPixmap();
 
-    glXMakeCurrent(mGlxIntegration->xDisplay(),mGlxPixmap,mContext);
+    return glXMakeCurrent(m_display, glxPixmap, m_context);
 }
 
 void QWaylandReadbackGlxContext::doneCurrent()
 {
-    QPlatformGLContext::doneCurrent();
+    glXMakeCurrent(m_display, 0, 0);
 }
 
-void QWaylandReadbackGlxContext::swapBuffers()
+void QWaylandReadbackGlxContext::swapBuffers(QPlatformSurface *surface)
 {
-    if (QPlatformGLContext::currentContext() != this) {
-        makeCurrent();
-    }
+    // #### makeCurrent() directly on the platform context doesn't update QOpenGLContext::currentContext()
+    if (QOpenGLContext::currentContext()->handle() != this)
+        makeCurrent(surface);
+
+    QWaylandReadbackGlxWindow *w = static_cast<QWaylandReadbackGlxWindow *>(surface);
 
-    QSize size = mWindow->geometry().size();
+    QSize size = w->geometry().size();
 
-    QImage img(size,QImage::Format_ARGB32);
+    QImage img(size, QImage::Format_ARGB32);
     const uchar *constBits = img.bits();
     void *pixels = const_cast<uchar *>(constBits);
 
-    glReadPixels(0,0, size.width(), size.height(), GL_RGBA,GL_UNSIGNED_BYTE, pixels);
+    glReadPixels(0, 0, size.width(), size.height(), GL_RGBA,GL_UNSIGNED_BYTE, pixels);
 
     img = img.mirrored();
-    qgl_byteSwapImage(img,GL_UNSIGNED_INT_8_8_8_8_REV);
+    qgl_byteSwapImage(img, GL_UNSIGNED_INT_8_8_8_8_REV);
     constBits = img.bits();
 
-    const uchar *constDstBits = mBuffer->image()->bits();
+    const uchar *constDstBits = w->buffer();
     uchar *dstBits = const_cast<uchar *>(constDstBits);
-    memcpy(dstBits,constBits,(img.width()*4) * img.height());
+    memcpy(dstBits, constBits, (img.width() * 4) * img.height());
 
+    w->damage(QRect(QPoint(), size));
 
-    mWindow->damage(QRegion(QRect(QPoint(0,0),size)));
-    mWindow->waitForFrameSync();
-
+    w->waitForFrameSync();
 }
 
-void * QWaylandReadbackGlxContext::getProcAddress(const QString &procName)
+void (*QWaylandReadbackGlxContext::getProcAddress(const QByteArray &procName)) ()
 {
-    return (void *) glXGetProcAddress(reinterpret_cast<GLubyte *>(procName.toLatin1().data()));
-}
-
-QPlatformWindowFormat QWaylandReadbackGlxContext::platformWindowFormat() const
-{
-    return qglx_platformWindowFromGLXFBConfig(mGlxIntegration->xDisplay(),mConfig,mContext);
-}
-
-void QWaylandReadbackGlxContext::geometryChanged()
-{
-    QSize size(mWindow->geometry().size());
-    if (size.isEmpty()) {
-        //QGLWidget wants a context for a window without geometry
-        size = QSize(1,1);
-    }
-
-    mWindow->waitForFrameSync();
-
-    delete mBuffer;
-    //XFreePixmap deletes the glxPixmap as well
-    if (mPixmap) {
-        XFreePixmap(mGlxIntegration->xDisplay(),mPixmap);
-    }
-
-    mBuffer = new QWaylandShmBuffer(mGlxIntegration->waylandDisplay(),size,QImage::Format_ARGB32);
-    mWindow->attach(mBuffer);
-    int depth = XDefaultDepth(mGlxIntegration->xDisplay(),mGlxIntegration->screen());
-    mPixmap = XCreatePixmap(mGlxIntegration->xDisplay(),mGlxIntegration->rootWindow(),size.width(),size.height(),depth);
-    XSync(mGlxIntegration->xDisplay(),False);
-
-    mGlxPixmap = glXCreatePixmap(mGlxIntegration->xDisplay(),mConfig,mPixmap,0);
-
-    if (!mGlxPixmap) {
-        qDebug() << "Could not make egl surface out of pixmap :(";
-    }
+    return glXGetProcAddress(reinterpret_cast<const GLubyte *>(procName.constData()));
 }