Merge lp:~bregma/compiz/lp-1424013-trusty into lp:compiz/0.9.11

[Stephen M. Webb]

Add a blacklist of Nvidia integrated GPU's affected by the Nvidia X11 Sync patch.

This is to make a blacklist of Nvidia integrated GPU's that are affected by the recent X11 Sync patch provided by Nvidia.

Cherry-picked from lp:compiz trunk.

[Christopher Townsend (townsend)]

Yep

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3873
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/95/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/79

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/95/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2015-01-08 16:00:35 +0000
+++ plugins/opengl/src/screen.cpp	2015-03-11 12:35:03 +0000
@@ -74,6 +74,15 @@
 static const size_t NUM_X11_SYNCS = 16;
 
 /**
+ * The GPUs to blacklist for X11 sync
+ */
+static const char* BLACKLIST_X11_SYNC_GPUS[] = { "GeForce 6150LE",
+						 "GeForce 6150SE",
+						 "GeForce 7025",
+						 "GeForce 7050 PV" };
+static const int BLACKLIST_SZ = sizeof(BLACKLIST_X11_SYNC_GPUS) / sizeof(BLACKLIST_X11_SYNC_GPUS[0]);
+
+/**
  * The maximum time to wait for a sync object, in nanoseconds.
  */
 static const GLuint64 MAX_SYNC_WAIT_TIME = 1000000000ull; // One second
@@ -564,6 +573,8 @@
     DetectionWorkaround workaround;
 #endif
 
+    int i;
+
     #ifdef USE_GLES
     Display             *xdpy;
     Window               overlay;
@@ -621,7 +632,7 @@
     visualid = XVisualIDFromVisual (attr.visual);
     config = configs[0];
 
-    for (int i = 0; i < count; ++i)
+    for (i = 0; i < count; ++i)
     {
 	eglGetConfigAttrib (dpy, configs[i], EGL_SAMPLE_BUFFERS, &val);
 	if (val > msaaBuffers)
@@ -1101,7 +1112,19 @@
 	GL::importSync = (GL::GLImportSyncProc)
 	    getProcAddress ("glImportSyncEXT");
 
-	if (GL::importSync)
+	bool blacklist = false;
+
+	for (i = 0; i < BLACKLIST_SZ; ++i)
+	{
+	    if (strstr (glVendor, "NVIDIA") &&
+		strstr (glRenderer, BLACKLIST_X11_SYNC_GPUS[i]))
+	    {
+		blacklist = true;
+		break;
+	    }
+	}
+
+	if (GL::importSync && !blacklist)
 	    GL::xToGLSync = true;
     }