From 0bd186ec72033d1ceb9873749fed15b2a3484e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 14 Nov 2006 13:18:53 +0000 Subject: [PATCH] Support GLX 1.2 (no glXCreateWindow() functionality). svn path=/branches/work/kwin_composite/; revision=604877 --- scene_opengl.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scene_opengl.cpp b/scene_opengl.cpp index 2033e244f1..ee5d482dc2 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -208,7 +208,8 @@ SceneOpenGL::~SceneOpenGL() // do cleanup after initBuffer() if( wspace->overlayWindow()) { - glXDestroyWindow( display(), glxbuffer ); + if( hasGLXVersion( 1, 3 )) + glXDestroyWindow( display(), glxbuffer ); XDestroyWindow( display(), buffer ); wspace->destroyOverlay(); } @@ -234,7 +235,10 @@ void SceneOpenGL::initBuffer() attrs.colormap = XCreateColormap( display(), rootWindow(), visual->visual, AllocNone ); buffer = XCreateWindow( display(), wspace->overlayWindow(), 0, 0, displayWidth(), displayHeight(), 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 ); db = true; XFree( visual );