From 4a7f1326e3d342148a4a9147505a4d8d531b4a06 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@digia.com>
Date: Wed, 30 Oct 2013 14:09:18 +0100
Subject: Work around Nouveau driver bugs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I25311a2bd88f41087352e0a43ba505f4e27b7e85
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
---
 src/particles/qquickimageparticle.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/particles/qquickimageparticle.cpp')

diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index fa828d7b63..036dfb901e 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -1385,6 +1385,12 @@ void QQuickImageParticle::finishBuildParticleNodes()
     }
 #endif
 
+#ifdef Q_OS_LINUX
+    // Nouveau drivers can potentially freeze a machine entirely when taking the point-sprite path.
+    if (perfLevel < Deformable && strstr((char *) glGetString(GL_VENDOR), "nouveau"))
+        perfLevel = Deformable;
+#endif
+
     if (perfLevel >= Colored  && !m_color.isValid())
         m_color = QColor(Qt::white);//Hidden default, but different from unset
 
-- 
cgit v1.2.3