Enable compositing by default on all Intel 900-series cards.

Let's see what happens...

svn path=/trunk/KDE/kdebase/workspace/; revision=736159
This commit is contained in:
Rivo Laks 2007-11-13 16:20:39 +00:00
parent 36c3f4804c
commit e8dffc8f3a

View file

@ -217,26 +217,26 @@ void CompositingPrefs::applyDriverSpecificOptions()
kDebug() << "intel driver, disabling vsync, enabling direct"; kDebug() << "intel driver, disabling vsync, enabling direct";
mEnableVSync = false; mEnableVSync = false;
mEnableDirectRendering = true; mEnableDirectRendering = true;
if( mVersion >= Version( "20061017" ) && mGLRenderer.contains( "945GM" )) // Enable compositing by default only on 900-series cards
if( mVersion >= Version( "20061017" ) && mGLRenderer.contains( "Intel(R) 9" ))
{ {
kDebug() << "intel >= 20061017 and whitelisted card, enabling compositing"; kDebug() << "intel >= 20061017 and 900-series card, enabling compositing";
mEnableCompositing = true; mEnableCompositing = true;
} }
} }
else if( mDriver == "nvidia" ) else if( mDriver == "nvidia" )
{ {
mStrictBinding = false; mStrictBinding = false;
if( mVersion >= Version( "100.14.23" )) if( mVersion <= Version( "100.14.23" ))
{ {
kDebug() << "nvidia >= 100.14.23, enabling compositing"; kDebug() << "nvidia <= 100.14.23, disabling vsync";
mEnableCompositing = true;
}
else if( mVersion >= Version( "96.39" ))
{
kDebug() << "nvidia >= 96.39, enabling compositing, disabling vsync";
mEnableCompositing = true;
mEnableVSync = false; mEnableVSync = false;
} }
if( mVersion >= Version( "96.39" ))
{
kDebug() << "nvidia >= 96.39, enabling compositing";
mEnableCompositing = true;
}
} }
} }