From b41c106f3c84ae84c51e3f83d70548f4f3f08c5e Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 22 Mar 2016 18:40:26 -0700
Subject: [PATCH 1/3] Only set the context once per QML surface

---
 libraries/gl/src/gl/OffscreenQmlSurface.cpp | 22 +++------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/libraries/gl/src/gl/OffscreenQmlSurface.cpp b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
index 563c590874..6056e8234f 100644
--- a/libraries/gl/src/gl/OffscreenQmlSurface.cpp
+++ b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
@@ -214,22 +214,19 @@ void OffscreenQmlRenderThread::init() {
     connect(_renderControl, &QQuickRenderControl::sceneChanged, _surface, &OffscreenQmlSurface::requestUpdate);
 
     if (!_canvas.makeCurrent()) {
-        qWarning("Failed to make context current on render thread");
+        // Failed to make GL context current, this OffscreenQmlSurface is basically dead
+        qWarning("Failed to make context current on QML Renderer Thread");
         return;
     }
+
     _renderControl->initialize(_canvas.getContext());
     setupFbo();
     _escrow.setRecycler([this](GLuint texture){
         _textures.recycleTexture(texture);
     });
-    _canvas.doneCurrent();
 }
 
 void OffscreenQmlRenderThread::cleanup() {
-    if (!_canvas.makeCurrent()) {
-        qFatal("Failed to make context current on render thread");
-        return;
-    }
     _renderControl->invalidate();
 
     _fbo.reset();
@@ -237,7 +234,6 @@ void OffscreenQmlRenderThread::cleanup() {
     _textures.clear();
 
     _canvas.doneCurrent();
-
     _canvas.getContextObject()->moveToThread(QCoreApplication::instance()->thread());
 
     _quit = true;
@@ -267,18 +263,11 @@ void OffscreenQmlRenderThread::resize() {
     }
     _size = newOffscreenSize;
 
-    // Clear out any fbos with the old size
-    if (!_canvas.makeCurrent()) {
-        qWarning("Failed to make context current on render thread");
-        return;
-    }
-
     qDebug() << "Offscreen UI resizing to " << _newSize.width() << "x" << _newSize.height() << " with pixel ratio " << pixelRatio;
 
     locker.unlock();
 
     setupFbo();
-    _canvas.doneCurrent();
 }
 
 void OffscreenQmlRenderThread::render() {
@@ -287,11 +276,6 @@ void OffscreenQmlRenderThread::render() {
         return;
     }
 
-    if (!_canvas.makeCurrent()) {
-        qWarning("Failed to make context current on render thread");
-        return;
-    }
-
     QMutexLocker locker(&_mutex);
     _renderControl->sync();
     _waitCondition.wakeOne();

From fe1d8b24b40a91ba6bbcb9c2e97539b3c4ea1158 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 22 Mar 2016 18:42:46 -0700
Subject: [PATCH 2/3] Lock the QML Surface resizing better

---
 libraries/gl/src/gl/OffscreenQmlSurface.cpp | 46 ++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/libraries/gl/src/gl/OffscreenQmlSurface.cpp b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
index 6056e8234f..8e02ef2e4f 100644
--- a/libraries/gl/src/gl/OffscreenQmlSurface.cpp
+++ b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
@@ -241,32 +241,32 @@ void OffscreenQmlRenderThread::cleanup() {
 
 void OffscreenQmlRenderThread::resize() {
     // Lock _newSize changes
-    QMutexLocker locker(&_mutex);
+    {
+        QMutexLocker locker(&_mutex);
 
-    // Update our members
-    if (_quickWindow) {
-        _quickWindow->setGeometry(QRect(QPoint(), _newSize));
-        _quickWindow->contentItem()->setSize(_newSize);
+        // Update our members
+        if (_quickWindow) {
+            _quickWindow->setGeometry(QRect(QPoint(), _newSize));
+            _quickWindow->contentItem()->setSize(_newSize);
+        }
+
+        // Qt bug in 5.4 forces this check of pixel ratio,
+        // even though we're rendering offscreen.
+        qreal pixelRatio = 1.0;
+        if (_renderControl && _renderControl->_renderWindow) {
+            pixelRatio = _renderControl->_renderWindow->devicePixelRatio();
+        }
+
+        uvec2 newOffscreenSize = toGlm(_newSize * pixelRatio);
+        if (newOffscreenSize == _size) {
+            return;
+        }
+
+        qDebug() << "Offscreen UI resizing to " << _newSize.width() << "x" << _newSize.height() << " with pixel ratio " << pixelRatio;
+        _size = newOffscreenSize;
     }
 
-    // Qt bug in 5.4 forces this check of pixel ratio,
-    // even though we're rendering offscreen.
-    qreal pixelRatio = 1.0;
-    if (_renderControl && _renderControl->_renderWindow) {
-        pixelRatio = _renderControl->_renderWindow->devicePixelRatio();
-    }
-
-    uvec2 newOffscreenSize = toGlm(_newSize * pixelRatio);
-    _textures.setSize(newOffscreenSize);
-    if (newOffscreenSize == _size) {
-        return;
-    }
-    _size = newOffscreenSize;
-
-    qDebug() << "Offscreen UI resizing to " << _newSize.width() << "x" << _newSize.height() << " with pixel ratio " << pixelRatio;
-
-    locker.unlock();
-
+    _textures.setSize(_size);
     setupFbo();
 }
 

From 40b21933a574474757008492bef4e66c16334051 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 22 Mar 2016 18:42:54 -0700
Subject: [PATCH 3/3] Clean QML Surface render log

---
 libraries/gl/src/gl/OffscreenQmlSurface.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/gl/src/gl/OffscreenQmlSurface.cpp b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
index 8e02ef2e4f..49b2a6fd34 100644
--- a/libraries/gl/src/gl/OffscreenQmlSurface.cpp
+++ b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
@@ -322,10 +322,10 @@ OffscreenQmlSurface::~OffscreenQmlSurface() {
     QObject::disconnect(&_updateTimer);
     QObject::disconnect(qApp);
 
-    qDebug() << "Stopping QML render thread " << _renderer->currentThreadId();
+    qDebug() << "Stopping QML Renderer Thread " << _renderer->currentThreadId();
     _renderer->_queue.add(STOP);
     if (!_renderer->wait(MAX_SHUTDOWN_WAIT_SECS * USECS_PER_SECOND)) {
-        qWarning() << "Failed to shut down the QML render thread";
+        qWarning() << "Failed to shut down the QML Renderer Thread";
     }
 
     delete _rootItem;