Merge lp:~sil2100/compiz-core/fglrx_final_fix into lp:compiz-core/0.9.8

[Łukasz Zemczak]

Reverting the introduction of bindTexture - we don't need it, since the fix is actually a ONE LINER! Thanks Sam!

Do I even have to say anything besides: THE fix for LP: #770283 ;) ?

[Sam Spilsbury (smspillaz)]

fyi that's the fix

87 }
88 }
89 - return;
90 }
91 }
92 }

One line wonders ftw.

review: Approve

[lp:~sil2100/compiz-core/fglrx_final_fix]

3111. By Łukasz Zemczak on 2012-04-20

Leftover from the revert!

[Łukasz Zemczak (sil2100)]

I forgot one leftover line from the old bindTexture code, I pushed the modification just now. Now it should be ready for the merge ;) I'm running it right now, and it 'just seems to work'!

[Alan Griffiths (alan-griffiths)]

Looking at code it isn't immediately obvious that the changes should be:

89 - return;

as opposed to:

89 - return;
xx + break;

Not sure how to test.

[Sam Spilsbury (smspillaz)]

yes break is probably better.

[lp:~sil2100/compiz-core/fglrx_final_fix]

3112. By Łukasz Zemczak on 2012-04-20

Probably break is better than nothing here - thanks for pointing this out Alan!

[Sam Spilsbury (smspillaz)]

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-04-19 07:28:34 +0000
+++ plugins/decor/src/decor.cpp	2012-04-20 10:43:19 +0000
@@ -320,66 +320,44 @@
     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 false;
+	return;
     }
 
-    // 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 false;
+	return;
     }
 
     if (!DecorScreen::get (screen)->optionGetMipmap ())
 	textures[0]->setMipmap (false);
 
-    return true;
+    damage = XDamageCreate (screen->dpy (), pixmap,
+			     XDamageReportRawRectangles);
+}
+
+/*
+ * DecorTexture::~DecorTexture
+ *
+ * Remove damage handle on texture
+ *
+ */
+
+DecorTexture::~DecorTexture ()
+{
+    if (damage)
+	XDamageDestroy (screen->dpy (), damage);
 }
 
 /*
@@ -2343,7 +2321,7 @@
 				    dw->cWindow->damageOutputExtents ();
 			    }
 			}
-			return;
+			break;
 		    }
 		}
 	    }

=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2012-04-18 12:48:53 +0000
+++ plugins/decor/src/decor.h	2012-04-20 10:43:19 +0000
@@ -79,8 +79,6 @@
 	DecorTexture (Pixmap pixmap);
 	~DecorTexture ();
 
-	bool bindTexture (Pixmap src);
-
     public:
 	bool            status;
 	int             refCount;