From aa4e2c0c5463ecacf2ecb8b5ccf97acbaaf8ec90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <kde@martin-graesslin.com>
Date: Sun, 10 Oct 2010 17:40:43 +0000
Subject: [PATCH] Print useful version information for nouveau.

Unknown, unknown just looks bad given that we will have more
nouveau users in future. Neither the vendor, nor the renderer
nor the version string contains a version number. The information
most close to a version number is the gallium number. Other
possible number would be OpenGL version or Mesa version in the
GL version string, but those information is not used in other
Mesa drivers.

svn path=/trunk/KDE/kdebase/workspace/; revision=1184526
---
 compositingprefs.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index 25ad819913..93efb00c16 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -268,6 +268,12 @@ void CompositingPrefs::detectDriverAndVersion()
         if (!mVersion.startsWith("20"))
             mVersion = Version( mGLRenderer.split(' ')[ 5 ] );
         }
+    else if( mGLVendor == "nouveau" )
+        {
+        mDriver = "nouveau";
+        // use Gallium version number as the version - second part of renderer
+        mVersion = Version( mGLRenderer.split(' ')[ 1 ] );
+        }
     else if( mGLRenderer == "Software Rasterizer" )
         {
         mDriver = "software";