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

[Łukasz Zemczak]

Cherry-picked from compiz trunk (rev 3275):

Wait for the server to finish processing requests before doing a bind (LP: #1016367).

Checking if this commit can be used for an SRU as well.

Cherry-picked from compiz trunk (rev 3275):

Wait for the server to finish processing requests before doing a bind (LP: #1016367).

[Daniel van Vugt (vanvugt)]

I have suspected this fix of causing other regressions. So best to not backport it yet till I'm sure.

review: Disapprove

Unmerged revisions

3114. By Łukasz Zemczak on 2012-07-16

Cherry-picked from compiz trunk (rev 3275):

Wait for the server to finish processing requests before doing a bind (LP: #1016367).

=== modified file 'plugins/opengl/src/privatetexture.h'
--- plugins/opengl/src/privatetexture.h	2012-01-18 16:26:45 +0000
+++ plugins/opengl/src/privatetexture.h	2012-07-16 13:54:31 +0000
@@ -68,6 +68,8 @@
 	~TfpTexture ();
 
 	void enable (Filter filter);
+	bool bindTexImage (const GLXPixmap &);
+	void releaseTexImage ();
 
 	static List bindPixmapToTexture (Pixmap pixmap,
 					 int width,

=== modified file 'plugins/opengl/src/texture.cpp'
--- plugins/opengl/src/texture.cpp	2012-01-19 18:12:31 +0000
+++ plugins/opengl/src/texture.cpp	2012-07-16 13:54:31 +0000
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <core/servergrab.h>
 #include <opengl/texture.h>
 #include <privatetexture.h>
 #include "privates.h"
@@ -429,7 +430,7 @@
 
 	glBindTexture (target (), name ());
 
-	(*GL::releaseTexImage) (screen->dpy (), pixmap, GLX_FRONT_LEFT_EXT);
+	releaseTexImage ();
 
 	glBindTexture (target (), 0);
 	glDisable (target ());
@@ -441,6 +442,21 @@
     }
 }
 
+bool
+TfpTexture::bindTexImage (const GLXPixmap &glxPixmap)
+{
+    ServerLock sg (screen->serverGrabInterface ());
+    glXWaitX ();
+    (*GL::bindTexImage) (screen->dpy (), glxPixmap, GLX_FRONT_LEFT_EXT, NULL);
+    return true;
+}
+
+void
+TfpTexture::releaseTexImage ()
+{
+    (*GL::releaseTexImage) (screen->dpy (), pixmap, GLX_FRONT_LEFT_EXT);
+}
+
 GLTexture::List
 TfpTexture::bindPixmapToTexture (Pixmap pixmap,
 				 int    width,
@@ -572,9 +588,7 @@
 
     glBindTexture (texTarget, tex->name ());
 
-
-    (*GL::bindTexImage) (screen->dpy (), glxPixmap, GLX_FRONT_LEFT_EXT, NULL);
-
+    tex->bindTexImage (glxPixmap);
     tex->setFilter (GL_NEAREST);
     tex->setWrap (GL_CLAMP_TO_EDGE);
 
@@ -595,8 +609,8 @@
 
     if (damaged && pixmap)
     {
-	(*GL::releaseTexImage) (screen->dpy (), pixmap, GLX_FRONT_LEFT_EXT);
-	(*GL::bindTexImage) (screen->dpy (), pixmap, GLX_FRONT_LEFT_EXT, NULL);
+	releaseTexImage ();
+	bindTexImage (pixmap);
     }
 
     GLTexture::enable (filter);