Merge lp:~compiz-team/compiz/compiz.fix_1056645 into lp:compiz/0.9.8

[Sam Spilsbury]

Fix build error: "'swapInterval' is not a member of 'GL'" on USE_GLES
(LP: #1056645)

Fix FTBFS

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3395
http://jenkins.qa.ubuntu.com/job/compiz-ci/128/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/128/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

/home/dan/bzr/compiz/tmp.645/plugins/opengl/src/screen.cpp: In function ‘void GL::waitForVideoSync()’:
/home/dan/bzr/compiz/tmp.645/plugins/opengl/src/screen.cpp:1722:21: error: too few arguments to function ‘void GL::fastSwapInterval(Display*, int)’
/home/dan/bzr/compiz/tmp.645/plugins/opengl/src/screen.cpp:1694:1: note: declared here

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Also, please give a commit comment with some details from the bug title.

[lp:~compiz-team/compiz/compiz.fix_1056645]

3396. By Sam Spilsbury on 2012-09-26

Missing in one other place

[Sam Spilsbury (smspillaz)]

fixed.

[Daniel van Vugt (vanvugt)]

Alright, looks good now.

review: Approve

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3396
http://jenkins.qa.ubuntu.com/job/compiz-ci/130/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/130/console

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2012-09-26 04:29:52 +0000
+++ plugins/opengl/src/screen.cpp	2012-09-26 08:00:29 +0000
@@ -1691,12 +1691,22 @@
 {
 
 void
-fastSwapInterval (int interval)
+fastSwapInterval (Display *dpy, int interval)
 {
     static int prev = -1;
-    if (GL::swapInterval && interval != prev)
+#ifndef USE_GLES
+    bool       hasSwapInterval = GL::swapInterval ? true : false;
+#else
+    bool       hasSwapInterval = true;
+#endif
+
+    if (hasSwapInterval && interval != prev)
     {
+#ifndef USE_GLES
 	(*GL::swapInterval) (interval);
+#else
+	eglSwapInterval (eglGetDisplay (dpy), interval);
+#endif
 	prev = interval;
     }
 }
@@ -1709,7 +1719,7 @@
     if (GL::waitVideoSync)
     {
 	// Don't wait twice. Just in case.
-	fastSwapInterval (0);
+	fastSwapInterval (screen->dpy (), 0);
 
 	/*
 	 * While glXSwapBuffers/glXCopySubBufferMESA are meant to do a
@@ -1738,13 +1748,13 @@
     // Docs: http://www.opengl.org/registry/specs/SGI/swap_control.txt
     if (GL::swapInterval)
     {
-	fastSwapInterval (sync ? 1 : 0);
+	fastSwapInterval (screen->dpy (), sync ? 1 : 0);
 	GL::unthrottledFrames++;
     }
     else if (sync)
 	waitForVideoSync ();
 #else
-    eglSwapInterval (eglGetDisplay (screen->dpy ()), sync ? 1 : 0);
+    fastSwapInterval (screen->dpy (), sync ? 1 : 0);
     GL::unthrottledFrames++;
 #endif
 }