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

Reactivating the use of a gl list for painting the cube. The cube is painted once without using the gl list. By that the problem of black windows on other desktops should be solved. If the black window problem appears again the patch will be reverted.

Browse source 
CCBUG: 183905

svn path=/trunk/KDE/kdebase/workspace/; revision=929840
This commit is contained in:
Martin Gräßlin 2009-02-22 11:27:08 +00:00
parent eae6279ca9
commit a6d8bb41bb
2 changed files with 46 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
effects/cube/cube.cpp
View file

@ -315,6 +315,16 @@ void CubeEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data )
glPopMatrix();
}
// compile List for cube
if( useList )
{
glNewList( glList + 1, GL_COMPILE );
glPushMatrix();
paintCube( mask, region, data );
glPopMatrix();
glEndList();
}
QRect rect = effects->clientArea( FullScreenArea, activeScreen, effects->currentDesktop());
if( effects->numScreens() > 1 && bigCube )
rect = effects->clientArea( FullArea, activeScreen, effects->currentDesktop() );
@ -443,9 +453,14 @@ void CubeEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data )
}
glPushMatrix();
glCallList( glList );
glPushMatrix();
paintCube( mask, region, data );
glPopMatrix();
if( useList )
glCallList( glList + 1 );
else
{
glPushMatrix();
paintCube( mask, region, data );
glPopMatrix();
}
glPopMatrix();
glCullFace( GL_BACK );
if( mode == Cylinder )
@ -456,9 +471,14 @@ void CubeEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data )
}
glPushMatrix();
glCallList( glList );
glPushMatrix();
paintCube( mask, region, data );
glPopMatrix();
if( useList )
glCallList( glList + 1 );
else
{
glPushMatrix();
paintCube( mask, region, data );
glPopMatrix();
}
glPopMatrix();
// cap
@ -552,9 +572,14 @@ void CubeEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data )
}
glPushMatrix();
glCallList( glList );
glPushMatrix();
paintCube( mask, region, data );
glPopMatrix();
if( useList )
glCallList( glList + 1 );
else
{
glPushMatrix();
paintCube( mask, region, data );
glPopMatrix();
}
glPopMatrix();
glCullFace( GL_FRONT );
if( mode == Cylinder )
@ -571,10 +596,17 @@ void CubeEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data )
}
glPushMatrix();
glCallList( glList );
glPushMatrix();
paintCube( mask, region, data );
glPopMatrix();
if( useList )
glCallList( glList + 1 );
else
{
glPushMatrix();
paintCube( mask, region, data );
glPopMatrix();
}
glPopMatrix();
// we painted once without glList, now it's safe to paint using lists
useList = true;
// cap
if( paintCaps && ( effects->numberOfDesktops() >= 2 ))
@ -1976,6 +2008,7 @@ void CubeEffect::setActive( bool active )
glList = glGenLists(3);
capListCreated = false;
recompileList = true;
useList = false;
// create the capList
if( paintCaps )
paintCap();

1
effects/cube/cube.h
View file

@ -147,6 +147,7 @@ class CubeEffect
float capDeformationFactor;
bool useZOrdering;
float zOrderingFactor;
bool useList;
// GL lists
bool capListCreated;