From 844691250290ae870e593b277134f6ab38491035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= Date: Mon, 11 Mar 2013 16:07:04 +0100 Subject: [PATCH] kwin: Remove some left over support for GLX < 1.3 We require GLX_EXT_texture_from_pixmap which in turn requires GLX 1.3. --- glxbackend.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/glxbackend.cpp b/glxbackend.cpp index c94a4946fb..94b6033dae 100644 --- a/glxbackend.cpp +++ b/glxbackend.cpp @@ -61,7 +61,7 @@ GlxBackend::~GlxBackend() if (ctx) glXDestroyContext(display(), ctx); if (overlayWindow()->window()) { - if (hasGLXVersion(1, 3) && glxDrawable) + if (glxDrawable) glXDestroyWindow(display(), glxDrawable); if (drawable) XDestroyWindow(display(), drawable); @@ -181,10 +181,7 @@ bool GlxBackend::initBuffer() attrs.colormap = XCreateColormap(display(), rootWindow(), visual->visual, AllocNone); drawable = XCreateWindow(display(), overlayWindow()->window(), 0, 0, displayWidth(), displayHeight(), 0, visual->depth, InputOutput, visual->visual, CWColormap, &attrs); - if (hasGLXVersion(1, 3)) - glxDrawable = glXCreateWindow(display(), fbconfig, drawable, NULL); - else - glxDrawable = drawable; + glxDrawable = glXCreateWindow(display(), fbconfig, drawable, NULL); overlayWindow()->setup(drawable); setDoubleBuffer(true); XFree(visual);