[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply               |    7 +++-
 patches/dev300/transogl-vsync.diff |   53 -------------------------------------
 2 files changed, 5 insertions(+), 55 deletions(-)

New commits:
commit 69e6c815685ac42dd4231baa1dc802c6125ac95a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 19:06:22 2009 +0300

    A couple of transogl diffs seem to be upstream
    
    * patches/dev300/apply: The functionality in
      transogl-more-transitions.diff is probably upstream, but I am not
      100% sure if completely, so just comment it out. transogl-vsync.diff
      surely is upstream, and upstream has further refinements to it, so
      it can be dropped.
    
    * patches/dev300/transogl-vsync.diff: Delete it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f15d202..7d05247 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2066,8 +2066,11 @@ debian-dictionary.diff, rengelha
 transogl-transitions-sd.diff
 transogl-transitions-officecfg.diff
 transogl-transitions-scp2.diff
-transogl-more-transitions.diff
-transogl-vsync.diff
+
+# FIXME: 2009-08-21: Parts of this seems to be upstream, even if in a
+# different way. --tml
+# transogl-more-transitions.diff
+
 transogl-shader-transitions.diff
 transogl-mesa-fallback.diff
 transogl-shader-transitions-1.diff
diff --git a/patches/dev300/transogl-vsync.diff b/patches/dev300/transogl-vsync.diff
deleted file mode 100644
index 18694d8..0000000
--- a/patches/dev300/transogl-vsync.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.oglvsync~	2008-07-07 20:49:22.348097043 +0200
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-07-07 20:53:29.174846394 +0200
-@@ -28,6 +28,7 @@
-  *
-  ************************************************************************/
- 
-+#define GLX_GLXEXT_PROTOTYPES 1
- #include "OGLTrans_TransitionImpl.hxx"
- 
- #include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
-@@ -71,6 +72,7 @@ namespace unx
- {
- #include <X11/keysym.h>
- #include <GL/glx.h>
-+#include <GL/glxext.h>
- }
- #endif
- 
-@@ -128,6 +130,9 @@ private:    
-     	unsigned int			bpp;
-     	unsigned int            Width;
-     	unsigned int            Height;
-+        const char*             GLXExtensions;
-+
-+        bool HasGLXExtension( const char* name ) { return gluCheckExtension( (const GLubyte*) name, (const GLubyte*) GLXExtensions ); };
-     } GLWin;
-     
-     /** OpenGL handle to the leaving slide's texture
-@@ -295,6 +300,8 @@ void OGLTransitionerImpl::initWindowFrom
- #elif defined( UNX )
-         GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay);
-         GLWin.win = pChildSysData->aWindow;
-+	GLWin.GLXExtensions = unx::glXQueryExtensionsString( GLWin.dpy, GLWin.screen );
-+	OSL_TRACE("available GLX extensions: %s", GLWin.GLXExtensions);
- #endif
-     }
- 
-@@ -335,6 +342,15 @@ void OGLTransitionerImpl::initWindowFrom
- 	wglMakeCurrent(GLWin.hDC,GLWin.hRC);
- #elif defined( UNX )
-     glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
-+    if(GLWin.HasGLXExtension("GLX_SGI_swap_control")) {
-+	    // enable vsync
-+	    typedef GLint (*glXSwapIntervalProc)(GLint);
-+	    glXSwapIntervalProc glXSwapInterval = (glXSwapIntervalProc) unx::glXGetProcAddress( (const GLubyte*) "glXSwapIntervalSGI" );
-+	    if( glXSwapInterval ) {
-+		    glXSwapInterval( 1 );
-+		    OSL_TRACE("set swap interval to 1 (enable vsync)");
-+	    }
-+    }
-     /* TODO: check for version once the bug in fglrx driver is fixed */
-     bBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
- #endif