From 6d398323ebcad7de53de41f25a94f4a4e3c3db24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= <fredrik@kde.org>
Date: Sat, 25 Sep 2010 00:11:06 +0000
Subject: [PATCH] - Check if the FBO size will exceed GL_MAX_TEXTURE_SIZE in  
 BlurEffect::supported(). - Don't announce support to clients if the shader
 failed to compile,   or the FBO is invalid.

svn path=/trunk/KDE/kdebase/workspace/; revision=1179268
---
 effects/blur/blur.cpp | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/effects/blur/blur.cpp b/effects/blur/blur.cpp
index 2e8b67fc6b..9800a11244 100644
--- a/effects/blur/blur.cpp
+++ b/effects/blur/blur.cpp
@@ -44,12 +44,16 @@ BlurEffect::BlurEffect()
     net_wm_blur_region = XInternAtom(display(), "_KDE_NET_WM_BLUR_BEHIND_REGION", False);
     effects->registerPropertyType(net_wm_blur_region, true);
 
+    reconfigure(ReconfigureAll);
+
     // ### Hackish way to announce support.
     //     Should be included in _NET_SUPPORTED instead.
-    XChangeProperty(display(), rootWindow(), net_wm_blur_region, net_wm_blur_region,
-                    32, PropModeReplace, 0, 0);
-
-    reconfigure(ReconfigureAll);
+    if (shader->isValid() && target->valid()) {
+        XChangeProperty(display(), rootWindow(), net_wm_blur_region, net_wm_blur_region,
+                        32, PropModeReplace, 0, 0);
+    } else {
+        XDeleteProperty(display(), rootWindow(), net_wm_blur_region);
+    }
 }
 
 BlurEffect::~BlurEffect()
@@ -69,6 +73,9 @@ void BlurEffect::reconfigure(ReconfigureFlags flags)
     KConfigGroup cg = EffectsHandler::effectConfig("Blur");
     int radius = qBound(2, cg.readEntry("BlurRadius", 12), 14);
     shader->setRadius(radius);
+
+    if (!shader->isValid())
+        XDeleteProperty(display(), rootWindow(), net_wm_blur_region);
 }
 
 void BlurEffect::updateBlurRegion(EffectWindow *w) const
@@ -110,7 +117,16 @@ void BlurEffect::propertyNotify(EffectWindow *w, long atom)
 bool BlurEffect::supported()
 {
     bool supported = GLRenderTarget::supported() && GLTexture::NPOTTextureSupported() &&
-           (GLSLBlurShader::supported() || ARBBlurShader::supported());
+            (GLSLBlurShader::supported() || ARBBlurShader::supported());
+
+    if (supported) {
+        int maxTexSize;
+        glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTexSize);
+
+        if (displayWidth() > maxTexSize || displayHeight() > maxTexSize)
+            supported = false;
+    }
+
     if (supported) {
         // check the blacklist
         KSharedConfigPtr config = KSharedConfig::openConfig( "kwinrc" );