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

Allow kdelibs/kdebase compile without glu library (review 6213)

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1209642
This commit is contained in:
Andriy Rysin 2010-12-27 19:12:37 +00:00
parent e6750d5ba4
commit 0f2e500abd
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compositingprefs.cpp
View file

@ -241,6 +241,7 @@ void CompositingPrefs::detectDriverAndVersion()
// See http://techbase.kde.org/Projects/KWin/HW for a list of some cards that are known to work. // 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()
{ {
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
// Always recommend // Always recommend
mRecommendCompositing = true; mRecommendCompositing = true;
@ -248,6 +249,7 @@ void CompositingPrefs::applyDriverSpecificOptions()
mStrictBinding = !gl->supports( LooseBinding ); mStrictBinding = !gl->supports( LooseBinding );
if ( gl->driver() == Driver_Intel ) if ( gl->driver() == Driver_Intel )
mEnableVSync = false; mEnableVSync = false;
#endif
} }

2
options.cpp
View file

@ -57,6 +57,7 @@ int currentRefreshRate()
int rate = -1; int rate = -1;
if( options->refreshRate > 0 ) // use manually configured refresh rate if( options->refreshRate > 0 ) // use manually configured refresh rate
rate = options->refreshRate; rate = options->refreshRate;
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
else if ( GLPlatform::instance()->driver() == Driver_NVidia ) else if ( GLPlatform::instance()->driver() == Driver_NVidia )
{ {
QProcess nvidia_settings; QProcess nvidia_settings;
@ -73,6 +74,7 @@ int currentRefreshRate()
rate = qRound(frate); rate = qRound(frate);
} }
} }
#endif
#ifdef HAVE_XRANDR #ifdef HAVE_XRANDR
else if( Extensions::randrAvailable() ) else if( Extensions::randrAvailable() )
{ {