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

Ensure logout compiles with GLES

Browse source
This commit is contained in:
Martin Gräßlin 2011-07-17 17:01:27 +02:00
parent c3cf4482a3
commit d0664a9c96
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
effects/logout/logout.cpp
View file

@ -200,6 +200,7 @@ void LogoutEffect::paintScreen(int mask, QRegion region, ScreenPaintData& data)
effects->paintScreen(mask, region, data); effects->paintScreen(mask, region, data);
#ifdef KWIN_HAVE_OPENGL_COMPOSITING #ifdef KWIN_HAVE_OPENGL_COMPOSITING
#ifndef KWIN_HAVE_OPENGLES
if (effects->compositingType() == KWin::OpenGLCompositing && progress > 0.0) { if (effects->compositingType() == KWin::OpenGLCompositing && progress > 0.0) {
if (!blurSupported) { if (!blurSupported) {
if (!logoutWindowPassed) if (!logoutWindowPassed)
@ -289,6 +290,7 @@ void LogoutEffect::paintScreen(int mask, QRegion region, ScreenPaintData& data)
} }
} }
#endif #endif
#endif
} }
void LogoutEffect::postPaintScreen() void LogoutEffect::postPaintScreen()
@ -353,6 +355,7 @@ bool LogoutEffect::isLogoutDialog(EffectWindow* w)
#ifdef KWIN_HAVE_OPENGL_COMPOSITING #ifdef KWIN_HAVE_OPENGL_COMPOSITING
void LogoutEffect::renderVignetting() void LogoutEffect::renderVignetting()
{ {
#ifndef KWIN_HAVE_OPENGLES
glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT); glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT);
glEnable(GL_BLEND); // If not already (Such as when rendered straight to the screen) glEnable(GL_BLEND); // If not already (Such as when rendered straight to the screen)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@ -376,6 +379,7 @@ void LogoutEffect::renderVignetting()
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
} }
glPopAttrib(); glPopAttrib();
#endif
} }
#endif #endif