Merge lp:~vanvugt/compiz-core/fix-763005-apisafe into lp:compiz-core/0.9.5

[Daniel van Vugt]

Updated fix for LP: #763005 (first committed to lp:compiz-core r2804).

This version implements the same fix, but removes the need for any header file changes upstream.

[Daniel van Vugt (vanvugt)]

As the previous version of this fix was reverted upstream in git.compiz.org, I suggest the easiest way to commit this new version would be just to copy the file: screen.cpp. Because that's all you should need now.

[Daniel van Vugt (vanvugt)]

The previous comment applies to committing to git.compiz.org AFTER this branch has been merged :)

[Sam Spilsbury (smspillaz)]

Looks great, thanks Daniel!

=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2011-09-09 15:20:10 +0000
+++ plugins/opengl/include/opengl/opengl.h	2011-09-15 05:45:39 +0000
@@ -98,13 +98,11 @@
 					  int	  width,
 					  int	  height);
 
+    typedef int (*GLXGetVideoSyncProc)  (unsigned int *count);
     typedef int (*GLXWaitVideoSyncProc) (int	  divisor,
 					 int	  remainder,
 					 unsigned int *count);
 
-    // http://www.opengl.org/registry/specs/SGI/swap_control.txt
-    typedef int (*GLXSwapIntervalProc) (int interval);
-
     #ifndef GLX_VERSION_1_3
     typedef struct __GLXFBConfigRec *GLXFBConfig;
     #endif
@@ -165,8 +163,8 @@
     extern GLXReleaseTexImageProc   releaseTexImage;
     extern GLXQueryDrawableProc     queryDrawable;
     extern GLXCopySubBufferProc     copySubBuffer;
+    extern GLXGetVideoSyncProc      getVideoSync;
     extern GLXWaitVideoSyncProc     waitVideoSync;
-    extern GLXSwapIntervalProc      swapInterval;
     extern GLXGetFBConfigsProc      getFBConfigs;
     extern GLXGetFBConfigAttribProc getFBConfigAttrib;
     extern GLXCreatePixmapProc      createPixmap;

=== modified file 'plugins/opengl/src/privates.h'
--- plugins/opengl/src/privates.h	2011-09-09 15:20:10 +0000
+++ plugins/opengl/src/privates.h	2011-09-15 05:45:39 +0000
@@ -70,7 +70,6 @@
 
 	void prepareDrawing ();
 
-	void controlSwapVideoSync ();
 	void waitForVideoSync ();
 
 	void paintBackground (const CompRegion &region,

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2011-09-09 15:20:10 +0000
+++ plugins/opengl/src/screen.cpp	2011-09-15 05:45:39 +0000
@@ -31,12 +31,15 @@
 #include <math.h>
 
 namespace GL {
+    typedef int (*GLXSwapIntervalProc) (int interval);
+
+    GLXSwapIntervalProc      swapInterval = NULL;
     GLXBindTexImageProc      bindTexImage = NULL;
     GLXReleaseTexImageProc   releaseTexImage = NULL;
     GLXQueryDrawableProc     queryDrawable = NULL;
     GLXCopySubBufferProc     copySubBuffer = NULL;
+    GLXGetVideoSyncProc      getVideoSync = NULL;
     GLXWaitVideoSyncProc     waitVideoSync = NULL;
-    GLXSwapIntervalProc      swapInterval = NULL;
     GLXGetFBConfigsProc      getFBConfigs = NULL;
     GLXGetFBConfigAttribProc getFBConfigAttrib = NULL;
     GLXCreatePixmapProc      createPixmap = NULL;
@@ -217,6 +220,9 @@
 
     if (strstr (glxExtensions, "GLX_SGI_video_sync"))
     {
+	GL::getVideoSync = (GL::GLXGetVideoSyncProc)
+	    getProcAddress ("glXGetVideoSyncSGI");
+
 	GL::waitVideoSync = (GL::GLXWaitVideoSyncProc)
 	    getProcAddress ("glXWaitVideoSyncSGI");
     }
@@ -988,21 +994,13 @@
 		priv->lastViewport.height);
 }
 
-void
-PrivateGLScreen::controlSwapVideoSync ()
+namespace GL
 {
-    bool sync = optionGetSyncToVblank ();
-    // Docs: http://www.opengl.org/registry/specs/SGI/swap_control.txt
-    if (GL::swapInterval)
-	(*GL::swapInterval) (sync ? 1 : 0);
-    else if (sync)
-	waitForVideoSync ();
-}
 
 void
-PrivateGLScreen::waitForVideoSync ()
+waitForVideoSync ()
 {
-    if (optionGetSyncToVblank () && GL::waitVideoSync)
+    if (GL::waitVideoSync)
     {
 	// Don't wait twice. Just in case.
 	if (GL::swapInterval)
@@ -1015,6 +1013,25 @@
 }
 
 void
+controlSwapVideoSync (bool sync)
+{
+    // Docs: http://www.opengl.org/registry/specs/SGI/swap_control.txt
+    if (GL::swapInterval)
+	(*GL::swapInterval) (sync ? 1 : 0);
+    else if (sync)
+	waitForVideoSync ();
+}
+
+} // namespace GL
+
+void
+PrivateGLScreen::waitForVideoSync ()
+{
+    if (optionGetSyncToVblank ())
+        GL::waitForVideoSync ();
+}
+
+void
 PrivateGLScreen::paintOutputs (CompOutput::ptrList &outputs,
 			       unsigned int        mask,
 			       const CompRegion    &region)
@@ -1099,7 +1116,7 @@
 	// it won't block the CPU. The waiting is offloaded to the GPU.
 	// Unfortunately it only works with glXSwapBuffers in most drivers.
 	//
-	controlSwapVideoSync ();
+	GL::controlSwapVideoSync (optionGetSyncToVblank ());
 	glXSwapBuffers (screen->dpy (), cScreen->output ());
     }
     else