From 7a06c636b28607dec35571eb8350992b1e1ffc7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 28 Apr 2009 15:00:56 +0000 Subject: [PATCH] Reenable logout blur - we found the reason why it stopped rendering (popRenderTarget in assert statement). If someone still has problems with it, please yell. svn path=/trunk/KDE/kdebase/workspace/; revision=960509 --- effects/logout/logout.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/effects/logout/logout.cpp b/effects/logout/logout.cpp index 4dfad56238..a0e788707d 100644 --- a/effects/logout/logout.cpp +++ b/effects/logout/logout.cpp @@ -58,10 +58,8 @@ LogoutEffect::~LogoutEffect() void LogoutEffect::reconfigure( ReconfigureFlags ) { - // Disable blur by default as some drivers don't correctly fallback if they don't - // support it and I have yet to work out a way of accurately detecting support. KConfigGroup conf = effects->effectConfig( "Logout" ); - bool useBlur = conf.readEntry( "UseBlur", false ); + bool useBlur = conf.readEntry( "UseBlur", true ); #ifdef KWIN_HAVE_OPENGL_COMPOSITING blurSupported = false; @@ -137,7 +135,8 @@ void LogoutEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data #ifdef KWIN_HAVE_OPENGL_COMPOSITING if( blurSupported && progress > 0.0 ) { - assert( effects->popRenderTarget() == blurTarget ); + GLRenderTarget* target = effects->popRenderTarget(); + assert( target == blurTarget ); // Render the blurred scene blurTexture->bind();