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

Don't bind the texture if not necessary.

Browse source 
svn path=/branches/work/kwin_composite/; revision=595561
This commit is contained in:
Luboš Luňák 2006-10-14 20:50:24 +00:00
parent 17e46e32fb
commit fef8c89b93
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scene_opengl.cpp
View file

@ -288,7 +288,6 @@ void SceneOpenGL::paintGenericScreen( ToplevelList windows )
Window& w = this->windows[ c ]; Window& w = this->windows[ c ];
if( !w.isVisible()) if( !w.isVisible())
continue; continue;
w.bindTexture();
w.paint( infiniteRegion(), PAINT_OPAQUE | PAINT_TRANSLUCENT ); w.paint( infiniteRegion(), PAINT_OPAQUE | PAINT_TRANSLUCENT );
} }
glPopMatrix(); glPopMatrix();
@ -331,7 +330,6 @@ void SceneOpenGL::paintSimpleScreen( QRegion damage, ToplevelList windows )
phase2.prepend( Phase2Data( &w, region )); phase2.prepend( Phase2Data( &w, region ));
continue; continue;
} }
w.bindTexture();
w.paint( region, PAINT_OPAQUE ); w.paint( region, PAINT_OPAQUE );
// window is opaque, clip windows below // window is opaque, clip windows below
region -= w.shape().translated( w.x(), w.y()); region -= w.shape().translated( w.x(), w.y());
@ -340,7 +338,6 @@ void SceneOpenGL::paintSimpleScreen( QRegion damage, ToplevelList windows )
foreach( Phase2Data d, phase2 ) foreach( Phase2Data d, phase2 )
{ {
Window& w = *d.window; Window& w = *d.window;
w.bindTexture();
w.paint( d.region, PAINT_TRANSLUCENT ); w.paint( d.region, PAINT_TRANSLUCENT );
} }
glPopMatrix(); glPopMatrix();
@ -526,6 +523,7 @@ void SceneOpenGL::Window::bindTexture()
XFreePixmap( display(), pix ); XFreePixmap( display(), pix );
if( root_db ) if( root_db )
glDrawBuffer( GL_BACK ); glDrawBuffer( GL_BACK );
glXMakeContextCurrent( display(), glxroot, glxroot, context );
} }
#ifdef ALPHA_CLEAR_COPY #ifdef ALPHA_CLEAR_COPY
if( alpha_clear ) if( alpha_clear )
@ -600,15 +598,6 @@ static void quadPaint( int x1, int y1, int x2, int y2, bool invert_y )
void SceneOpenGL::Window::paint( QRegion region, int mask ) void SceneOpenGL::Window::paint( QRegion region, int mask )
{ {
// paint only requested areas
if( region != infiniteRegion()) // avoid integer overflow
region.translate( -x(), -y());
region &= shape();
if( region.isEmpty())
return;
glXMakeContextCurrent( display(), glxroot, glxroot, context );
glPushMatrix();
glTranslatef( x(), y(), 0 );
if( mask & ( PAINT_OPAQUE | PAINT_TRANSLUCENT )) if( mask & ( PAINT_OPAQUE | PAINT_TRANSLUCENT ))
{} {}
else if( mask & PAINT_OPAQUE ) else if( mask & PAINT_OPAQUE )
@ -621,6 +610,15 @@ void SceneOpenGL::Window::paint( QRegion region, int mask )
if( isOpaque()) if( isOpaque())
return; return;
} }
// paint only requested areas
if( region != infiniteRegion()) // avoid integer overflow
region.translate( -x(), -y());
region &= shape();
if( region.isEmpty())
return;
bindTexture();
glPushMatrix();
glTranslatef( x(), y(), 0 );
bool was_blend = glIsEnabled( GL_BLEND ); bool was_blend = glIsEnabled( GL_BLEND );
if( !isOpaque()) if( !isOpaque())
{ {