From 8e70241dccaf5a9e5c79c8d6da5665b881c5914d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 3 Oct 2017 19:24:50 +0200
Subject: Let QPlatformBackingStore handle its own QOpenGLContext
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The resources allocated by QPlatformBackingStore are owned by the class,
and should be allocated in a context the class also owns. This removes
the asymmetry of having to pass in a context to composeAndFlush, while
having to make the same context current before destroying the platform
backingstore.

The context owned by QPlatformBackingStore is shared with the associated
window though a new QWindowPrivate::shareContext() API.

The result is that on e.g. iOS, the backingstore does not need to tie
the resource allocation of QPlatformBackingStore to the global share
context, but can instead tie them to the per-window context, and hence
clean them up after each window is closed.

Task-number: QTBUG-56653
Change-Id: Ic1bcae50dafeeafaa8d16a7febd83b840ec6367a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 src/gui/painting/qplatformbackingstore.cpp | 32 +++++++++++++++++++++---------
 src/gui/painting/qplatformbackingstore.h   |  2 +-
 2 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'src/gui/painting')

diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp
index 6cb115afba..8ab22beb31 100644
--- a/src/gui/painting/qplatformbackingstore.cpp
+++ b/src/gui/painting/qplatformbackingstore.cpp
@@ -50,6 +50,7 @@
 #include <QtGui/QOpenGLFunctions>
 #ifndef QT_NO_OPENGL
 #include <QtGui/qopengltextureblitter.h>
+#include <QtGui/qoffscreensurface.h>
 #endif
 #include <qpa/qplatformgraphicsbuffer.h>
 #include <qpa/qplatformgraphicsbufferhelper.h>
@@ -95,14 +96,15 @@ public:
     ~QPlatformBackingStorePrivate()
     {
 #ifndef QT_NO_OPENGL
-        QOpenGLContext *ctx = QOpenGLContext::currentContext();
-        if (ctx) {
+        if (context) {
+            QOffscreenSurface offscreenSurface;
+            offscreenSurface.setFormat(context->format());
+            offscreenSurface.create();
+            context->makeCurrent(&offscreenSurface);
             if (textureId)
-                ctx->functions()->glDeleteTextures(1, &textureId);
+                context->functions()->glDeleteTextures(1, &textureId);
             if (blitter)
                 blitter->destroy();
-        } else if (textureId || blitter) {
-            qWarning("No context current during QPlatformBackingStore destruction, OpenGL resources not released");
         }
         delete blitter;
 #endif
@@ -110,6 +112,7 @@ public:
     QWindow *window;
     QBackingStore *backingStore;
 #ifndef QT_NO_OPENGL
+    QScopedPointer<QOpenGLContext> context;
     mutable GLuint textureId;
     mutable QSize textureSize;
     mutable bool needsSwizzle;
@@ -316,20 +319,31 @@ static void blitTextureForWidget(const QPlatformTextureList *textures, int idx,
 
 void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &region,
                                             const QPoint &offset,
-                                            QPlatformTextureList *textures, QOpenGLContext *context,
+                                            QPlatformTextureList *textures,
                                             bool translucentBackground)
 {
     if (!qt_window_private(window)->receivedExpose)
         return;
 
-    if (!context->makeCurrent(window)) {
+    if (!d_ptr->context) {
+        d_ptr->context.reset(new QOpenGLContext);
+        d_ptr->context->setFormat(d_ptr->window->requestedFormat());
+        d_ptr->context->setScreen(d_ptr->window->screen());
+        d_ptr->context->setShareContext(qt_window_private(d_ptr->window)->shareContext());
+        if (!d_ptr->context->create()) {
+            qWarning("composeAndFlush: QOpenGLContext creation failed");
+            return;
+        }
+    }
+
+    if (!d_ptr->context->makeCurrent(window)) {
         qWarning("composeAndFlush: makeCurrent() failed");
         return;
     }
 
     QWindowPrivate::get(window)->lastComposeTime.start();
 
-    QOpenGLFunctions *funcs = context->functions();
+    QOpenGLFunctions *funcs = d_ptr->context->functions();
     funcs->glViewport(0, 0, window->width() * window->devicePixelRatio(), window->height() * window->devicePixelRatio());
     funcs->glClearColor(0, 0, 0, translucentBackground ? 0 : 1);
     funcs->glClear(GL_COLOR_BUFFER_BIT);
@@ -435,7 +449,7 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &regi
     funcs->glDisable(GL_BLEND);
     d_ptr->blitter->release();
 
-    context->swapBuffers(window);
+    d_ptr->context->swapBuffers(window);
 }
 #endif
 /*!
diff --git a/src/gui/painting/qplatformbackingstore.h b/src/gui/painting/qplatformbackingstore.h
index 9956c032a9..381c564079 100644
--- a/src/gui/painting/qplatformbackingstore.h
+++ b/src/gui/painting/qplatformbackingstore.h
@@ -120,7 +120,7 @@ public:
     virtual void flush(QWindow *window, const QRegion &region, const QPoint &offset) = 0;
 #ifndef QT_NO_OPENGL
     virtual void composeAndFlush(QWindow *window, const QRegion &region, const QPoint &offset,
-                                 QPlatformTextureList *textures, QOpenGLContext *context,
+                                 QPlatformTextureList *textures,
                                  bool translucentBackground);
 #endif
     virtual QImage toImage() const;
-- 
cgit v1.2.3