Merge lp:~timo-jyrinki/compiz/disable_unredirection_mesa90x_again into lp:~ubuntu-desktop/compiz/precise

[Timo Jyrinki]

* debian/patches/blacklist_precise_mesa80_intel_nouveau.patch:
    - Revert to blacklisting also 9.0.x (LP: #1216781)

  * debian/patches/blacklist_precise_mesa80_intel_nouveau.patch:
    - Revert to blacklisting also 9.0.x (LP: #1216781)

[Bin Li (binli)]

Timo,

 Thanks for your quick work, and it looks good, and I've tested in several laptop and works fine.

[lp:~timo-jyrinki/compiz/disable_unredirection_mesa90x_again]

811. By Timo Jyrinki on 2013-09-02

Revert also the test regex, even though it does not functionally matter.

[Daniel van Vugt (vanvugt)]

If your intention is to disable unredirection (and therefore disable decent gaming performance) for both precise and quantal, then this looks correct. But I think we're failing to address the root cause of the bug. This is only a workaround.

review: Approve

[Sam Spilsbury (smspillaz)]

Seems to me like the bug only happens with the gnome-screensaver window, which is a fullscreen window. Wouldn't it just be better to disable unredirection for that window only? (Though I gather its less time consuming to just disable it wholesale)

[Stephen M. Webb (bregma)]

OK to merge because we just don't have the resources to track down the root cause.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-12 14:07:09 +0000
+++ debian/changelog	2013-09-02 11:26:48 +0000
@@ -1,3 +1,10 @@
+compiz (1:0.9.7.12-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/patches/blacklist_precise_mesa80_intel_nouveau.patch:
+    - Revert to blacklisting also 9.0.x (LP: #1216781)
+
+ -- Timo Jyrinki <[e-mail]>  Tue, 27 Aug 2013 13:50:36 +0300
+
 compiz (1:0.9.7.12-0ubuntu2) precise; urgency=low
 
   * debian/patches/fix_1095001.patch

=== modified file 'debian/patches/blacklist_precise_mesa80_intel_nouveau.patch'
--- debian/patches/blacklist_precise_mesa80_intel_nouveau.patch	2013-04-11 09:06:20 +0000
+++ debian/patches/blacklist_precise_mesa80_intel_nouveau.patch	2013-09-02 11:26:48 +0000
@@ -14,6 +14,10 @@
  9.0 (sharp) is still blacklisted, but 9.0.x (now in 12.04.2 LTS stack) 
  is not anymore. This takes care of the remaining PPA users while allowing 
  proper new stack users to have full gaming speed on Intel and Nouveau.
+ .
+ In 08/2013, a problem was identified still with the 9.0.x stack, leading 
+ for 9.0.x intel/nouveau redirection to be re-disabled by default again.
+ (LP: #1216781)
 Author: Timo Jyrinki <[e-mail]>
 Author: Michael Terry <[e-mail]>
 === modified file 'plugins/opengl/opengl.xml.in'
@@ -24,7 +28,7 @@
  		<_short>Unredirect Driver Blacklist</_short>
  		<_long>If non-empty, specifies a POSIX (extended) regular expression to match against the OpenGL driver strings (newline separated): "GL_VENDOR\nGL_RENDERER\nGL_VERSION". If the regular expression matches a substring of that concatenation then no windows will ever be unredirected while using that particular graphics driver.</_long>
 -		<default>(nouveau|Intel).*Mesa 8\\.0</default>
-+		<default>(nouveau|Intel).*Mesa (8.0|9.0$)</default>
++		<default>(nouveau|Intel).*Mesa (8.0|9.0)</default>
  	    </option>
  	</options>
      </plugin>
@@ -36,7 +40,7 @@
  using namespace compiz::opengl;
  
 -static const char *recommendedRegex = "(nouveau|Intel).*Mesa 8\\.0";
-+static const char *recommendedRegex = "(nouveau|Intel).*Mesa (8.0|9.0$)";
++static const char *recommendedRegex = "(nouveau|Intel).*Mesa (8.0|9.0)";
  
  TEST(DriverBlacklist, QuantalIntelIsGood)
  {