Merge lp:~mc-return/compiz/compiz.merge-fix1047788-screenshot-selection-rectangle-opaque into lp:compiz/0.9.9

[MC Return]

Screenshot Plugin: Re-added GL_BLEND enabling and disabling calls to fix the selection rectangle not being transparent anymore.
Make sure to use GL_BLEND for the non-GLES codepath only.
Those calls got lost in r3320 (GLES merge).

(LP: #1047788)

Note 1: I had to make minor adjustments to when those functions get called to make them work perfectly.

Note 2: Good news ! The screenshot plug-in now works perfectly. Also long-time bug 771875 (Compiz Screenshot renders blue overlay on screenshots) is not reproducible anymore.

You can find a video showing the fix in action here: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/771875/+attachment/3406112/+files/ScreenshotPluginAfterFixes.webm

[lp:~mc-return/compiz/compiz.merge-fix1047788-screenshot-selection-rectangle-opaque]

3439. By MC Return on 2012-10-19

Cleaner .diff

3440. By MC Return on 2012-10-20

Rebased on latest lp:compiz

3441. By MC Return on 2012-10-20

Make sure to use GL_BLEND for the non-GLES codepath only

[Timo Jyrinki (timo-jyrinki)]

Looks fine!

review: Approve

=== modified file 'plugins/screenshot/src/screenshot.cpp'
--- plugins/screenshot/src/screenshot.cpp	2012-07-30 07:10:52 +0000
+++ plugins/screenshot/src/screenshot.cpp	2012-10-20 10:05:24 +0000
@@ -295,6 +295,9 @@
 	    		  -output->region ()->extents.y2,
 	    		  0.0f);
 
+#ifndef USE_GLES
+	    glEnable (GL_BLEND);
+#endif
 	    streamingBuffer->begin (GL_TRIANGLE_STRIP);
 
 	    streamingBuffer->addColors (1, colorData);
@@ -315,6 +318,9 @@
 	    streamingBuffer->addVertices (4, vertexData);
 
 	    streamingBuffer->end ();
+#ifndef USE_GLES
+	    glDisable (GL_BLEND);
+#endif
 	    streamingBuffer->render (transform);
 	}
     }