Merge branch 'KDE/4.10'

Conflicts:
	kwin/lanczosfilter.cpp

effects/blur/blur.cpp

@@ -57,10 +57,15 @@ BlurEffect::BlurEffect()
     } else {
         net_wm_blur_region = 0;
     }
+
     connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
     connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
     connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long)));
     connect(effects, SIGNAL(screenGeometryChanged(QSize)), this, SLOT(slotScreenGeometryChanged()));
+
+    // Fetch the blur regions for all windows
+    foreach (EffectWindow *window, effects->stackingOrder())
+        updateBlurRegion(window);
 }
 
 BlurEffect::~BlurEffect()

effects/cube/cubeslide.cpp

@@ -99,12 +99,12 @@ void CubeSlideEffect::paintScreen(int mask, QRegion region, ScreenPaintData& dat
         if (dontSlidePanels) {
             foreach (EffectWindow * w, panels) {
                 WindowPaintData wData(w);
-                effects->paintWindow(w, 0, QRegion(w->x(), w->y(), w->width(), w->height()), wData);
+                effects->paintWindow(w, 0, infiniteRegion(), wData);
             }
         }
         foreach (EffectWindow * w, stickyWindows) {
             WindowPaintData wData(w);
-            effects->paintWindow(w, 0, QRegion(w->x(), w->y(), w->width(), w->height()), wData);
+            effects->paintWindow(w, 0, infiniteRegion(), wData);
         }
     } else
         effects->paintScreen(mask, region, data);

lanczosfilter.cpp

@@ -216,8 +216,9 @@ void LanczosFilter::performPaint(EffectWindowImpl* w, int mask, QRegion region,
                     if (hardwareClipping) {
                         glEnable(GL_SCISSOR_TEST);
                     }
+
                     glEnable(GL_BLEND);
-                    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
                     const qreal rgb = data.brightness() * data.opacity();
                     const qreal a = data.opacity();
@@ -346,8 +347,9 @@ void LanczosFilter::performPaint(EffectWindowImpl* w, int mask, QRegion region,
             if (hardwareClipping) {
                 glEnable(GL_SCISSOR_TEST);
             }
+
             glEnable(GL_BLEND);
-            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+            glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
             const qreal rgb = data.brightness() * data.opacity();
             const qreal a = data.opacity();
@@ -361,6 +363,7 @@ void LanczosFilter::performPaint(EffectWindowImpl* w, int mask, QRegion region,
             cache->render(region, textureRect, hardwareClipping);
 
             glDisable(GL_BLEND);
+
             if (hardwareClipping) {
                 glDisable(GL_SCISSOR_TEST);
             }