[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkde-workspace/graesslin/kwin-coding-style=5D_kwin/l?=
From:       Martin_Gräßlin <kde () martin-graesslin ! com>
Date:       2011-01-31 21:05:19
Message-ID: 20110131210519.A15C0A60ED () git ! kde ! org
[Download RAW message or body]

Git commit abea62ace299177dda2ebf01dfa8975803cfabd8 by Martin Gräßlin. on behalf of Fredrik Höglund
Pushed by graesslin into branch 'graesslin/kwin-coding-style'.

Fix chipset detection with r300g

svn path=/branches/KDE/4.6/kdebase/workspace/; revision=1213841

M  +2    -1    kwin/lib/kwinglplatform.cpp     

http://commits.kde.org/a5d5b61a/abea62ace299177dda2ebf01dfa8975803cfabd8

diff --git a/kwin/lib/kwinglplatform.cpp b/kwin/lib/kwinglplatform.cpp
index 51b869e..37fddc9 100644
--- a/kwin/lib/kwinglplatform.cpp
+++ b/kwin/lib/kwinglplatform.cpp
@@ -587,7 +587,8 @@ void GLPlatform::detect()
         // Sample renderer string: Gallium 0.4 on AMD RV740 
         const QList<QByteArray> tokens = m_renderer.split(' ');
         m_galliumVersion = parseVersionString(tokens.at(1));
-        m_chipset = tokens.at(3) == "AMD" ? tokens.at(4) : tokens.at(3);
+        m_chipset = (tokens.at(3) == "AMD" || tokens.at(3) == "ATI") ?
+                tokens.at(4) : tokens.at(3);
 
         // R300G
         if (m_vendor == "X.Org R300 Project") {


[prev in list] [next in list] [prev in thread] [next in thread]