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

Some opengl error checking.

Browse source 
svn path=/branches/work/kwin_composite/; revision=590566
This commit is contained in:
Luboš Luňák 2006-09-30 13:37:28 +00:00
parent 1c7e7bb2b7
commit f3119d2550
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scene_opengl.cpp
View file

@ -52,6 +52,13 @@ const int drawable_attrs[] =
None None
}; };
static void checkGLError( const char* txt )
{
GLenum err = glGetError();
if( err != GL_NO_ERROR )
kWarning() << "GL error (" << txt << "): 0x" << QString::number( err, 16 ) << endl;
}
SceneOpenGL::SceneOpenGL( Workspace* ws ) SceneOpenGL::SceneOpenGL( Workspace* ws )
: Scene( ws ) : Scene( ws )
{ {
@ -79,6 +86,7 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
glLoadIdentity(); glLoadIdentity();
glOrtho( 0, displayWidth(), 0, displayHeight(), 0, 65535 ); glOrtho( 0, displayWidth(), 0, displayHeight(), 0, 65535 );
// TODO glEnable( GL_DEPTH_TEST ); // TODO glEnable( GL_DEPTH_TEST );
checkGLError( "Init" );
} }
SceneOpenGL::~SceneOpenGL() SceneOpenGL::~SceneOpenGL()
@ -91,6 +99,7 @@ SceneOpenGL::~SceneOpenGL()
XFreeGC( display(), gcroot ); XFreeGC( display(), gcroot );
XFreePixmap( display(), buffer ); XFreePixmap( display(), buffer );
glXDestroyContext( display(), context ); glXDestroyContext( display(), context );
checkGLError( "Cleanup" );
} }
static void quadDraw( int x, int y, int w, int h ) static void quadDraw( int x, int y, int w, int h )
@ -128,8 +137,8 @@ void SceneOpenGL::paint( XserverRegion, ToplevelList windows )
glBindTexture( GL_TEXTURE_RECTANGLE_ARB, texture ); glBindTexture( GL_TEXTURE_RECTANGLE_ARB, texture );
glCopyTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, glCopyTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA,
0, 0, (*it)->width(), (*it)->height(), 0 ); 0, 0, (*it)->width(), (*it)->height(), 0 );
// TODO for double-buffered root glDrawBuffer( GL_BACK );
glXMakeContextCurrent( display(), glxroot, glxroot, context ); glXMakeContextCurrent( display(), glxroot, glxroot, context );
glDrawBuffer( GL_BACK );
glPushMatrix(); glPushMatrix();
// TODO Y axis in opengl grows up apparently // TODO Y axis in opengl grows up apparently
glTranslatef( (*it)->x(), displayHeight() - (*it)->height() - (*it)->y(), 0 ); glTranslatef( (*it)->x(), displayHeight() - (*it)->height() - (*it)->y(), 0 );
@ -140,13 +149,14 @@ void SceneOpenGL::paint( XserverRegion, ToplevelList windows )
glPopMatrix(); glPopMatrix();
glDisable( GL_TEXTURE_RECTANGLE_ARB ); glDisable( GL_TEXTURE_RECTANGLE_ARB );
glBindTexture( GL_TEXTURE_RECTANGLE_ARB, 0 ); glBindTexture( GL_TEXTURE_RECTANGLE_ARB, 0 );
glXWaitGL();
} }
} }
glFlush(); glFlush();
glXWaitGL();
XCopyArea( display(), buffer, rootWindow(), gcroot, 0, 0, displayWidth(), displayHeight(), 0, 0 ); XCopyArea( display(), buffer, rootWindow(), gcroot, 0, 0, displayWidth(), displayHeight(), 0, 0 );
ungrabXServer(); ungrabXServer();
XFlush( display()); XFlush( display());
checkGLError( "PostPaint" );
} }
void SceneOpenGL::windowAdded( Toplevel* c ) void SceneOpenGL::windowAdded( Toplevel* c )