Merge lp:~hikiko/compiz/compiz.grid-blend-option into lp:compiz/0.9.13

[Eleni Maria Stea]

Added option to disable blend in grid plugin

Added option to disable blend in grid plugin

[lp:~hikiko/compiz/compiz.grid-blend-option]

4089. By Eleni Maria Stea on 2016-09-07

:s/blending/transparency

4090. By Eleni Maria Stea on 2016-09-08

updated unity-lowgfx profile

4091. By Eleni Maria Stea on 2016-09-08

fixed option

[Marco Trevisan (Treviño) (3v1n0)]

Ack!

review: Approve

=== modified file 'debian/unity-lowgfx.ini'
--- debian/unity-lowgfx.ini	2016-07-12 13:57:05 +0000
+++ debian/unity-lowgfx.ini	2016-09-08 09:37:34 +0000
@@ -13,6 +13,7 @@
 
 [grid]
 s0_animation_duration = 1
+s0_disable_blend = true
 
 [resize]
 s0_mode = 2

=== modified file 'plugins/grid/grid.xml.in'
--- plugins/grid/grid.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/grid/grid.xml.in	2016-09-08 09:37:34 +0000
@@ -589,6 +589,11 @@
 			    <alpha>0x4f4f</alpha>
 			</default>
 		</option>
+		<option name="disable_blend" type="bool">
+			<_short>Disable Transparency</_short>
+			<_long>Disable blending.</_long>
+			<default>false</default>
+		</option>
 	    </group>
 	</options>
     </plugin>

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2016-07-28 04:04:15 +0000
+++ plugins/grid/src/grid.cpp	2016-09-08 09:37:34 +0000
@@ -510,6 +510,7 @@
     GLushort        colorData[4];
     GLushort        *color;
     GLboolean       isBlendingEnabled;
+    bool            blend = !optionGetDisableBlend ();
 
     const float MaxUShortFloat = std::numeric_limits <unsigned short>::max ();
 
@@ -520,8 +521,11 @@
 
     sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
-    glGetBooleanv (GL_BLEND, &isBlendingEnabled);
-    glEnable (GL_BLEND);
+    if (blend)
+    {
+	glGetBooleanv (GL_BLEND, &isBlendingEnabled);
+	glEnable (GL_BLEND);
+    }
 
     for (iter = animations.begin (); iter != animations.end () && animating; ++iter)
     {
@@ -661,8 +665,11 @@
 	streamingBuffer->render (sTransform);
     }
 
-    if (!isBlendingEnabled)
-	glDisable (GL_BLEND);
+    if (blend)
+    {
+	if (!isBlendingEnabled)
+	    glDisable (GL_BLEND);
+    }
 }
 
 bool