Support GLX 1.2 (no glXCreateWindow() functionality).

svn path=/branches/work/kwin_composite/; revision=604877
icc-effect-5.14.5
Luboš Luňák 2006-11-14 13:18:53 +00:00
parent 1be2c4ed32
commit 0bd186ec72
1 changed files with 6 additions and 2 deletions

View File

@ -208,7 +208,8 @@ SceneOpenGL::~SceneOpenGL()
// do cleanup after initBuffer() // do cleanup after initBuffer()
if( wspace->overlayWindow()) if( wspace->overlayWindow())
{ {
glXDestroyWindow( display(), glxbuffer ); if( hasGLXVersion( 1, 3 ))
glXDestroyWindow( display(), glxbuffer );
XDestroyWindow( display(), buffer ); XDestroyWindow( display(), buffer );
wspace->destroyOverlay(); wspace->destroyOverlay();
} }
@ -234,7 +235,10 @@ void SceneOpenGL::initBuffer()
attrs.colormap = XCreateColormap( display(), rootWindow(), visual->visual, AllocNone ); attrs.colormap = XCreateColormap( display(), rootWindow(), visual->visual, AllocNone );
buffer = XCreateWindow( display(), wspace->overlayWindow(), 0, 0, displayWidth(), displayHeight(), buffer = XCreateWindow( display(), wspace->overlayWindow(), 0, 0, displayWidth(), displayHeight(),
0, QX11Info::appDepth(), InputOutput, visual->visual, CWColormap, &attrs ); 0, QX11Info::appDepth(), InputOutput, visual->visual, CWColormap, &attrs );
glxbuffer = glXCreateWindow( display(), fbcbuffer, buffer, NULL ); if( hasGLXVersion( 1, 3 ))
glxbuffer = glXCreateWindow( display(), fbcbuffer, buffer, NULL );
else
glxbuffer = buffer;
wspace->setupOverlay( buffer ); wspace->setupOverlay( buffer );
db = true; db = true;
XFree( visual ); XFree( visual );