Move pushRenderTarget() in logout effect into paintScreen(). That ensures that logout effect doesn't pop the render target of another effect.

BUG: 194230

svn path=/trunk/KDE/kdebase/workspace/; revision=973990
This commit is contained in:
Martin Gräßlin 2009-05-28 11:37:02 +00:00
parent f9b3022553
commit 59590e2ff5

View file

@ -92,7 +92,6 @@ void LogoutEffect::prePaintScreen( ScreenPrePaintData& data, int time )
if( blurSupported && progress > 0.0 )
{
data.mask |= PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS;
effects->pushRenderTarget( blurTarget );
}
#endif
@ -142,6 +141,12 @@ void LogoutEffect::paintWindow( EffectWindow* w, int mask, QRegion region, Windo
void LogoutEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data )
{
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
if( blurSupported && progress > 0.0 )
{
effects->pushRenderTarget( blurTarget );
}
#endif
effects->paintScreen( mask, region, data );
#ifdef KWIN_HAVE_OPENGL_COMPOSITING