Make the initialization failure dialog sensible with QRhi

So on Windows one now gets a message box with a reasonable message,
instead of the OpenGL nonsense. Then the application closes when pressing
Abort etc.

On other platforms there is a qFatal, printing the same message.

Involves simplifying the OpenGL version a bit since passing isES type of
flags through multiple layers is not justified here.

Task-number: QTBUG-80365
Change-Id: Ie3ea1e9395a283f7e95eda78c1d3894797ff0acf
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

1 files changed, 11 insertions, 8 deletions

diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index 5be7fbefe3..fb460f28d6 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -324,15 +324,19 @@ void QSGRenderLoop::setInstance(QSGRenderLoop *instance)
     s_instance = instance;
 }
 
-void QSGRenderLoop::handleContextCreationFailure(QQuickWindow *window,
-                                                 bool isEs)
+void QSGRenderLoop::handleContextCreationFailure(QQuickWindow *window)
 {
     QString translatedMessage;
     QString untranslatedMessage;
-    QQuickWindowPrivate::contextCreationFailureMessage(window->requestedFormat(),
+    if (QSGRhiSupport::instance()->isRhiEnabled()) {
+        QQuickWindowPrivate::rhiCreationFailureMessage(QSGRhiSupport::instance()->rhiBackendName(),
                                                        &translatedMessage,
-                                                       &untranslatedMessage,
-                                                       isEs);
+                                                       &untranslatedMessage);
+    } else {
+        QQuickWindowPrivate::contextCreationFailureMessage(window->requestedFormat(),
+                                                           &translatedMessage,
+                                                           &untranslatedMessage);
+    }
     // If there is a slot connected to the error signal, emit it and leave it to
     // the application to do something with the message. If nothing is connected,
     // show a message on our own and terminate.
@@ -551,7 +555,7 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
         } else {
             if (!data.rhiDeviceLost) {
                 data.rhiDoomed = true;
-                handleContextCreationFailure(window, false);
+                handleContextCreationFailure(window);
             }
             // otherwise no error, will retry on a subsequent rendering attempt
         }
@@ -562,10 +566,9 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
         if (qt_gl_global_share_context())
             gl->setShareContext(qt_gl_global_share_context());
         if (!gl->create()) {
-            const bool isEs = gl->isOpenGLES();
             delete gl;
             gl = nullptr;
-            handleContextCreationFailure(window, isEs);
+            handleContextCreationFailure(window);
         } else {
             if (!offscreenSurface) {
                 offscreenSurface = new QOffscreenSurface;