yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Match intel and nvidia more exactly when detecting, and also

Browse source 
enable by default ati cards with fglrx driver or
(only r200 ...?) with radeon driver.


svn path=/trunk/KDE/kdebase/workspace/; revision=864377
This commit is contained in:
Luboš Luňák 2008-09-24 16:36:24 +00:00
parent db8e8365da
commit c2ef38b83c
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
compositingprefs.cpp
View file

@ -218,18 +218,28 @@ void CompositingPrefs::detectDriverAndVersion()
kDebug( 1212 ) << "GL version is" << mGLVersion; kDebug( 1212 ) << "GL version is" << mGLVersion;
kDebug( 1212 ) << "XGL:" << ( mXgl ? "yes" : "no" ); kDebug( 1212 ) << "XGL:" << ( mXgl ? "yes" : "no" );
if( mGLRenderer.contains( "Intel" )) if( mGLRenderer.startsWith( "Mesa DRI Intel" ))
{ {
mDriver = "intel"; mDriver = "intel";
QStringList words = mGLRenderer.split(" "); QStringList words = mGLRenderer.split(" ");
mVersion = Version( words[ words.count() - 2 ] ); mVersion = Version( words[ words.count() - 2 ] );
} }
else if( mGLVendor.contains( "NVIDIA" )) else if( mGLVendor == "NVIDIA Corporation" )
{ {
mDriver = "nvidia"; mDriver = "nvidia";
QStringList words = mGLVersion.split(" "); QStringList words = mGLVersion.split(" ");
mVersion = Version( words[ words.count() - 1 ] ); mVersion = Version( words[ words.count() - 1 ] );
} }
else if( mGLVendor == "ATI Technologies Inc." )
{
mDriver = "fglrx";
mVersion = Version( mGLVersion.split(" ").first());
}
else if( mGLRenderer.startsWith( "Mesa DRI R200" ))
{ // radeon r200 only ?
mDriver = "radeon";
mVersion = Version( mGLRenderer.split(" ")[ 3 ] );
}
else else
{ {
mDriver = "unknown"; mDriver = "unknown";