ooo-build r13104 - in trunk: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Mon Jul  7 19:29:43 2008
New Revision: 13104
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13104&view=rev

Log:
m22-ify transogl-sync-fix


Added:
   trunk/patches/dev300/transogl-sync-fix-m21.diff
      - copied unchanged from r13097, /trunk/patches/dev300/transogl-sync-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/transogl-sync-fix.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 19:29:43 2008
@@ -1715,6 +1715,7 @@
 transogl-mesa-fallback-m21.diff
 transogl-shader-transitions-1-m21.diff
 transogl-dispose-fix-m21.diff
+transogl-sync-fix-m21.diff
 
 [ OpenGLTransitions >= dev300-m22 ]
 transogl-more-transitions.diff
@@ -1723,9 +1724,9 @@
 transogl-mesa-fallback.diff
 transogl-shader-transitions-1.diff
 transogl-dispose-fix.diff
+transogl-sync-fix.diff
 
 [ OpenGLTransitions ]
-transogl-sync-fix.diff
 transogl-detect-fix.diff
 
 [ Experimental ]

Modified: trunk/patches/dev300/transogl-sync-fix.diff
==============================================================================
--- trunk/patches/dev300/transogl-sync-fix.diff	(original)
+++ trunk/patches/dev300/transogl-sync-fix.diff	Mon Jul  7 19:29:43 2008
@@ -1,7 +1,6 @@
-diff -rup slideshow/source/engine/OGLTrans-orig1/OGLTrans_TransitionerImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
---- slideshow/source/engine/OGLTrans-orig1/OGLTrans_TransitionerImpl.cxx	2008-03-28 11:00:45.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-03-28 11:22:52.000000000 +0100
-@@ -183,16 +183,6 @@ void OGLTransitionerImpl::initialize( co
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.toglsync~	2008-07-07 21:24:05.767846551 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-07-07 21:26:51.634847315 +0200
+@@ -197,16 +197,6 @@ void OGLTransitionerImpl::initialize( co
          instance = new OGLTransitionerImpl( NULL );
          instance->initWindowFromSlideShowView( xView, 0, 0 );
  
@@ -18,25 +17,27 @@
          const GLubyte* version = glGetString( GL_VERSION );
          if( version && version[0] ) {
              cnGLVersion = version[0] - '0';
-@@ -349,6 +339,16 @@ bool OGLTransitionerImpl::initWindowFrom
-         return false;
+@@ -408,7 +398,18 @@ bool OGLTransitionerImpl::initWindowFrom
+ 	    OSL_TRACE("glError: %s\n", (char *)gluErrorString(glGetError()));
+ 	    return false;
      }
- 
++
 +    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)");
-+        }
++	    // 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)");
++	    }
 +    }
+ #endif
 +
      glEnable(GL_CULL_FACE);
      glCullFace(GL_BACK);
      glClearColor (0, 0, 0, 0);
-@@ -557,6 +557,10 @@ void SAL_CALL OGLTransitionerImpl::updat
- 	unx::glXSwapBuffers(GLWin.dpy, GLWin.win);
+@@ -788,6 +789,10 @@ void SAL_CALL OGLTransitionerImpl::updat
+ #endif
  	if( pWindow )
          pWindow->Show();
 +