Merge lp:~mc-return/compiz/compiz.merge-expo-gl-filter-improvements into lp:compiz/0.9.10

[MC Return]

Expo:
Simplified the GL filter handling.

As promised, improved the filter handling for Expo as well. :)

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3749
http://jenkins.qa.ubuntu.com/job/compiz-ci/223/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/264/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/223/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2013-06-16 12:21:33 +0000
+++ plugins/expo/src/expo.cpp	2013-06-28 15:25:29 +0000
@@ -856,17 +856,10 @@
 	    rotation = 10.0 * expoCam;
     }
 
-    bool   filterChanged = false;
-    GLenum oldFilter;
+    GLenum oldFilter = gScreen->textureFilter ();
 
     if (optionGetMipmaps ())
-    {
-	/* check the actual filtering */
-	oldFilter = gScreen->textureFilter ();
-
 	gScreen->setTextureFilter (GL_LINEAR_MIPMAP_LINEAR);
-	filterChanged = true;
-    }
 
     /* ALL TRANSFORMATION ARE EXECUTED FROM BOTTOM TO TOP */
 
@@ -1216,9 +1209,7 @@
 
     gScreen->glPaintTransformedOutputSetCurrentIndex (glPaintTransformedOutputIndex);
 
-    /* we just need to change the global filter state if we manipulated it before */
-    if (filterChanged)
-	gScreen->setTextureFilter (oldFilter);
+    gScreen->setTextureFilter (oldFilter);
 }
 
 bool