From 7d01bcb5cce02782619a568c7257e66d097366e26a07ffbdc3aeacd099084b94 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 4 Nov 2017 09:22:36 +0000 Subject: [PATCH] Accepting request 537940 from KDE:Qt5 - Restore working version of disable-gpu-when-using-nouveau-boo-1005323.diff OBS-URL: https://build.opensuse.org/request/show/537940 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=26 --- ...le-gpu-when-using-nouveau-boo-1005323.diff | 27 +++++++++++++++++++ libqt5-qtwebengine.changes | 6 +++++ 2 files changed, 33 insertions(+) diff --git a/disable-gpu-when-using-nouveau-boo-1005323.diff b/disable-gpu-when-using-nouveau-boo-1005323.diff index 779fda1..d54dc77 100644 --- a/disable-gpu-when-using-nouveau-boo-1005323.diff +++ b/disable-gpu-when-using-nouveau-boo-1005323.diff @@ -50,3 +50,30 @@ Index: qtwebengine-opensource-src-5.9.2/src/core/web_engine_context.cpp } // namespace namespace QtWebEngineCore { +@@ -366,6 +400,17 @@ WebEngineContext::WebEngineContext() + + const char *glType = 0; + #ifndef QT_NO_OPENGL ++ bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU"); ++ ++ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND") && openGLVendor() == QStringLiteral("nouveau")) ++ { ++ qWarning() << "Nouveau openGL driver detected. Qt WebEngine will disable usage of the GPU.\n" ++ "Note: you can set the QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND\n" ++ "environment variable before running this application, but this is \n" ++ "not recommended since this usually causes applications to crash as\n" ++ "Nouveau openGL drivers don't support multithreaded rendering"; ++ disableGpu = true; ++ } + + bool tryGL = + !usingANGLE() +@@ -377,7 +422,7 @@ WebEngineContext::WebEngineContext() + || enableWebGLSoftwareRendering + #endif + ) +- && !usingQtQuick2DRenderer(); ++ && !usingQtQuick2DRenderer() && !disableGpu; + + if (tryGL) { + if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) { diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 1f21821..4878d07 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 31 16:49:12 UTC 2017 - fabian@ritter-vogt.de + +- Restore working version of + disable-gpu-when-using-nouveau-boo-1005323.diff + ------------------------------------------------------------------- Sun Oct 8 14:12:31 UTC 2017 - lbeltrame@kde.org