ProjectLoader: Use the correct context for rendering

Author: adazem009

src/projectloader.cpp

@@ -210,6 +210,24 @@ void ProjectLoader::timerEvent(QTimerEvent *event)
         return;
 
     if (m_engine) {
+        QOpenGLContext *oldCtx = QOpenGLContext::currentContext();
+        QSurface *oldSurface = nullptr;
+
+        if (!m_glCtx)
+            m_glCtx = oldCtx;
+
+        if (m_glCtx) {
+            if (!m_surface)
+                m_surface = m_glCtx->surface();
+
+            oldSurface = oldCtx->surface();
+
+            if (oldCtx != m_glCtx) {
+                oldCtx->doneCurrent();
+                m_glCtx->makeCurrent(m_surface);
+            }
+        }
+
         for (Monitor *monitor : m_unpositionedMonitors)
             monitor->autoPosition(m_engine->monitors());
 
@@ -230,6 +248,13 @@ void ProjectLoader::timerEvent(QTimerEvent *event)
             m_renderTimer.restart();
         } else
             m_renderFpsCounter++;
+
+        if (m_glCtx) {
+            if (oldCtx != m_glCtx) {
+                m_glCtx->doneCurrent();
+                oldCtx->makeCurrent(oldSurface);
+            }
+        }
     }
 
     event->accept();

src/projectloader.h

@@ -12,6 +12,9 @@
 Q_MOC_INCLUDE("spritemodel.h");
 Q_MOC_INCLUDE("monitormodel.h");
 
+class QSurface;
+class QOpenGLContext;
+
 namespace scratchcpprender
 {
 
@@ -185,6 +188,8 @@ class ProjectLoader : public QObject
         std::atomic<unsigned int> m_downloadedAssets = 0;
         std::atomic<unsigned int> m_assetCount = 0;
         std::atomic<bool> m_stopLoading = false;
+        QOpenGLContext *m_glCtx = nullptr;
+        QSurface *m_surface = nullptr;
 };
 
 } // namespace scratchcpprender