From 12918d3ee83702837905904f11b740e074e24cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 10 Jul 2010 08:44:40 +0000 Subject: [PATCH] Disabling the fallback to XRender. It's causing more trouble than the benefits. 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 --- composite.cpp | 5 ++--- scene_opengl.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/composite.cpp b/composite.cpp index e7d9a8af07..245676a6ab 100644 --- a/composite.cpp +++ b/composite.cpp @@ -167,9 +167,8 @@ void Workspace::setupCompositing() scene = NULL; } - // Fall back to XRender - kDebug(1212) << "Falling back to XRender as OpenGL failed"; - type = options->compositingMode = XRenderCompositing; + // Do not Fall back to XRender - it causes problems when selfcheck fails during startup, but works later on + break; } #endif #ifdef KWIN_HAVE_XRENDER_COMPOSITING diff --git a/scene_opengl.cpp b/scene_opengl.cpp index d75ffa6abc..fc6e967408 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -713,7 +713,7 @@ bool SceneOpenGL::selfCheckFinish() || img.pixel( 1, 1 ) != QColor( Qt::black ).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; break; }