From 2b6c4730b5730c06ef24aeee3798313d10604b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 9 Oct 2012 19:46:17 +0200 Subject: [PATCH] Re-enable Blur/Lanczos for Catalyst on OpenGL 2 Given that the Catalyst driver is now supporting direct rendering and by that can use the OpenGL 2 code path we do no longer need to force disable the Blur effect and Lanczos filters which used to crash in the ARB shader path. The ARB shader path - which can only be used in OpenGL 1 - is kept disabled for Catalyst. CCBUG: 270818 CCBUG: 286795 REVIEW: 106798 --- effects/blur/blur.cpp | 2 +- lanczosfilter.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/effects/blur/blur.cpp b/effects/blur/blur.cpp index 9e46818c5a..c32b4bc07e 100644 --- a/effects/blur/blur.cpp +++ b/effects/blur/blur.cpp @@ -154,7 +154,7 @@ bool BlurEffect::enabledByDefault() if (gl->isIntel() && gl->chipClass() < SandyBridge) return false; - if (gl->driver() == Driver_Catalyst) { + if (gl->driver() == Driver_Catalyst && effects->compositingType() == OpenGL1Compositing) { // fglrx supports only ARB shaders and those tend to crash KWin (see Bug #270818 and #286795) return false; } diff --git a/lanczosfilter.cpp b/lanczosfilter.cpp index 2d976a58f9..4f2bedfb4d 100644 --- a/lanczosfilter.cpp +++ b/lanczosfilter.cpp @@ -67,8 +67,8 @@ void LanczosFilter::init() GLPlatform *gl = GLPlatform::instance(); if (!force && gl->driver() == Driver_Intel && gl->mesaVersion() >= kVersionNumber(7, 10) && gl->chipClass() < SandyBridge) return; - // With fglrx the ARB Shader crashes KWin (see Bug #270818 and #286795) and GLSL Shaders are not functional - if (!force && gl->driver() == Driver_Catalyst) { + // With fglrx the ARB Shader crashes KWin (see Bug #270818 and #286795) + if (!force && gl->driver() == Driver_Catalyst && effects->compositingType() == OpenGL1Compositing) { return; }