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

Fall back to XRender if OpenGL fails.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=671719
This commit is contained in:
Luboš Luňák 2007-06-05 12:50:18 +00:00
parent ba8b014c82
commit a352c5d349
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
composite.cpp
View file

@ -92,24 +92,28 @@ void Workspace::setupCompositing()
case 'B':
kDebug( 1212 ) << "X compositing" << endl;
scene = new SceneBasic( this );
break;
break; // don't fall through (this is a testing one)
#ifdef HAVE_OPENGL
case 'O':
kDebug( 1212 ) << "OpenGL compositing" << endl;
scene = new SceneOpenGL( this );
if( !scene->initFailed())
break; // -->
delete scene;
scene = NULL;
// fall through, try XRender
#endif
#if defined(HAVE_XRENDER) && defined(HAVE_XFIXES)
case 'X':
kDebug( 1212 ) << "XRender compositing" << endl;
scene = new SceneXrender( this );
break;
#endif
#ifdef HAVE_OPENGL
case 'O':
kDebug( 1212 ) << "OpenGL compositing" << endl;
scene = new SceneOpenGL( this );
break;
#endif
default:
kDebug( 1212 ) << "No compositing" << endl;
return;
}
if( scene != NULL && scene->initFailed())
if( scene == NULL || scene->initFailed())
{
delete scene;
scene = NULL;