Make it compile again after rebasing on current trunk
This commit is contained in:
parent
6da912ba9e
commit
e5932ff214
3 changed files with 3 additions and 1 deletions
|
@ -255,6 +255,7 @@ void CompositingPrefs::applyDriverSpecificOptions()
|
|||
// Always recommend
|
||||
mRecommendCompositing = true;
|
||||
|
||||
#ifndef KWIN_HAVE_OPENGLES
|
||||
GLPlatform *gl = GLPlatform::instance();
|
||||
mStrictBinding = !gl->supports( LooseBinding );
|
||||
if ( gl->driver() == Driver_Intel )
|
||||
|
|
|
@ -58,6 +58,7 @@ int currentRefreshRate()
|
|||
if( options->refreshRate > 0 ) // use manually configured refresh rate
|
||||
rate = options->refreshRate;
|
||||
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
|
||||
#ifndef KWIN_HAVE_OPENGLES
|
||||
else if ( GLPlatform::instance()->driver() == Driver_NVidia )
|
||||
{
|
||||
QProcess nvidia_settings;
|
||||
|
@ -75,6 +76,7 @@ int currentRefreshRate()
|
|||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_XRANDR
|
||||
else if( Extensions::randrAvailable() )
|
||||
{
|
||||
|
|
|
@ -279,7 +279,6 @@ void SceneOpenGL::paintBackground(QRegion region)
|
|||
|
||||
void SceneOpenGL::Texture::init()
|
||||
{
|
||||
damaged = true;
|
||||
findTarget();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue