1 files changed, 49 insertions, 11 deletions

diff --git a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp
index b70ed43e69..f878bef0c4 100644
--- a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp
@@ -39,12 +39,19 @@
 **
 ****************************************************************************/
 
+#include <QtDebug>
+
 #include "qwaylandreadbackglxwindow.h"
 
+#include "qwaylandshmsurface.h"
+
 QWaylandReadbackGlxWindow::QWaylandReadbackGlxWindow(QWindow *window, QWaylandReadbackGlxIntegration *glxIntegration)
     : QWaylandShmWindow(window)
-    , mGlxIntegration(glxIntegration)
-    , mContext(0)
+    , m_glxIntegration(glxIntegration)
+    , m_buffer(0)
+    , m_pixmap(0)
+    , m_config(qglx_findConfig(glxIntegration->xDisplay(), glxIntegration->screen(), window->glFormat()))
+    , m_glxPixmap(0)
 {
 }
 
@@ -54,20 +61,51 @@ QWaylandWindow::WindowType QWaylandReadbackGlxWindow::windowType() const
     return QWaylandWindow::Egl;
 }
 
-QPlatformGLContext * QWaylandReadbackGlxWindow::glContext() const
+void QWaylandReadbackGlxWindow::setGeometry(const QRect &rect)
 {
-    if (!mContext) {
-        QWaylandReadbackGlxWindow *that = const_cast<QWaylandReadbackGlxWindow *>(this);
-        that->mContext = new QWaylandReadbackGlxContext(mGlxIntegration,that);
+    QWaylandShmWindow::setGeometry(rect);
+
+    if (m_pixmap) {
+        delete mBuffer;
+        //XFreePixmap deletes the glxPixmap as well
+        XFreePixmap(m_glxIntegration->xDisplay(), m_pixmap);
+        m_pixmap = 0;
     }
-    return mContext;
 }
 
-void QWaylandReadbackGlxWindow::setGeometry(const QRect &rect)
+GLXPixmap QWaylandReadbackGlxWindow::glxPixmap() const
 {
-    QWaylandShmWindow::setGeometry(rect);
+    if (!m_pixmap)
+        const_cast<QWaylandReadbackGlxWindow *>(this)->createSurface();
 
-    if (mContext) {
-        mContext->geometryChanged();
+    return m_glxPixmap;
+}
+
+uchar *QWaylandReadbackGlxWindow::buffer()
+{
+    return m_buffer->image()->bits();
+}
+
+void QWaylandReadbackGlxWindow::createSurface()
+{
+    QSize size(geometry().size());
+    if (size.isEmpty()) {
+        //QGLWidget wants a context for a window without geometry
+        size = QSize(1,1);
     }
+
+    waitForFrameSync();
+
+    m_buffer = new QWaylandShmBuffer(m_glxIntegration->waylandDisplay(), size, QImage::Format_ARGB32);
+    attach(m_buffer);
+
+    int depth = XDefaultDepth(m_glxIntegration->xDisplay(), m_glxIntegration->screen());
+    m_pixmap = XCreatePixmap(m_glxIntegration->xDisplay(), m_glxIntegration->rootWindow(), size.width(), size.height(), depth);
+    XSync(m_glxIntegration->xDisplay(), False);
+
+    m_glxPixmap = glXCreatePixmap(m_glxIntegration->xDisplay(), m_config, m_pixmap,0);
+
+    if (!m_glxPixmap)
+        qDebug() << "Could not make glx surface out of pixmap :(";
 }
+