ooo-build r12041 - in trunk: . patches/src680

[rodo svn gnome org]

Author: rodo
Date: Fri Mar 28 15:12:36 2008
New Revision: 12041
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12041&view=rev

Log:
2008-03-28  Radek Doulik  <rodo novell com>

	* patches/src680/apply: fixed todays transogl patches to not break
	build (committed wrong versions before)



Modified:
   trunk/ChangeLog
   trunk/patches/src680/transogl-dispose-fix.diff
   trunk/patches/src680/transogl-sync-fix.diff

Modified: trunk/patches/src680/transogl-dispose-fix.diff
==============================================================================
--- trunk/patches/src680/transogl-dispose-fix.diff	(original)
+++ trunk/patches/src680/transogl-dispose-fix.diff	Fri Mar 28 15:12:36 2008
@@ -1,6 +1,6 @@
-diff -rup OGLTrans-orig/OGLTrans_TransitionerImpl.cxx OGLTrans/OGLTrans_TransitionerImpl.cxx
---- OGLTrans-orig/OGLTrans_TransitionerImpl.cxx	2008-03-28 10:20:31.000000000 +0100
-+++ OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-03-28 10:55:57.000000000 +0100
+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
          /* TODO: check for version once the bug in fglrx driver is fixed */
          cbBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
@@ -25,7 +25,7 @@
      glGenTextures(1, &GLleavingSlide);
  	glBindTexture(GL_TEXTURE_2D, GLleavingSlide);
 -    if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
-+    if( ( pTransition && !pTransition->mbUseMipMapLeaving ) || cbBrokenTexturesATI || cbMesa ) { /* I get invalid read on Mesa in gluBuild2DMipmaps, so disable Mesa as well */
++    if( ( pTransition && !pTransition->mbUseMipMapLeaving ) || cbBrokenTexturesATI || cbMesa ) {
          glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &LeavingBytes[0]);
          glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
          glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);

Modified: trunk/patches/src680/transogl-sync-fix.diff
==============================================================================
--- trunk/patches/src680/transogl-sync-fix.diff	(original)
+++ trunk/patches/src680/transogl-sync-fix.diff	Fri Mar 28 15:12:36 2008
@@ -1,6 +1,6 @@
-diff -rup OGLTrans-orig/OGLTrans_TransitionerImpl.cxx OGLTrans/OGLTrans_TransitionerImpl.cxx
---- OGLTrans-orig/OGLTrans_TransitionerImpl.cxx	2008-03-28 10:20:31.000000000 +0100
-+++ OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-03-28 11:22:52.000000000 +0100
+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
          instance = new OGLTransitionerImpl( NULL );
          instance->initWindowFromSlideShowView( xView, 0, 0 );
@@ -18,23 +18,10 @@
          const GLubyte* version = glGetString( GL_VERSION );
          if( version && version[0] ) {
              cnGLVersion = version[0] - '0';
-@@ -209,6 +199,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 );
- 
-+        instance->disposing();
-         delete instance;
-         initialized = true;
-     }
-@@ -343,6 +334,20 @@ bool OGLTransitionerImpl::initWindowFrom
+@@ -349,6 +339,16 @@ bool OGLTransitionerImpl::initWindowFrom
          return false;
      }
-     glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
-+    if( glGetError() != GL_NO_ERROR ) {
-+        OSL_TRACE("glError: %s\n", (char *)gluErrorString(glGetError()));
-+        return false;
-+    }
-+
+ 
 +    if( GLWin.HasGLXExtension("GLX_SGI_swap_control" ) ) {
 +        // enable vsync
 +        typedef GLint (*glXSwapIntervalProc)(GLint);
@@ -44,28 +31,11 @@
 +            OSL_TRACE("set swap interval to 1 (enable vsync)");
 +        }
 +    }
- 
++
      glEnable(GL_CULL_FACE);
      glCullFace(GL_BACK);
-@@ -489,7 +494,7 @@ void OGLTransitionerImpl::GLInitSlides()
-     
-     glGenTextures(1, &GLleavingSlide);
- 	glBindTexture(GL_TEXTURE_2D, GLleavingSlide);
--    if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
-+    if( ( pTransition && !pTransition->mbUseMipMapLeaving ) || cbBrokenTexturesATI || cbMesa ) {
-         glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &LeavingBytes[0]);
-         glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-         glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-@@ -513,7 +518,7 @@ void OGLTransitionerImpl::GLInitSlides()
- 	
- 	glGenTextures(1, &GLenteringSlide);
- 	glBindTexture(GL_TEXTURE_2D, GLenteringSlide);
--    if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
-+    if( ( pTransition && !pTransition->mbUseMipMapLeaving ) || cbBrokenTexturesATI || cbMesa ) {
-         glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]);
-         glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-         glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-@@ -552,6 +557,10 @@ void SAL_CALL OGLTransitionerImpl::updat
+     glClearColor (0, 0, 0, 0);
+@@ -557,6 +557,10 @@ void SAL_CALL OGLTransitionerImpl::updat
  	unx::glXSwapBuffers(GLWin.dpy, GLWin.win);
  	if( pWindow )
          pWindow->Show();
@@ -76,24 +46,3 @@
  }
  
  // we are about to be disposed (someone call dispose() on us)
-@@ -566,7 +575,10 @@ void OGLTransitionerImpl::disposing()
- 
-     if(GLWin.ctx)
- 	{
--	    OSL_ENSURE( glXMakeCurrent(GLWin.dpy, None, NULL) , "Error releasing glX context" );
-+        glXMakeCurrent(GLWin.dpy, None, NULL);
-+        if( glGetError() != GL_NO_ERROR ) {
-+            OSL_TRACE("glError: %s\n", (char *)gluErrorString(glGetError()));
-+        }
- 		glXDestroyContext(GLWin.dpy, GLWin.ctx);
- 		GLWin.ctx = NULL;
- 	}
-@@ -650,7 +662,7 @@ public:
-             return uno::Reference< presentation::XTransition >();
-             
- 
--        OGLTransitionImpl* pTransition;
-+        OGLTransitionImpl* pTransition = NULL;
- 
-         if( transitionType == animations::TransitionType::MISCSHAPEWIPE ) {
-             pTransition = new OGLTransitionImpl();