Merge lp:~mc-return/compiz/compiz.merge-fix1068503-scaleaddon-solid-window-highlight into lp:compiz/0.9.9

[MC Return]

Re-added GL_BLEND code to the non-GLES codepath to fix the regression caused by r3320.
Fixes scaleaddon window highlight being rendered solid.

(LP #1068503)

[Sam Spilsbury (smspillaz)]

Looks fine to me, though I'm not a fan of ifdefs. Can we reduce them by moving the declaration of wasBlend to its definition?, eg

GLboolean wasBlend = glIsEnabled (GL_BLEND);

That way we can keep it within the same ifdef.

[MC Return (mc-return)]

> Looks fine to me, though I'm not a fan of ifdefs. Can we reduce them by moving
> the declaration of wasBlend to its definition?, eg
>
> GLboolean wasBlend = glIsEnabled (GL_BLEND);
>
> That way we can keep it within the same ifdef.

Sure :)

Done.

review: Needs Resubmitting

[Daniel van Vugt (vanvugt)]

Works for me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/47/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/47/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

Re-ack for fixed testcases in ~compiz-team/compiz/ubuntu

review: Approve

=== modified file 'plugins/scaleaddon/src/scaleaddon.cpp'
--- plugins/scaleaddon/src/scaleaddon.cpp	2012-09-05 16:05:31 +0000
+++ plugins/scaleaddon/src/scaleaddon.cpp	2012-10-26 09:17:18 +0000
@@ -142,8 +142,13 @@
     glGetIntegerv (GL_BLEND_SRC_ALPHA, &oldBlendSrcAlpha);
     glGetIntegerv (GL_BLEND_DST_ALPHA, &oldBlendDstAlpha);
 #else
+    GLboolean wasBlend = glIsEnabled (GL_BLEND);
     glGetIntegerv (GL_BLEND_SRC, &oldBlendSrc);
     glGetIntegerv (GL_BLEND_DST, &oldBlendDst);
+
+    if (!wasBlend)
+	glEnable (GL_BLEND);
+
 #endif
 
     glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -179,6 +184,8 @@
     glBlendFuncSeparate (oldBlendSrc, oldBlendDst,
                          oldBlendSrcAlpha, oldBlendDstAlpha);
 #else
+    if (!wasBlend)
+	glDisable (GL_BLEND);
     glBlendFunc (oldBlendSrc, oldBlendDst);
 #endif
 }