From 26a9a35b2f6f1d2e54b034a10d79077510b5f81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 10 Oct 2012 08:04:36 +0200 Subject: [PATCH] Increase runtime requirement to Mesa 8.0 Adjustment to reality. KWin has had a dependency on Mesa 8.0 for quite some time given that it is what basically all distributions ship. It is better to clearly state what is required. For KWin Mesa 8.0 is a more reliable dependency as all DRI drivers which do not support DRI2 have been removed. Packagers have been informed about this intended change some weeks ago. REVIEW: 106799 --- lanczosfilter.cpp | 4 ++-- libkwineffects/kwinglplatform.cpp | 4 ---- scene_opengl.cpp | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lanczosfilter.cpp b/lanczosfilter.cpp index 7091a029e6..f011c13e65 100644 --- a/lanczosfilter.cpp +++ b/lanczosfilter.cpp @@ -63,9 +63,9 @@ void LanczosFilter::init() if (!force && options->glSmoothScale() != 2) return; // disabled by config - // The lanczos filter is reported to be broken with the Intel driver and Mesa 7.10 + // The lanczos filter is reported to be broken with the Intel driver prior SandyBridge GLPlatform *gl = GLPlatform::instance(); - if (!force && gl->driver() == Driver_Intel && gl->mesaVersion() >= kVersionNumber(7, 10) && gl->chipClass() < SandyBridge) + if (!force && gl->driver() == Driver_Intel && gl->chipClass() < SandyBridge) return; // With fglrx the ARB Shader crashes KWin (see Bug #270818 and #286795) if (!force && gl->driver() == Driver_Catalyst && effects->compositingType() == OpenGL1Compositing) { diff --git a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp index 35d7ff53ee..59ce7b2d80 100644 --- a/libkwineffects/kwinglplatform.cpp +++ b/libkwineffects/kwinglplatform.cpp @@ -809,10 +809,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface) m_looseBinding = true; } - // Loose binding is broken with Gallium drivers in Mesa 7.10 - if (isGalliumDriver() && mesaVersion() == kVersionNumber(7, 10, 0)) - m_looseBinding = false; - if (isSoftwareEmulation()) { // we recommend XRender m_recommendedCompositor = XRenderCompositing; diff --git a/scene_opengl.cpp b/scene_opengl.cpp index f2cf03fe13..3f130b9bbc 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -158,8 +158,8 @@ SceneOpenGL::SceneOpenGL(Workspace* ws, OpenGLBackend *backend) return; // error } #endif - if (glPlatform->isMesaDriver() && glPlatform->mesaVersion() < kVersionNumber(7, 10)) { - kError(1212) << "KWin requires at least Mesa 7.10 for OpenGL compositing."; + if (glPlatform->isMesaDriver() && glPlatform->mesaVersion() < kVersionNumber(8, 0)) { + kError(1212) << "KWin requires at least Mesa 8.0 for OpenGL compositing."; return; } #ifndef KWIN_HAVE_OPENGLES