Merge lp:~compiz-team/compiz/quantal.fix_1127866 into lp:ubuntu/quantal/compiz

[Sam Spilsbury]

Workaround hangs in glXBindTexImageEXT - we need a server grab for the
external pixmap case, but we can just revert to using copytex if using
VirtualBox for now.

(LP: #1127866)

Workaround hangs in glXBindTexImageEXT - we need a server grab for the
external pixmap case, but we can just revert to using copytex if using
VirtualBox for now.

(LP: #1127866)

[Brian Murray (brian-murray)]

This fix looks good however the related bug report is missing information for the SRU process specific details regarding what is necessary can be found at http://wiki.ubuntu.com/StableReleaseUpdates. Thanks!

[Sam Spilsbury (smspillaz)]

Don't worry about this for now, we're just reverting the fix for the crash on llvmpipe until the virtualbox fix goes in upstream.

Unmerged revisions

3320. By Sam Spilsbury on 2013-02-17

Workaround hangs in glXBindTexImageEXT - we need a server grab for the
external pixmap case, but we can just revert to using copytex if using
VirtualBox for now.

(LP: #1127866)

3319. By Didier Roche-Tolomelli on 2012-10-17

releasing version 1:0.9.8.4+bzr3407-0ubuntu1

3318. By Timo Jyrinki on 2012-10-12

* New upstream snapshot.
  - Cherry-picked fixes in Ubuntu merged to development branch
  - Disable failing tests due to distro patch (LP: #1058577)
  - Fix leakage of destroyed_pixmaps_table, containing pointers to freed
    decor_t's which could result in a freed GHashTable being passed into
    g_hash_table_remove and causing a crash. (LP: #1060171)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-17 06:06:09 +0000
+++ debian/changelog	2013-02-17 07:32:22 +0000
@@ -1,3 +1,13 @@
+compiz (1:0.9.8.4+bzr3408-0ubuntu1) quantal-proposed; urgency=low
+
+  * debian/patches/100_workaround_virtualbox_hang.patch
+    - VirtualBox uses a shared-memory texture_from_pixmap_implementation
+    which is not compatible with our server grab usage, so force
+    a different bind method when running with virtualbox and binding
+    an externally managed texture
+
+ -- Sam Spilsbury <[e-mail]>  Sun, 17 Feb 2013 10:26:40 +0800
+
 compiz (1:0.9.8.4+bzr3407-0ubuntu1) quantal-proposed; urgency=low
 
   * New upstream snapshot.

=== modified file 'debian/compiz-plugins-default.install'
--- debian/compiz-plugins-default.install	2012-06-19 11:22:48 +0000
+++ debian/compiz-plugins-default.install	2013-02-17 07:32:22 +0000
@@ -1,6 +1,7 @@
 debian/tmp/usr/*/compiz/*animation.*
 debian/tmp/usr/*/compiz/*compiztoolbox.*
 debian/tmp/usr/*/compiz/*composite.*
+debian/tmp/usr/*/compiz/*copytex.*
 debian/tmp/usr/*/compiz/*decor.*
 debian/tmp/usr/*/compiz/*expo.*
 debian/tmp/usr/*/compiz/*ezoom.*

=== modified file 'debian/compiz-plugins.install'
--- debian/compiz-plugins.install	2012-08-24 13:41:00 +0000
+++ debian/compiz-plugins.install	2013-02-17 07:32:22 +0000
@@ -3,7 +3,6 @@
 debian/tmp/usr/*/compiz/*bench.*
 debian/tmp/usr/*/compiz/*clone.*
 debian/tmp/usr/*/compiz/*commands.*
-debian/tmp/usr/*/compiz/*copytex.*
 debian/tmp/usr/*/compiz/*crashhandler.*
 debian/tmp/usr/*/compiz/*cube.*
 debian/tmp/usr/*/compiz/*dbus.*

=== added file 'debian/patches/100_workaround_virtualbox_hang.patch'
--- debian/patches/100_workaround_virtualbox_hang.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/100_workaround_virtualbox_hang.patch	2013-02-17 07:32:22 +0000
@@ -0,0 +1,176 @@
+Index: quantal/plugins/opengl/include/opengl/opengl.h
+===================================================================
+--- quantal.orig/plugins/opengl/include/opengl/opengl.h	2013-02-17 10:37:32.625369000 +0800
++++ quantal/plugins/opengl/include/opengl/opengl.h	2013-02-17 15:09:51.129086082 +0800
+@@ -578,6 +578,17 @@
+ 
+ extern GLScreenPaintAttrib defaultScreenPaintAttrib;
+ 
++namespace compiz
++{
++namespace opengl
++{
++namespace internal
++{
++class DriverWorkaroundQuery;
++}
++}
++}
++
+ class GLScreen;
+ class GLFramebufferObject;
+ 
+@@ -767,6 +778,13 @@
+ 
+ 	bool glInitContext (XVisualInfo *);
+ 
++	/**
++	 * This is only meant to be used internally, here to avoid unnecessarily
++	 * breaking the API and ABI. Fetch any driver workarounds in place
++	 */
++	const compiz::opengl::internal::DriverWorkaroundQuery &
++	fetchDriverWorkarounds ();
++
+ 	WRAPABLE_HND (0, GLScreenInterface, bool, glPaintOutput,
+ 		      const GLScreenPaintAttrib &, const GLMatrix &,
+ 		      const CompRegion &, CompOutput *, unsigned int);
+Index: quantal/plugins/opengl/src/privates.h
+===================================================================
+--- quantal.orig/plugins/opengl/src/privates.h	2013-02-17 10:37:32.625369000 +0800
++++ quantal/plugins/opengl/src/privates.h	2013-02-17 15:10:47.237085872 +0800
+@@ -44,6 +44,24 @@
+ 
+ extern CompOutput *targetOutput;
+ 
++namespace compiz
++{
++namespace opengl
++{
++namespace internal
++{
++class DriverWorkaroundQuery
++{
++    public:
++
++	virtual ~DriverWorkaroundQuery () {};
++
++	virtual bool unsafeForExternalBinds () const = 0;
++};
++}
++}
++}
++
+ class GLDoubleBuffer :
+     public compiz::opengl::DoubleBuffer
+ {
+@@ -118,6 +136,7 @@
+ class PrivateGLScreen :
+     public ScreenInterface,
+     public compiz::composite::PaintHandler,
++    public compiz::opengl::internal::DriverWorkaroundQuery,
+     public OpenglOptions
+ {
+     public:
+@@ -200,6 +219,7 @@
+ 	std::vector<GLTexture::BindPixmapProc> bindPixmap;
+ 	bool hasCompositing;
+ 	bool commonFrontbuffer;
++	bool sharedMemoryTFP;
+ 	bool incorrectRefreshRate; // hack for NVIDIA specifying an incorrect
+ 				   // refresh rate, causing us to miss vblanks
+ 
+@@ -214,6 +234,10 @@
+ 
+ 	Pixmap rootPixmapCopy;
+ 	CompSize rootPixmapSize;
++
++    private:
++
++       bool unsafeForExternalBinds () const;
+ };
+ 
+ class PrivateGLWindow :
+Index: quantal/plugins/opengl/src/screen.cpp
+===================================================================
+--- quantal.orig/plugins/opengl/src/screen.cpp	2013-02-17 15:09:50.637086084 +0800
++++ quantal/plugins/opengl/src/screen.cpp	2013-02-17 15:09:51.141086082 +0800
+@@ -53,6 +53,7 @@
+ 
+ 
+ using namespace compiz::opengl;
++namespace cglint = compiz::opengl::internal;
+ 
+ namespace GL {
+     #ifdef USE_GLES
+@@ -287,6 +288,18 @@
+ };
+ 
+ bool
++PrivateGLScreen::unsafeForExternalBinds () const
++{
++    return sharedMemoryTFP;
++}
++
++const cglint::DriverWorkaroundQuery &
++GLScreen::fetchDriverWorkarounds ()
++{
++    return *priv;
++}
++
++bool
+ GLScreen::glInitContext (XVisualInfo *visinfo)
+ {
+     DetectionWorkaround workaround;
+@@ -582,6 +595,7 @@
+ 
+     priv->commonFrontbuffer = true;
+     priv->incorrectRefreshRate = false;
++    priv->sharedMemoryTFP = false;
+     if (glRenderer != NULL && strstr (glRenderer, "on llvmpipe"))
+     {
+ 	/*
+@@ -602,6 +616,18 @@
+ 	priv->incorrectRefreshRate = true;
+     }
+ 
++    if (glVendor != NULL && strstr (glVendor, "Humper"))
++    {
++	/*
++	 * VirtualBox uses XShm/XCopyArea in order to implement
++	 * texture_from_pixmap. Because of this, they require
++	 * a second X connection to track damage events and
++	 * changes to the pixmap, and this is incompatible with
++	 * taking a server grab on when querying and binding
++	 * externally managed pixmaps */
++	priv->sharedMemoryTFP = true;
++    }
++
+     if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two"))
+ 	GL::textureNonPowerOfTwo = true;
+     GL::textureNonPowerOfTwoMipmap = GL::textureNonPowerOfTwo;
+Index: quantal/plugins/opengl/src/texture.cpp
+===================================================================
+--- quantal.orig/plugins/opengl/src/texture.cpp	2013-02-17 10:37:32.625369000 +0800
++++ quantal/plugins/opengl/src/texture.cpp	2013-02-17 15:09:51.141086082 +0800
+@@ -41,6 +41,7 @@
+ #include "glx-tfp-bind.h"
+ 
+ namespace cgl = compiz::opengl;
++namespace cglint = compiz::opengl::internal;
+ 
+ #ifdef USE_GLES
+ std::map<Damage, EglTexture*> boundPixmapTex;
+@@ -648,6 +649,13 @@
+         !GL::textureFromPixmap)
+ 	return GLTexture::List ();
+ 
++    GLScreen *gs = GLScreen::get (screen);
++    const cglint::DriverWorkaroundQuery &query (gs->fetchDriverWorkarounds ());
++
++    if (query.unsafeForExternalBinds () &&
++	source == cgl::ExternallyManaged)
++	return GLTexture::List ();
++
+     GLTexture::List   rv (1);
+     TfpTexture        *tex = NULL;
+     unsigned int      target = 0;

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-09 11:02:28 +0000
+++ debian/patches/series	2013-02-17 07:32:22 +0000
@@ -8,3 +8,4 @@
 99_valid_ccsm_desktop_file.patch
 100_expo_layout.patch
 unity_support_test.patch
+100_workaround_virtualbox_hang.patch

=== added file 'debian/profile_upgrades/com.canonical.unity.unity.03.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity.03.upgrade	1970-01-01 00:00:00 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity.03.upgrade	2013-02-17 07:32:22 +0000
@@ -0,0 +1,2 @@
+[core]
++s0_active_plugins = copytex