ooo-build r13102 - trunk/patches/dev300

[brosenk svn gnome org]

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

Log:
m22-ify transogl-shader-transitions-1


Added:
   trunk/patches/dev300/transogl-shader-transitions-1-m21.diff
      - copied unchanged from r13097, /trunk/patches/dev300/transogl-shader-transitions-1.diff
Modified:
   trunk/patches/dev300/apply
   trunk/patches/dev300/transogl-shader-transitions-1.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 19:21:41 2008
@@ -1713,15 +1713,16 @@
 transogl-vsync-m21.diff
 transogl-shader-transitions-m21.diff
 transogl-mesa-fallback-m21.diff
+transogl-shader-transitions-1-m21.diff
 
 [ OpenGLTransitions >= dev300-m22 ]
 transogl-more-transitions.diff
 transogl-vsync.diff
 transogl-shader-transitions.diff
 transogl-mesa-fallback.diff
+transogl-shader-transitions-1.diff
 
 [ OpenGLTransitions ]
-transogl-shader-transitions-1.diff
 transogl-dispose-fix.diff
 transogl-sync-fix.diff
 transogl-detect-fix.diff

Modified: trunk/patches/dev300/transogl-shader-transitions-1.diff
==============================================================================
--- trunk/patches/dev300/transogl-shader-transitions-1.diff	(original)
+++ trunk/patches/dev300/transogl-shader-transitions-1.diff	Mon Jul  7 19:21:41 2008
@@ -1,7 +1,6 @@
-diff -Nrup slideshow/source/engine/OGLTrans-rig/makefile.mk slideshow/source/engine/OGLTrans/makefile.mk
---- slideshow/source/engine/OGLTrans-rig/makefile.mk	2008-03-17 10:39:38.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/makefile.mk	2008-03-17 10:39:51.000000000 +0100
-@@ -55,6 +55,7 @@ ENABLE_EXCEPTIONS=TRUE
+--- slideshow/source/engine/OGLTrans/makefile.mk.toglst1~	2008-07-07 21:07:47.067846691 +0200
++++ slideshow/source/engine/OGLTrans/makefile.mk	2008-07-07 21:17:07.477845168 +0200
+@@ -51,6 +51,7 @@ ENABLE_EXCEPTIONS=TRUE
  
  SLOFILES = \
          $(SLO)$/OGLTrans_TransitionImpl.obj \
@@ -9,9 +8,8 @@
          $(SLO)$/OGLTrans_TransitionerImpl.obj
  
  DLLPRE=
-diff -Nrup slideshow/source/engine/OGLTrans-rig/OGLTrans_Shaders.cxx slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx
---- slideshow/source/engine/OGLTrans-rig/OGLTrans_Shaders.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx	2008-03-17 12:09:05.000000000 +0100
+--- slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx.toglst1~	2008-07-07 21:17:07.478845854 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx	2008-07-07 21:17:07.478845854 +0200
 @@ -0,0 +1,113 @@
 +#include <osl/diagnose.hxx>
 +
@@ -126,9 +124,8 @@
 +#endif
 +}
 +
-diff -Nrup slideshow/source/engine/OGLTrans-rig/OGLTrans_Shaders.hxx slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx
---- slideshow/source/engine/OGLTrans-rig/OGLTrans_Shaders.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx	2008-03-17 12:08:41.000000000 +0100
+--- slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx.toglst1~	2008-07-07 21:17:07.479845702 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx	2008-07-07 21:17:07.479845702 +0200
 @@ -0,0 +1,41 @@
 +#ifndef INCLUDED_OGLTRANS_SHADERS_HXX_
 +#define INCLUDED_OGLTRANS_SHADERS_HXX_
@@ -171,10 +168,9 @@
 +};
 +
 +#endif
-diff -Nrup slideshow/source/engine/OGLTrans-rig/OGLTrans_TransitionerImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
---- slideshow/source/engine/OGLTrans-rig/OGLTrans_TransitionerImpl.cxx	2008-03-17 10:39:38.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-03-17 10:39:51.000000000 +0100
-@@ -167,6 +167,11 @@ public:
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.toglst1~	2008-07-07 21:16:28.811846488 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-07-07 21:17:07.481845328 +0200
+@@ -181,6 +181,11 @@ public:
      static bool cbMesa;
  };
  
@@ -186,23 +182,23 @@
  void OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView )
  {
      // not thread safe
-diff -Nrup slideshow/source/engine/OGLTrans-rig/OGLTrans_TransitionImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
---- slideshow/source/engine/OGLTrans-rig/OGLTrans_TransitionImpl.cxx	2008-03-17 10:39:38.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2008-03-17 10:41:32.000000000 +0100
-@@ -32,10 +32,10 @@
-  *    MA  02111-1307  USA
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx.toglst1~	2008-07-07 21:07:47.090846542 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2008-07-07 21:18:00.043847201 +0200
+@@ -27,11 +27,10 @@
+  * for a copy of the LGPLv3 License.
   *
   ************************************************************************/
 -#define GL_GLEXT_PROTOTYPES 1
-+
- #include "OGLTrans_TransitionImpl.hxx"
+-#include "OGLTrans_TransitionImpl.hxx"
+ 
++#include "OGLTrans_TransitionImpl.hxx"
 +#include "OGLTrans_Shaders.hxx"
  #include <GL/gl.h>
 -#include <GL/glext.h>
  #include <math.h>
  
- void OGLTransitionImpl::clear()
-@@ -53,17 +53,17 @@ void OGLTransitionImpl::clear()
+ 
+@@ -50,17 +49,17 @@ void OGLTransitionImpl::clear()
  
  #ifdef GL_VERSION_2_0
      if( mProgramObject ) {
@@ -223,7 +219,7 @@
          mFragmentObject = 0;
      }
  #endif
-@@ -1017,55 +1017,6 @@ void OGLTransitionImpl::makeFadeSmoothly
+@@ -1015,55 +1014,6 @@ void OGLTransitionImpl::makeFadeSmoothly
      mbUseMipMapLeaving = mbUseMipMapEntering = false;
  }
  
@@ -279,7 +275,7 @@
  static const char* basicVertexShader = "\n\
  varying vec2 v_texturePosition;\n\
  \n\
-@@ -1195,11 +1146,11 @@ void OGLTransitionImpl::preparePermShade
+@@ -1193,11 +1143,11 @@ void OGLTransitionImpl::preparePermShade
  {
  #ifdef GL_VERSION_2_0
      if( mProgramObject ) {
@@ -294,7 +290,7 @@
          }
  
          glActiveTexture(GL_TEXTURE1);
-@@ -1207,14 +1158,14 @@ void OGLTransitionImpl::preparePermShade
+@@ -1205,14 +1155,14 @@ void OGLTransitionImpl::preparePermShade
              initPermTexture( &maHelperTexture );
          glActiveTexture(GL_TEXTURE0);
  
@@ -313,7 +309,7 @@
          }
      }
  #endif
-@@ -1222,7 +1173,7 @@ void OGLTransitionImpl::preparePermShade
+@@ -1220,7 +1170,7 @@ void OGLTransitionImpl::preparePermShade
  
  void OGLTransitionImpl::prepareStatic( ::sal_Int32 /* glLeavingSlideTex */, ::sal_Int32 /* glEnteringSlideTex */ )
  {
@@ -322,7 +318,7 @@
  
      preparePermShader();
  }
-@@ -1234,16 +1185,16 @@ void OGLTransitionImpl::displaySlidesSha
+@@ -1232,16 +1182,16 @@ void OGLTransitionImpl::displaySlidesSha
  
  #ifdef GL_VERSION_2_0
      if( mProgramObject ) {
@@ -342,7 +338,7 @@
  
      displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );
  }
-@@ -1266,7 +1217,7 @@ void OGLTransitionImpl::makeStatic()
+@@ -1264,7 +1214,7 @@ void OGLTransitionImpl::makeStatic()
  
  void OGLTransitionImpl::prepareDissolve( ::sal_Int32 /* glLeavingSlideTex */, ::sal_Int32 /* glEnteringSlideTex */ )
  {