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

[brosenk svn gnome org]

Author: brosenk
Date: Mon Jul  7 18:57:32 2008
New Revision: 13099
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13099&view=rev

Log:
m22-ify transogl-vsync.diff


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 18:57:32 2008
@@ -1710,12 +1710,13 @@
 
 [ OpenGLTransitions <= dev300-m21 ]
 transogl-more-transitions-m21.diff
+transogl-vsync-m21.diff
 
 [ OpenGLTransitions >= dev300-m22 ]
 transogl-more-transitions.diff
+transogl-vsync.diff
 
 [ OpenGLTransitions ]
-transogl-vsync.diff
 transogl-shader-transitions.diff
 transogl-mesa-fallback.diff
 transogl-shader-transitions-1.diff

Modified: trunk/patches/dev300/transogl-vsync.diff
==============================================================================
--- trunk/patches/dev300/transogl-vsync.diff	(original)
+++ trunk/patches/dev300/transogl-vsync.diff	Mon Jul  7 18:57:32 2008
@@ -1,7 +1,6 @@
-diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionerImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
---- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionerImpl.cxx	2008-02-22 16:17:57.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-02-22 17:33:19.000000000 +0100
-@@ -33,6 +33,7 @@
+--- 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 @@
   *
   ************************************************************************/
  
@@ -9,15 +8,15 @@
  #include "OGLTrans_TransitionImpl.hxx"
  
  #include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
-@@ -67,6 +68,7 @@ namespace unx
+@@ -71,6 +72,7 @@ namespace unx
  {
  #include <X11/keysym.h>
  #include <GL/glx.h>
 +#include <GL/glxext.h>
  }
+ #endif
  
- using namespace ::com::sun::star;
-@@ -114,6 +116,9 @@ private:    
+@@ -128,6 +130,9 @@ private:    
      	unsigned int			bpp;
      	unsigned int            Width;
      	unsigned int            Height;
@@ -27,40 +26,28 @@
      } GLWin;
      
      /** OpenGL handle to the leaving slide's texture
-@@ -256,8 +261,7 @@ void OGLTransitionerImpl::initWindowFrom
- 
-     if( pWindow )
-     {
--        OSL_TRACE("OGLTrans: using VisualID %08X\n",
--                  vi->visualid);
-+        OSL_TRACE("OGLTrans: using VisualID %08X\n", vi->visualid);
- 
-         pWindow->SetMouseTransparent( TRUE );
-         pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
-@@ -269,6 +273,8 @@ void OGLTransitionerImpl::initWindowFrom
- 
+@@ -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);
++	GLWin.GLXExtensions = unx::glXQueryExtensionsString( GLWin.dpy, GLWin.screen );
++	OSL_TRACE("available GLX extensions: %s", GLWin.GLXExtensions);
+ #endif
      }
  
-     GLWin.ctx = glXCreateContext(GLWin.dpy,
-@@ -277,6 +283,16 @@ void OGLTransitionerImpl::initWindowFrom
-                                  GL_TRUE);
+@@ -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)");
-+        }
++	    // 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 );
- 
-Only in slideshow/source/engine/OGLTrans: OGLTrans_TransitionerImpl.o
+ #endif