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

Reenable logout blur - we found the reason why it stopped rendering (popRenderTarget in assert statement). If someone still has problems with it, please yell.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=960509
This commit is contained in:
Martin Gräßlin 2009-04-28 15:00:56 +00:00
parent 720e507db4
commit 7a06c636b2
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
effects/logout/logout.cpp
View file

@ -58,10 +58,8 @@ LogoutEffect::~LogoutEffect()
void LogoutEffect::reconfigure( ReconfigureFlags ) 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" ); KConfigGroup conf = effects->effectConfig( "Logout" );
bool useBlur = conf.readEntry( "UseBlur", false ); bool useBlur = conf.readEntry( "UseBlur", true );
#ifdef KWIN_HAVE_OPENGL_COMPOSITING #ifdef KWIN_HAVE_OPENGL_COMPOSITING
blurSupported = false; blurSupported = false;
@ -137,7 +135,8 @@ void LogoutEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data
#ifdef KWIN_HAVE_OPENGL_COMPOSITING #ifdef KWIN_HAVE_OPENGL_COMPOSITING
if( blurSupported && progress > 0.0 ) if( blurSupported && progress > 0.0 )
{ {
assert( effects->popRenderTarget() == blurTarget ); GLRenderTarget* target = effects->popRenderTarget();
assert( target == blurTarget );
// Render the blurred scene // Render the blurred scene
blurTexture->bind(); blurTexture->bind();