59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
From 96f6cab22cab252cbe7a98bbeadde95497e0bd75 Mon Sep 17 00:00:00 2001
|
|
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
Date: Tue, 26 Feb 2019 10:38:58 +0100
|
|
Subject: [PATCH 234/518] Blacklist nouveau and llvmpipe for multithreading
|
|
|
|
After removing Mesa drivers from being blank blacklisted, we still need
|
|
to blacklist nouveau specifically due to their lack of proper locking:
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=91632
|
|
|
|
llvmpipe is similarly blacklisted for now, as we lack enough information
|
|
to know if the underlying issue behind QTCREATORBUG-10666 has been solved.
|
|
|
|
Fixes: QTBUG-73715
|
|
Change-Id: I1a60b562cd9db94fa8462b922d6bfeebf0088dc5
|
|
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
---
|
|
.../xcb_glx/qglxintegration.cpp | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
|
index d42a33c22b..476de6d1e5 100644
|
|
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
|
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
|
@@ -652,6 +652,12 @@ static const char *qglx_threadedgl_blacklist_renderer[] = {
|
|
0
|
|
};
|
|
|
|
+static const char *qglx_threadedgl_blacklist_vendor[] = {
|
|
+ "llvmpipe", // QTCREATORBUG-10666
|
|
+ "nouveau", // https://bugs.freedesktop.org/show_bug.cgi?id=91632
|
|
+ nullptr
|
|
+};
|
|
+
|
|
void QGLXContext::queryDummyContext()
|
|
{
|
|
if (m_queriedDummyContext)
|
|
@@ -710,6 +716,18 @@ void QGLXContext::queryDummyContext()
|
|
}
|
|
}
|
|
}
|
|
+ if (const char *vendor = (const char *) glGetString(GL_VENDOR)) {
|
|
+ for (int i = 0; qglx_threadedgl_blacklist_vendor[i]; ++i) {
|
|
+ if (strstr(vendor, qglx_threadedgl_blacklist_vendor[i]) != 0) {
|
|
+ qCDebug(lcQpaGl).nospace() << "Multithreaded OpenGL disabled: "
|
|
+ "blacklisted vendor \""
|
|
+ << qglx_threadedgl_blacklist_vendor[i]
|
|
+ << "\"";
|
|
+ m_supportsThreading = false;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
|
|
if (glxvendor && m_supportsThreading) {
|
|
// Blacklist Mesa drivers due to QTCREATORBUG-10875 (crash in creator),
|
|
--
|
|
2.21.0
|
|
|