From 17e46e32fb9d771895d95259812a0be3d54ef35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Sat, 14 Oct 2006 20:46:47 +0000 Subject: [PATCH] Separate more generic and simple screen paint. svn path=/branches/work/kwin_composite/; revision=595559 --- scene_opengl.cpp | 100 ++++++++++++++++++++++++++++++----------------- scene_opengl.h | 9 ++++- 2 files changed, 71 insertions(+), 38 deletions(-) diff --git a/scene_opengl.cpp b/scene_opengl.cpp index 315250f708..e09aab8c0c 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -32,6 +32,7 @@ GLXFBConfig SceneOpenGL::fbcdrawable; GLXContext SceneOpenGL::context; GLXPixmap SceneOpenGL::glxroot; bool SceneOpenGL::tfp_mode; // using glXBindTexImageEXT (texture_from_pixmap) +bool SceneOpenGL::root_db; // destination drawable is double-buffered typedef void (*glXBindTexImageEXT_func)( Display* dpy, GLXDrawable drawable, int buffer, const int* attrib_list ); @@ -180,6 +181,7 @@ void SceneOpenGL::initBuffer() { buffer = rootWindow(); glxroot = glXCreateWindow( display(), fbcroot, buffer, NULL ); + glDrawBuffer( GL_BACK ); } else { @@ -262,15 +264,33 @@ void SceneOpenGL::paint( QRegion damage, ToplevelList windows ) { grabXServer(); glXWaitX(); + if( /*generic case*/false ) + paintGenericScreen( windows ); + else + paintSimpleScreen( damage, windows ); + ungrabXServer(); + checkGLError( "PostPaint" ); + } + +// the generic painting code that should eventually handle even +// transformations +void SceneOpenGL::paintGenericScreen( ToplevelList windows ) + { glPushMatrix(); glClearColor( 0, 0, 0, 1 ); glClear( GL_COLOR_BUFFER_BIT ); glScalef( 1, -1, 1 ); glTranslatef( 0, -displayHeight(), 0 ); - if( /*generic case*/false ) - paintGenericScreen( windows ); - else - paintSimpleScreen( damage, windows ); + paintBackground( infiniteRegion()); + foreach( Toplevel* c, windows ) // bottom to top + { + assert( this->windows.contains( c )); + Window& w = this->windows[ c ]; + if( !w.isVisible()) + continue; + w.bindTexture(); + w.paint( infiniteRegion(), PAINT_OPAQUE | PAINT_TRANSLUCENT ); + } glPopMatrix(); if( root_db ) glXSwapBuffers( display(), glxroot ); @@ -281,34 +301,16 @@ void SceneOpenGL::paint( QRegion damage, ToplevelList windows ) XCopyArea( display(), buffer, rootWindow(), gcroot, 0, 0, displayWidth(), displayHeight(), 0, 0 ); XFlush( display()); } - ungrabXServer(); - checkGLError( "PostPaint" ); - } - -// the generic painting code that should eventually handle even -// transformations -void SceneOpenGL::paintGenericScreen( ToplevelList windows ) - { - foreach( Toplevel* c, windows ) // bottom to top - { - assert( this->windows.contains( c )); - Window& w = this->windows[ c ]; - if( !w.isVisible()) - continue; - w.bindTexture(); - if( !w.isOpaque()) - { - glEnable( GL_BLEND ); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - } - w.paint( infiniteRegion()); - glDisable( GL_BLEND ); - } } // the optimized case without any transformations at all void SceneOpenGL::paintSimpleScreen( QRegion damage, ToplevelList windows ) { + glPushMatrix(); + glClearColor( 0, 0, 0, 1 ); + glClear( GL_COLOR_BUFFER_BIT ); + glScalef( 1, -1, 1 ); + glTranslatef( 0, -displayHeight(), 0 ); QList< Phase2Data > phase2; QRegion region = damage; // TODO repaint only damaged areas (means also don't do glXSwapBuffers and similar) @@ -330,7 +332,7 @@ void SceneOpenGL::paintSimpleScreen( QRegion damage, ToplevelList windows ) continue; } w.bindTexture(); - w.paint( region ); + w.paint( region, PAINT_OPAQUE ); // window is opaque, clip windows below region -= w.shape().translated( w.x(), w.y()); } @@ -339,10 +341,17 @@ void SceneOpenGL::paintSimpleScreen( QRegion damage, ToplevelList windows ) { Window& w = *d.window; w.bindTexture(); - glEnable( GL_BLEND ); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - w.paint( d.region ); - glDisable( GL_BLEND ); + w.paint( d.region, PAINT_TRANSLUCENT ); + } + glPopMatrix(); + if( root_db ) + glXSwapBuffers( display(), glxroot ); + else + { + glFlush(); + glXWaitGL(); + XCopyArea( display(), buffer, rootWindow(), gcroot, 0, 0, displayWidth(), displayHeight(), 0, 0 ); + XFlush( display()); } } @@ -515,6 +524,8 @@ void SceneOpenGL::Window::bindTexture() // the pixmap glXDestroyPixmap( display(), pixmap ); XFreePixmap( display(), pix ); + if( root_db ) + glDrawBuffer( GL_BACK ); } #ifdef ALPHA_CLEAR_COPY if( alpha_clear ) @@ -587,7 +598,7 @@ static void quadPaint( int x1, int y1, int x2, int y2, bool invert_y ) glVertex2i( x1, y2 ); } -void SceneOpenGL::Window::paint( QRegion region ) +void SceneOpenGL::Window::paint( QRegion region, int mask ) { // paint only requested areas if( region != infiniteRegion()) // avoid integer overflow @@ -595,15 +606,31 @@ void SceneOpenGL::Window::paint( QRegion region ) region &= shape(); if( region.isEmpty()) return; -// TODO for double-buffered root glDrawBuffer( GL_BACK ); glXMakeContextCurrent( display(), glxroot, glxroot, context ); glPushMatrix(); glTranslatef( x(), y(), 0 ); + if( mask & ( PAINT_OPAQUE | PAINT_TRANSLUCENT )) + {} + else if( mask & PAINT_OPAQUE ) + { + if( !isOpaque()) + return; + } + else if( mask & PAINT_TRANSLUCENT ) + { + if( isOpaque()) + return; + } + bool was_blend = glIsEnabled( GL_BLEND ); + if( !isOpaque()) + { + glEnable( GL_BLEND ); + glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); + } if( toplevel->opacity() != 1.0 ) { if( toplevel->hasAlpha()) { - glEnable( GL_BLEND ); glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); glColor4f( toplevel->opacity(), toplevel->opacity(), toplevel->opacity(), toplevel->opacity()); @@ -632,8 +659,9 @@ void SceneOpenGL::Window::paint( QRegion region ) { glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE ); glColor4f( 0, 0, 0, 0 ); - glDisable( GL_BLEND ); } + if( !was_blend ) + glDisable( GL_BLEND ); glDisable( GL_TEXTURE_RECTANGLE_ARB ); glBindTexture( GL_TEXTURE_RECTANGLE_ARB, 0 ); } diff --git a/scene_opengl.h b/scene_opengl.h index 6cf9697dba..8abde12b9d 100644 --- a/scene_opengl.h +++ b/scene_opengl.h @@ -38,11 +38,16 @@ class SceneOpenGL void paintSimpleScreen( QRegion damage, ToplevelList windows ); void paintBackground( QRegion damage ); static QRegion infiniteRegion(); + enum + { + PAINT_OPAQUE = 1 << 0, + PAINT_TRANSLUCENT = 1 << 1 + }; typedef GLuint Texture; GC gcroot; Drawable buffer; GLXFBConfig fbcroot; - bool root_db; + static bool root_db; static GLXFBConfig fbcdrawable; static GLXDrawable glxroot; static GLXContext context; @@ -67,7 +72,7 @@ class SceneOpenGL::Window int y() const; int width() const; int height() const; - void paint( QRegion region ); + void paint( QRegion region, int mask ); bool isVisible() const; bool isOpaque() const; void bindTexture();