Merge lp:~sil2100/compiz-core/cherry_3258 into lp:compiz-core

[Łukasz Zemczak]

Cherry-picked from compiz trunk (rev 3258):

Check if the window would actually paint before painting the shadow, since it is possible that another plugin could be inhibiting paint of the dock window. (LP: #1012956)

Just checking if it's possible for this to be included in an SRU as well.

Cherry-picked from compiz trunk (rev 3258):

Check if the window would actually paint before painting the shadow, since it is possible that another plugin could be inhibiting paint of the dock window. (LP: #1012956)

[Daniel van Vugt (vanvugt)]

Yep, looks like the fix from upstream.

review: Approve

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-06-15 16:41:34 +0000
+++ plugins/decor/src/decor.cpp	2012-07-16 13:52:52 +0000
@@ -195,11 +195,32 @@
 	{
 	    foreach (CompWindow *w, dScreen->cScreen->getWindowPaintList ())
 	    {
-		if ((w->type () & CompWindowTypeDockMask) &&
-		    !(w->destroyed () || w->invisible ()))
+		bool isDock = w->type () & CompWindowTypeDockMask;
+		bool drawShadow = !(w->invisible () || w->destroyed ());
+
+		if (isDock && drawShadow)
 		{
 		    DecorWindow *d = DecorWindow::get (w);
-		    d->glDecorate (transform, attrib, region, mask);
+
+		    /* If the last mask was an occlusion pass, glPaint
+		     * return value will mean something different, so
+		     * remove it */
+		    unsigned int pmask = d->gWindow->lastMask () &
+				~(PAINT_WINDOW_OCCLUSION_DETECTION_MASK);
+
+		    /* Check if the window would draw by seeing if glPaint
+		     * returns true when using PAINT_NO_CORE_INSTANCE_MASK
+		     */
+		    pmask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
+
+		    if (d->gWindow->glPaint (d->gWindow->paintAttrib (),
+					     transform,
+					     region,
+					     pmask))
+		    {
+			GLFragment::Attrib fa (d->gWindow->paintAttrib ());
+			d->glDecorate (transform, fa, region, mask);
+		    }
 		}
 	    }
 	}