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

I forgot to actually enable compositing by default for some cards listed

Browse source 
on the HW techbase page, do so for intel Gxx cards, radeon r200 and fglrx.


svn path=/trunk/KDE/kdebase/workspace/; revision=871764
This commit is contained in:
Luboš Luňák 2008-10-15 14:10:43 +00:00
parent 5a7557fc6f
commit ecfaf59014
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
compositingprefs.cpp
View file

@ -257,8 +257,8 @@ void CompositingPrefs::detectDriverAndVersion()
mDriver = "fglrx"; mDriver = "fglrx";
mVersion = Version( mGLVersion.split(" ").first()); mVersion = Version( mGLVersion.split(" ").first());
} }
else if( mGLRenderer.startsWith( "Mesa DRI R200" )) else if( mGLRenderer.startsWith( "Mesa DRI" ))
{ // radeon r200 only ? {
mDriver = "radeon"; mDriver = "radeon";
mVersion = Version( mGLRenderer.split(" ")[ 3 ] ); mVersion = Version( mGLRenderer.split(" ")[ 3 ] );
} }
@ -277,6 +277,7 @@ void CompositingPrefs::detectDriverAndVersion()
#endif #endif
} }
// See http://techbase.kde.org/Projects/KWin/HW for a list of some cards that are known to work.
void CompositingPrefs::applyDriverSpecificOptions() void CompositingPrefs::applyDriverSpecificOptions()
{ {
if( mXgl ) if( mXgl )
@ -290,11 +291,18 @@ void CompositingPrefs::applyDriverSpecificOptions()
kDebug( 1212 ) << "intel driver, disabling vsync, enabling direct"; kDebug( 1212 ) << "intel driver, disabling vsync, enabling direct";
mEnableVSync = false; mEnableVSync = false;
mEnableDirectRendering = true; mEnableDirectRendering = true;
// Enable compositing by default only on 900-series cards if( mVersion >= Version( "20061017" ))
if( mVersion >= Version( "20061017" ) && mGLRenderer.contains( "Intel(R) 9" )) {
{ if( mGLRenderer.contains( "Intel(R) 9" ))
kDebug( 1212 ) << "intel >= 20061017 and 900-series card, enabling compositing"; { // Enable compositing by default on 900-series cards
mEnableCompositing = true; kDebug( 1212 ) << "intel >= 20061017 and 900-series card, enabling compositing";
mEnableCompositing = true;
}
if( mGLRenderer.contains( "Mesa DRI Intel(R) G" ))
{ // e.g. G43 chipset
kDebug( 1212 ) << "intel >= 20061017 and Gxx-series card, enabling compositing";
mEnableCompositing = true;
}
} }
} }
else if( mDriver == "nvidia" ) else if( mDriver == "nvidia" )
@ -311,6 +319,22 @@ void CompositingPrefs::applyDriverSpecificOptions()
mEnableCompositing = true; mEnableCompositing = true;
} }
} }
else if( mDriver == "radeon" )
{ // radeon r200 only ?
if( mGLRenderer.startsWith( "Mesa DRI R200" ) && mVersion >= Version( "20060602" ))
{
kDebug( 1212 ) << "radeon r200 >= 20060602, enabling compositing";
mEnableCompositing = true;
}
}
else if( mDriver == "fglrx" )
{ // radeon r200 only ?
if( mVersion >= Version( "2.1.7412" ))
{
kDebug( 1212 ) << "fglrx >= 2.1.7412, enabling compositing";
mEnableCompositing = true;
}
}
} }