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

[brosenk svn gnome org]

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

Log:
m22-ify transogl-dispose-fix


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 19:25:47 2008
@@ -1714,6 +1714,7 @@
 transogl-shader-transitions-m21.diff
 transogl-mesa-fallback-m21.diff
 transogl-shader-transitions-1-m21.diff
+transogl-dispose-fix-m21.diff
 
 [ OpenGLTransitions >= dev300-m22 ]
 transogl-more-transitions.diff
@@ -1721,9 +1722,9 @@
 transogl-shader-transitions.diff
 transogl-mesa-fallback.diff
 transogl-shader-transitions-1.diff
+transogl-dispose-fix.diff
 
 [ OpenGLTransitions ]
-transogl-dispose-fix.diff
 transogl-sync-fix.diff
 transogl-detect-fix.diff
 

Modified: trunk/patches/dev300/transogl-dispose-fix.diff
==============================================================================
--- trunk/patches/dev300/transogl-dispose-fix.diff	(original)
+++ trunk/patches/dev300/transogl-dispose-fix.diff	Mon Jul  7 19:25:47 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-03-28 10:20:31.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-03-28 11:00:45.000000000 +0100
-@@ -209,6 +209,7 @@ void OGLTransitionerImpl::initialize( co
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.ogldispose~	2008-07-07 21:19:54.633849842 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-07-07 21:21:53.434096522 +0200
+@@ -223,6 +223,7 @@ void OGLTransitionerImpl::initialize( co
          /* TODO: check for version once the bug in fglrx driver is fixed */
          cbBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
  
@@ -9,19 +8,19 @@
          delete instance;
          initialized = true;
      }
-@@ -343,6 +344,10 @@ bool OGLTransitionerImpl::initWindowFrom
-         return false;
-     }
+@@ -403,6 +404,10 @@ bool OGLTransitionerImpl::initWindowFrom
+ 	wglMakeCurrent(GLWin.hDC,GLWin.hRC);
+ #elif defined( UNX )
      glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
 +    if( glGetError() != GL_NO_ERROR ) {
-+        OSL_TRACE("glError: %s\n", (char *)gluErrorString(glGetError()));
-+        return false;
++	    OSL_TRACE("glError: %s\n", (char *)gluErrorString(glGetError()));
++	    return false;
 +    }
- 
+ #endif
      glEnable(GL_CULL_FACE);
      glCullFace(GL_BACK);
-@@ -566,7 +571,10 @@ void OGLTransitionerImpl::disposing()
- 
+@@ -806,7 +811,10 @@ void OGLTransitionerImpl::disposing()
+ #elif defined( UNX )
      if(GLWin.ctx)
  	{
 -	    OSL_ENSURE( glXMakeCurrent(GLWin.dpy, None, NULL) , "Error releasing glX context" );
@@ -32,7 +31,7 @@
  		glXDestroyContext(GLWin.dpy, GLWin.ctx);
  		GLWin.ctx = NULL;
  	}
-@@ -650,7 +658,7 @@ public:
+@@ -897,7 +905,7 @@ public:
              return uno::Reference< presentation::XTransition >();