1 files changed, 86 insertions, 31 deletions

diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp
index 93566220e8..92fc8aa57a 100644
--- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp
@@ -41,6 +41,7 @@
 
 #include <QByteArray>
 #include <QOpenGLContext>
+#include <QtPlatformHeaders/QGLXNativeContext>
 
 #include <X11/Xlib.h>
 #include <GL/glx.h>
@@ -52,16 +53,36 @@
 
 QT_BEGIN_NAMESPACE
 
-QOffscreenIntegration *QOffscreenIntegration::createOffscreenIntegration()
+class QOffscreenX11Info
 {
-    return new QOffscreenX11Integration;
-}
+public:
+    QOffscreenX11Info(QOffscreenX11Connection *connection)
+        : m_connection(connection)
+    {
+    }
+
+    Display *display() const {
+        return (Display *)m_connection->display();
+    }
+
+    Window root() const {
+        return DefaultRootWindow(display());
+    }
+
+    int screenNumber() const {
+        return m_connection->screenNumber();
+    }
+
+private:
+    QOffscreenX11Connection *m_connection;
+};
 
 bool QOffscreenX11Integration::hasCapability(QPlatformIntegration::Capability cap) const
 {
     switch (cap) {
     case OpenGL: return true;
     case ThreadedOpenGL: return true;
+    case RasterGLSurface: return true;
     default: return QOffscreenIntegration::hasCapability(cap);
     }
 }
@@ -77,6 +98,40 @@ QPlatformOpenGLContext *QOffscreenX11Integration::createPlatformOpenGLContext(QO
     return new QOffscreenX11GLXContext(m_connection->x11Info(), context);
 }
 
+QPlatformNativeInterface *QOffscreenX11Integration::nativeInterface() const
+{
+   return const_cast<QOffscreenX11Integration *>(this);
+}
+
+void *QOffscreenX11Integration::nativeResourceForScreen(const QByteArray &resource, QScreen *screen)
+{
+    Q_UNUSED(screen)
+    if (resource.toLower() == QByteArrayLiteral("display") ) {
+        if (!m_connection)
+            m_connection.reset(new QOffscreenX11Connection);
+        return m_connection->display();
+    }
+    return nullptr;
+}
+
+#ifndef QT_NO_OPENGL
+void *QOffscreenX11Integration::nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) {
+    if (resource.toLower() == QByteArrayLiteral("glxconfig") ) {
+        if (context) {
+            QOffscreenX11GLXContext *glxPlatformContext = static_cast<QOffscreenX11GLXContext *>(context->handle());
+            return glxPlatformContext->glxConfig();
+        }
+    }
+    if (resource.toLower() == QByteArrayLiteral("glxcontext") ) {
+        if (context) {
+            QOffscreenX11GLXContext *glxPlatformContext = static_cast<QOffscreenX11GLXContext *>(context->handle());
+            return glxPlatformContext->glxContext();
+        }
+    }
+    return nullptr;
+}
+#endif
+
 QOffscreenX11Connection::QOffscreenX11Connection()
 {
     XInitThreads();
@@ -93,30 +148,6 @@ QOffscreenX11Connection::~QOffscreenX11Connection()
         XCloseDisplay((Display *)m_display);
 }
 
-class QOffscreenX11Info
-{
-public:
-    QOffscreenX11Info(QOffscreenX11Connection *connection)
-        : m_connection(connection)
-    {
-    }
-
-    Display *display() const {
-        return (Display *)m_connection->display();
-    }
-
-    Window root() const {
-        return DefaultRootWindow(display());
-    }
-
-    int screenNumber() const {
-        return m_connection->screenNumber();
-    }
-
-private:
-    QOffscreenX11Connection *m_connection;
-};
-
 QOffscreenX11Info *QOffscreenX11Connection::x11Info()
 {
     if (!m_x11Info)
@@ -127,11 +158,12 @@ QOffscreenX11Info *QOffscreenX11Connection::x11Info()
 class QOffscreenX11GLXContextData
 {
 public:
-    QOffscreenX11Info *x11;
+    QOffscreenX11Info *x11 = nullptr;
     QSurfaceFormat format;
-    GLXContext context;
-    GLXContext shareContext;
-    Window window;
+    GLXContext context = nullptr;
+    GLXContext shareContext = nullptr;
+    GLXFBConfig config = nullptr;
+    Window window = 0;
 };
 
 static Window createDummyWindow(QOffscreenX11Info *x11, XVisualInfo *visualInfo)
@@ -142,6 +174,7 @@ static Window createDummyWindow(QOffscreenX11Info *x11, XVisualInfo *visualInfo)
     a.border_pixel = BlackPixel(x11->display(), x11->screenNumber());
     a.colormap = cmap;
 
+
     Window window = XCreateWindow(x11->display(), x11->root(),
                                   0, 0, 100, 100,
                                   0, visualInfo->depth, InputOutput, visualInfo->visual,
@@ -163,14 +196,23 @@ static Window createDummyWindow(QOffscreenX11Info *x11, GLXFBConfig config)
 QOffscreenX11GLXContext::QOffscreenX11GLXContext(QOffscreenX11Info *x11, QOpenGLContext *context)
     : d(new QOffscreenX11GLXContextData)
 {
+
     d->x11 = x11;
     d->format = context->format();
 
+    if (d->format.renderableType() == QSurfaceFormat::DefaultRenderableType)
+        d->format.setRenderableType(QSurfaceFormat::OpenGL);
+
+    if (d->format.renderableType() != QSurfaceFormat::OpenGL)
+        return;
+
     d->shareContext = 0;
     if (context->shareHandle())
         d->shareContext = static_cast<QOffscreenX11GLXContext *>(context->shareHandle())->d->context;
 
     GLXFBConfig config = qglx_findConfig(x11->display(), x11->screenNumber(), d->format);
+    d->config = config;
+
     if (config) {
         d->context = glXCreateNewContext(x11->display(), config, GLX_RGBA_TYPE, d->shareContext, true);
         if (!d->context && d->shareContext) {
@@ -199,6 +241,9 @@ QOffscreenX11GLXContext::QOffscreenX11GLXContext(QOffscreenX11Info *x11, QOpenGL
         d->window = createDummyWindow(x11, visualInfo);
         XFree(visualInfo);
     }
+    if (d->context)
+        context->setNativeHandle(QVariant::fromValue<QGLXNativeContext>(QGLXNativeContext(d->context)));
+
 }
 
 QOffscreenX11GLXContext::~QOffscreenX11GLXContext()
@@ -251,4 +296,14 @@ bool QOffscreenX11GLXContext::isValid() const
     return d->context && d->window;
 }
 
+void *QOffscreenX11GLXContext::glxContext() const
+{
+    return d->context;
+}
+
+void *QOffscreenX11GLXContext::glxConfig() const
+{
+    return d->config;
+}
+
 QT_END_NAMESPACE