Merge lp:~vanvugt/ubuntu/quantal/compiz/fix-1039155 into lp:ubuntu/quantal/compiz

[Daniel van Vugt]

Automatically fall back to LLVMpipe software rendering if the hardware
fails unity_support_test.
(LP: #1039155)

[Didier Roche-Tolomelli (didrocks)]

@Daniel: it's looking good to me, even if I don't have such hardware to test on. Can you please change the condition to do the test with:
XDG_CURRENT_DESKTOP=Unity
rather?

Otherwise, it looks good to me :)
Thanks a lot!

review: Needs Fixing

[Didier Roche-Tolomelli (didrocks)]

actually, I missed the second line. Mirv confirmed it works, and it looks excellent to me! Merging, let's try to get it on the CD :)

Thanks!

review: Approve

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-13 04:59:17 +0000
+++ debian/patches/series	2012-10-09 11:08:25 +0000
@@ -7,3 +7,4 @@
 ccsm_disable_unity_checkbox.patch
 99_valid_ccsm_desktop_file.patch
 100_expo_layout.patch
+unity_support_test.patch

=== added file 'debian/patches/unity_support_test.patch'
--- debian/patches/unity_support_test.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/unity_support_test.patch	2012-10-09 11:08:25 +0000
@@ -0,0 +1,83 @@
+=== modified file 'src/plugin.cpp'
+--- old/src/plugin.cpp	2012-07-30 10:15:41 +0000
++++ new/src/plugin.cpp	2012-10-09 10:52:12 +0000
+@@ -116,6 +116,60 @@
+ }
+ 
+ static bool
++setOpenGLPluginEnvironment ()
++{
++    /*
++     * Check if the hardware is adequate for Unity and if not, use LLVMpipe.
++     * Unfortunately the design of Mesa requires that this be done before
++     * libGL is loaded, which means before the opengl plugin is loaded.
++     */
++    bool toggledLLVM = false;
++
++    if (!getenv ("LIBGL_ALWAYS_SOFTWARE"))
++    {
++	const char *profile = getenv ("COMPIZ_CONFIG_PROFILE");
++	if (profile && !strcmp (profile, "ubuntu"))
++	{
++	    int result = system ("/usr/lib/nux/unity_support_test");
++	    int status = WEXITSTATUS (result);
++	    compLogMessage ("core", CompLogLevelInfo,
++		"Unity is %s",
++		status == 0 ?   "fully supported by your hardware." :
++		status == 127 ? "undetectable" :
++		                "not supported by your hardware. "
++		                "Enabling software rendering instead (slow).");
++	    if (status > 0 && status < 127)
++	    {
++		setenv ("LIBGL_ALWAYS_SOFTWARE", "1", 1);
++		toggledLLVM = true;
++	    }
++	}
++    }
++
++    return toggledLLVM;
++}
++
++static void
++unsetUnityshellPluginEnvironment ()
++{
++    unsetenv ("LIBGL_ALWAYS_SOFTWARE");
++}
++
++static void
++setPluginEnvironment (const char *name)
++{
++    if (!strcmp (name, "opengl"))
++	setOpenGLPluginEnvironment ();
++}
++
++static void
++unsetPluginEnvironment (const char *name)
++{
++    if (!strcmp (name, "unityshell"))
++	unsetUnityshellPluginEnvironment ();
++}
++
++static bool
+ dlloaderLoadPlugin (CompPlugin *p,
+ 		    const char *path,
+ 		    const char *name)
+@@ -127,6 +181,8 @@
+     if (cloaderLoadPlugin (p, path, name))
+ 	return true;
+ 
++    setPluginEnvironment (name);
++
+     if (path)
+     {
+ 	file  = path;
+@@ -197,6 +253,8 @@
+     if (!loaded && dlhand)
+ 	dlclose (dlhand);
+ 
++    unsetPluginEnvironment (name);
++
+     return loaded;
+ }
+ 
+