From d4cab2523cae58bd864770552da0332afe45585c Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 27 Nov 2019 14:10:38 +0100 Subject: 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 --- src/quick/scenegraph/qsgthreadedrenderloop.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/quick/scenegraph/qsgthreadedrenderloop.cpp') diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 6f842e59c5..36ef0cc218 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -1310,10 +1310,9 @@ void QSGThreadedRenderLoop::handleExposure(QQuickWindow *window) w->thread->gl->setFormat(w->window->requestedFormat()); w->thread->gl->setScreen(w->window->screen()); if (!w->thread->gl->create()) { - const bool isEs = w->thread->gl->isOpenGLES(); delete w->thread->gl; w->thread->gl = nullptr; - handleContextCreationFailure(w->window, isEs); + handleContextCreationFailure(w->window); return; } -- cgit v1.2.3