Abort rendering when QOpenGLContext::create/makeCurrent fails.

Task-number: QTBUG-30158
Change-Id: Ic8239fe6f074c989e4474d46042e1a82796b4908
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index 85ef549..a55658b 100644 (file)
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -245,20 +245,28 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
         return;
     }
 
+    bool current = false;
+
     if (!gl) {
         gl = new QOpenGLContext();
         gl->setFormat(masterWindow->requestedFormat());
-        gl->create();
-        if (!gl->makeCurrent(masterWindow))
-            qWarning("QQuickWindow: makeCurrent() failed...");
-        sg->initialize(gl);
+        if (!gl->create()) {
+            delete gl;
+            gl = 0;
+        }
+        current = gl->makeCurrent(masterWindow);
+        if (current)
+            sg->initialize(gl);
     } else {
-        gl->makeCurrent(masterWindow);
+        current = gl->makeCurrent(masterWindow);
     }
 
     bool alsoSwap = data.updatePending;
     data.updatePending = false;
 
+    if (!current)
+        return;
+
     QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
     cd->polishItems();