Merge lp:~sil2100/compiz-core/decor_bindtexture into lp:compiz-core

[Łukasz Zemczak]

Export the process of DecorTexture pixmap binding to a separate method.

This way we can call DecorTexture::bindTexture whenever we want to explicitly bind/rebind the texture (needed, for instance, for a possible fglrx texture bug workaround - LP: #770283).

Problem:

As described in LP: #770283, since long window decorations just don't update correctly for fglrx users. This is happening since oneiric or even earlier. The problem is quite severe, since it affects all users and really makes the Ubuntu experience troublesome.
The problem lies in fglrx (most probably) not being able to correctly pass changes made to a Pixmap to the underlying GLXPixmap created out of it. I already informed ATI about the problem and we're analyzing it in more detail.

The fix:

It's a hacky workaround, but all that is needed is forcing the decor plugin to just rebind the texture on damage events regarding decoration textures. This merge request only introduces the creation of the bindTexture () method, which allows explicit binding/rebinding of textures from a DecorTexture.

The actual usage of the bindTexture method which fixes the fglrx problem will be included as a distro-patch (as we decided with Sam and Didier).

Test coverage:

None.

[Sam Spilsbury (smspillaz)]

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

[Daniel van Vugt (vanvugt)]

Technically it's an ABI change. But it's a "compatible" ABI change to be adding a non-virtual function.

review: Approve

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-04-17 04:05:07 +0000
+++ plugins/decor/src/decor.cpp	2012-04-18 12:59:19 +0000
@@ -320,44 +320,66 @@
     pixmap (pixmap),
     damage (None)
 {
+    if (!bindTexture (pixmap))
+	return;
+
+    damage = XDamageCreate (screen->dpy (), pixmap,
+			     XDamageReportRawRectangles);
+}
+
+/*
+ * DecorTexture::~DecorTexture
+ *
+ * Remove damage handle on texture
+ *
+ */
+
+DecorTexture::~DecorTexture ()
+{
+    if (damage)
+	XDamageDestroy (screen->dpy (), damage);
+}
+
+/*
+ * DecorTexture::indTexture
+ *
+ * This function actually takes and binds/rebinds the given Pixmap
+ * to a texture (i.e. calls GLTexture::bindPixmapToTexture)
+ *
+ */
+
+bool
+DecorTexture::bindTexture (Pixmap src)
+{
     unsigned int width, height, depth, ui;
     Window	 root;
     int		 i;
 
+    pixmap = src;
+
     if (!XGetGeometry (screen->dpy (), pixmap, &root,
 		       &i, &i, &width, &height, &ui, &depth))
     {
-        status = false;
-	return;
+	status = false;
+	return false;
     }
 
+    // Explicitly clear the texture list before binding/rebinding
+    textures.clear ();
+
     bindFailed = false;
     textures = GLTexture::bindPixmapToTexture (pixmap, width, height, depth);
     if (textures.size () != 1)
     {
 	bindFailed = true;
-        status = false;
-	return;
+	status = false;
+	return false;
     }
 
     if (!DecorScreen::get (screen)->optionGetMipmap ())
 	textures[0]->setMipmap (false);
 
-    damage = XDamageCreate (screen->dpy (), pixmap,
-			     XDamageReportRawRectangles);
-}
-
-/*
- * DecorTexture::~DecorTexture
- *
- * Remove damage handle on texture
- *
- */
-
-DecorTexture::~DecorTexture ()
-{
-    if (damage)
-	XDamageDestroy (screen->dpy (), damage);
+    return true;
 }
 
 /*

=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2012-03-30 14:29:18 +0000
+++ plugins/decor/src/decor.h	2012-04-18 12:59:19 +0000
@@ -79,6 +79,8 @@
 	DecorTexture (Pixmap pixmap);
 	~DecorTexture ();
 
+	bool bindTexture (Pixmap src);
+
     public:
 	bool            status;
 	int             refCount;