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

Disabling the fallback to XRender. It's causing more trouble than the benefits.

Browse source 
With Intel drivers currently the self check at KWin startup fails (no idea why) and KWin falls back to XRender. This is probably an explanation for all the complaints about slow kwin in 4.5 and the missing effects. So let's fail and make it possible to restart compositing via systemsettings and alt+shift+f12.
Nevertheless it would be nice to fix the the failing selfcheck...

svn path=/trunk/KDE/kdebase/workspace/; revision=1148315
This commit is contained in:
Martin Gräßlin 2010-07-10 08:44:40 +00:00
parent a13e16b4f4
commit 12918d3ee8
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
composite.cpp
View file

@ -167,9 +167,8 @@ void Workspace::setupCompositing()
scene = NULL; scene = NULL;
} }
// Fall back to XRender // Do not Fall back to XRender - it causes problems when selfcheck fails during startup, but works later on
kDebug(1212) << "Falling back to XRender as OpenGL failed"; break;
type = options->compositingMode = XRenderCompositing;
} }
#endif #endif
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING

2
scene_opengl.cpp
View file

@ -713,7 +713,7 @@ bool SceneOpenGL::selfCheckFinish()
|| img.pixel( 1, 1 ) != QColor( Qt::black ).rgb() || img.pixel( 1, 1 ) != QColor( Qt::black ).rgb()
|| img.pixel( 2, 1 ) != QColor( Qt::white ).rgb()) || img.pixel( 2, 1 ) != QColor( Qt::white ).rgb())
{ {
kError( 1212 ) << "OpenGL compositing self-check failed, falling back to XRender."; kError( 1212 ) << "OpenGL compositing self-check failed, disabling compositing.";
ok = false; ok = false;
break; break;
} }