Make render loops OpenGL clean

Task-number: QTBUG-84718
Task-number: QTBUG-84623
Change-Id: I14392c365a52ecc410362500bbe29b4dd7953007
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 6bcbb0722c..440da6b461 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -315,8 +315,10 @@ void QQuickWidgetPrivate::render(bool needsSync)
         if (!current && !context->isValid()) {
             renderControl->invalidate();
             current = context->create() && context->makeCurrent(offscreenSurface);
-            if (current)
-                renderControl->initialize(context);
+            if (current) {
+                offscreenWindow->setGraphicsDevice(QQuickGraphicsDevice::fromOpenGLContext(context));
+                renderControl->initialize();
+            }
         }
 
         if (!current) {
@@ -970,10 +972,7 @@ void QQuickWidgetPrivate::createContext()
     if (context->makeCurrent(offscreenSurface)) {
         if (!offscreenWindow->isSceneGraphInitialized()) {
             offscreenWindow->setGraphicsDevice(QQuickGraphicsDevice::fromOpenGLContext(context));
-            if (QSGRhiSupport::instance()->isRhiEnabled())
-                renderControl->initialize();
-            else
-                renderControl->initialize(context);
+            renderControl->initialize();
         }
     } else
 #endif