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

From: brosenk svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13100 - in trunk: . patches/dev300
Date: Mon, 7 Jul 2008 19:09:26 +0000 (UTC)
Author: brosenk
Date: Mon Jul  7 19:09:26 2008
New Revision: 13100
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13100&view=rev

Log:
m22-ify transogl-shader-transitions.diff


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 19:09:26 2008
@@ -1711,13 +1711,14 @@
 [ OpenGLTransitions <= dev300-m21 ]
 transogl-more-transitions-m21.diff
 transogl-vsync-m21.diff
+transogl-shader-transitions-m21.diff
 
 [ OpenGLTransitions >= dev300-m22 ]
 transogl-more-transitions.diff
 transogl-vsync.diff
+transogl-shader-transitions.diff
 
 [ OpenGLTransitions ]
-transogl-shader-transitions.diff
 transogl-mesa-fallback.diff
 transogl-shader-transitions-1.diff
 transogl-dispose-fix.diff

Modified: trunk/patches/dev300/transogl-shader-transitions.diff
==============================================================================
--- trunk/patches/dev300/transogl-shader-transitions.diff	(original)
+++ trunk/patches/dev300/transogl-shader-transitions.diff	Mon Jul  7 19:09:26 2008
@@ -1,7 +1,6 @@
-diff -rup slideshow/source/engine/OGLTrans-orig/makefile.mk slideshow/source/engine/OGLTrans/makefile.mk
---- slideshow/source/engine/OGLTrans-orig/makefile.mk	2008-03-10 16:48:29.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/makefile.mk	2008-03-10 15:15:33.000000000 +0100
-@@ -56,7 +56,7 @@ ENABLE_EXCEPTIONS=TRUE
+--- slideshow/source/engine/OGLTrans/makefile.mk.oglshtrans~	2008-07-07 20:27:31.849846010 +0200
++++ slideshow/source/engine/OGLTrans/makefile.mk	2008-07-07 20:58:47.309096487 +0200
+@@ -52,7 +52,7 @@ ENABLE_EXCEPTIONS=TRUE
  SLOFILES = \
          $(SLO)$/OGLTrans_TransitionImpl.obj \
          $(SLO)$/OGLTrans_TransitionerImpl.obj
@@ -10,10 +9,9 @@
  DLLPRE=
  SHL1TARGET=$(TARGET).uno
  
-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-10 16:48:29.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-03-10 15:15:33.000000000 +0100
-@@ -86,7 +86,7 @@ class OGLTransitionerImpl : private cppu
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.oglshtrans~	2008-07-07 20:56:19.994847050 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-07-07 21:05:13.163096087 +0200
+@@ -91,7 +91,7 @@ class OGLTransitionerImpl : private cppu
  {
  public:
      explicit OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition);
@@ -22,7 +20,7 @@
      void setSlides( const uno::Reference< rendering::XBitmap >& xLeavingSlide , const uno::Reference< rendering::XBitmap >& xEnteringSlide );
  
      // XTransition
-@@ -154,15 +154,18 @@ private:    
+@@ -168,15 +168,18 @@ private:    
  
      /** whether we are running on ATI fglrx with bug related to textures
       */
@@ -44,39 +42,38 @@
  
      /// take the XSlideShowView and extract the parent window from it. see viewmediashape.cxx
      uno::Reference< rendering::XCanvas > xCanvas(xView->getCanvas(), uno::UNO_QUERY_THROW);
-@@ -281,6 +284,10 @@ void OGLTransitionerImpl::initWindowFrom
+@@ -312,6 +315,10 @@ void OGLTransitionerImpl::initWindowFrom
                                   vi,
                                   0,
                                   GL_TRUE);
 +    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;
 +    }
-     glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
+ #endif
  
-     if(GLWin.HasGLXExtension("GLX_SGI_swap_control")) {
-@@ -293,8 +300,19 @@ void OGLTransitionerImpl::initWindowFrom
-         }
+ #if defined( WNT ) 
+@@ -351,8 +358,18 @@ void OGLTransitionerImpl::initWindowFrom
+ 		    OSL_TRACE("set swap interval to 1 (enable vsync)");
+ 	    }
      }
- 
++
 +    const GLubyte* version = glGetString( GL_VERSION );
 +    if( version && version[0] ) {
-+        mnGLVersion = version[0] - '0';
-+        if( version[1] == '.' && version[2] )
-+            mnGLVersion += (version[2] - '0')/10.0;
++	    mnGLVersion = version[0] - '0';
++	    if( version[1] == '.' && version[2] )
++		    mnGLVersion += (version[2] - '0')/10.0;
 +    } else
-+        mnGLVersion = 1.0;
++	    mnGLVersion = 1.0;
 +    OSL_TRACE("GL version: %s parsed: %f", version, mnGLVersion );
 +
      /* TODO: check for version once the bug in fglrx driver is fixed */
 -    bBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
 +    mbBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
-+
-+    
- 
+ #endif
      glEnable(GL_CULL_FACE);
      glCullFace(GL_BACK);
-@@ -313,8 +331,10 @@ void OGLTransitionerImpl::initWindowFrom
+@@ -375,8 +392,10 @@ void OGLTransitionerImpl::initWindowFrom
      if( LeavingBytes.hasElements() && EnteringBytes.hasElements())
         GLInitSlides();//we already have uninitialized slides, let's initialize 
  
@@ -89,15 +86,7 @@
  }
  
  void OGLTransitionerImpl::setSlides( const uno::Reference< rendering::XBitmap >& xLeavingSlide, 
-@@ -338,7 +358,6 @@ void OGLTransitionerImpl::setSlides( con
-     LeavingBytes = LeavingSlideIntBitmap->getData(SlideBitmapLayout,SlideRect);
-     EnteringBytes = EnteringSlideIntBitmap->getData(SlideBitmapLayout,SlideRect);
- 
--
-     if(GLWin.ctx)//if we have a rendering context, let's init the slides
-         GLInitSlides();
- 
-@@ -350,7 +369,7 @@ void OGLTransitionerImpl::GLInitSlides()
+@@ -453,7 +472,7 @@ void OGLTransitionerImpl::GLInitSlides()
  {
      osl::MutexGuard const guard( m_aMutex );
  
@@ -106,25 +95,25 @@
          return;
  
      glMatrixMode(GL_PROJECTION);
-@@ -440,7 +459,7 @@ void OGLTransitionerImpl::GLInitSlides()
-     
-     glGenTextures(1, &GLleavingSlide);
- 	glBindTexture(GL_TEXTURE_2D, GLleavingSlide);
--    if( pTransition && !bBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
-+    if( pTransition && !mbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
-         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);
-@@ -464,7 +483,7 @@ void OGLTransitionerImpl::GLInitSlides()
- 	
- 	glGenTextures(1, &GLenteringSlide);
- 	glBindTexture(GL_TEXTURE_2D, GLenteringSlide);
--    if( pTransition && !bBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
-+    if( pTransition && !mbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
-         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);
-@@ -489,14 +508,14 @@ void SAL_CALL OGLTransitionerImpl::updat
+@@ -624,7 +643,7 @@ void OGLTransitionerImpl::GLInitSlides()
+     }
+     else
+     {
+-	if( pTransition && !bBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
++	if( pTransition && !mbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) {
+ 	    glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.width,
+ 			 SlideSize.Height, &LeavingBytes[0]);
+ 	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
+@@ -680,7 +699,7 @@ void OGLTransitionerImpl::GLInitSlides()
+     }
+     else
+     {
+-	if( pTransition && !bBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
++	if( pTransition && !mbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) {
+ 	    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);
+@@ -712,14 +731,14 @@ void SAL_CALL OGLTransitionerImpl::updat
  {
      osl::MutexGuard const guard( m_aMutex );
  
@@ -142,7 +131,7 @@
                                SlideSize.Width, SlideSize.Height,
                                static_cast<double>(GLWin.Width),
                                static_cast<double>(GLWin.Height) );
-@@ -567,6 +586,8 @@ public:
+@@ -811,6 +830,8 @@ public:
                  case animations::TransitionSubType::BOTTOMRIGHT:
                  case animations::TransitionSubType::BOTTOMLEFT:
                  case animations::TransitionSubType::TOPCENTER:
@@ -151,7 +140,7 @@
                      return sal_True;
  
                  default:
-@@ -588,6 +609,9 @@ public:
+@@ -832,6 +853,9 @@ public:
          const uno::Reference< rendering::XBitmap >&           enteringBitmap, 
          const geometry::RealPoint2D&                          slideOffset ) throw (uno::RuntimeException)
      {
@@ -161,7 +150,7 @@
          OGLTransitionImpl* pTransition;
  
          if( transitionType == animations::TransitionType::MISCSHAPEWIPE ) {
-@@ -630,8 +654,12 @@ public:
+@@ -874,8 +898,12 @@ public:
                  case animations::TransitionSubType::TOPCENTER:
                      pTransition->makeVenetianBlinds( false, 6 );
                      break;
@@ -176,7 +165,7 @@
                  }
          } else if( transitionType == animations::TransitionType::FADE && transitionSubType == animations::TransitionSubType::CROSSFADE ) {
              pTransition = new OGLTransitionImpl();
-@@ -639,13 +667,12 @@ public:
+@@ -883,13 +911,12 @@ public:
          } else if( transitionType == animations::TransitionType::IRISWIPE && transitionSubType == animations::TransitionSubType::DIAMOND ) {
              pTransition = new OGLTransitionImpl();
              pTransition->makeDiamond();
@@ -192,21 +181,21 @@
          xRes->setSlides(leavingBitmap,enteringBitmap);
  
          return uno::Reference<presentation::XTransition>(xRes.get());
-diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
---- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.cxx	2008-03-10 16:48:29.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2008-03-10 16:43:23.000000000 +0100
-@@ -32,8 +32,10 @@
-  *    MA  02111-1307  USA
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx.oglshtrans~	2008-07-07 20:49:22.350096529 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2008-07-07 20:59:53.626846367 +0200
+@@ -27,9 +27,11 @@
+  * for a copy of the LGPLv3 License.
   *
   ************************************************************************/
 +#define GL_GLEXT_PROTOTYPES 1
  #include "OGLTrans_TransitionImpl.hxx"
+ 
  #include <GL/gl.h>
 +#include <GL/glext.h>
  #include <math.h>
  
- void OGLTransitionImpl::clear()
-@@ -48,6 +50,31 @@ void OGLTransitionImpl::clear()
+ 
+@@ -45,6 +47,31 @@ void OGLTransitionImpl::clear()
      maSceneObjects.clear();
  
      mbReflectSlides = false;
@@ -238,7 +227,7 @@
  }
  
  OGLTransitionImpl::~OGLTransitionImpl()
-@@ -55,11 +82,14 @@ OGLTransitionImpl::~OGLTransitionImpl()
+@@ -52,11 +79,14 @@ OGLTransitionImpl::~OGLTransitionImpl()
      clear();
  }
  
@@ -254,7 +243,7 @@
  }
  
  void OGLTransitionImpl::finish()
-@@ -986,3 +1016,273 @@ void OGLTransitionImpl::makeFadeSmoothly
+@@ -984,3 +1014,273 @@ void OGLTransitionImpl::makeFadeSmoothly
      mmDisplaySlides = &OGLTransitionImpl::displaySlidesFadeSmoothly;
      mbUseMipMapLeaving = mbUseMipMapEntering = false;
  }
@@ -528,10 +517,9 @@
 +
 +    mnRequiredGLVersion = 2.0;
 +}
-diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.hxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
---- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.hxx	2008-03-10 16:48:29.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx	2008-03-10 16:44:56.000000000 +0100
-@@ -55,18 +55,25 @@ public:
+--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx.oglshtrans~	2008-07-07 20:49:22.351096586 +0200
++++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx	2008-07-07 21:01:47.609846722 +0200
+@@ -64,18 +64,25 @@ public:
      OGLTransitionImpl() :
          mbUseMipMapLeaving( true ),
          mbUseMipMapEntering( true ),
@@ -559,7 +547,7 @@
      void finish();
  
      void makeOutsideCubeFaceToLeft();
-@@ -80,6 +87,8 @@ public:
+@@ -89,6 +96,8 @@ public:
      void makeIris();
      void makeRochade();
      void makeVenetianBlinds( bool vertical, int parts );
@@ -568,7 +556,7 @@
  
      /** 2D replacements
       */
-@@ -91,6 +100,10 @@ public:
+@@ -100,6 +109,10 @@ public:
      bool mbUseMipMapLeaving;
      bool mbUseMipMapEntering;
  
@@ -579,43 +567,31 @@
  private:
      /** clears all the primitives and operations
  	*/
-@@ -117,11 +130,28 @@ private:
-      */
-     bool mbReflectSlides;
- 
-+    /** GLSL objects, shaders and program
-+     */
-+    GLuint mVertexObject, mFragmentObject, mProgramObject;
-+
-+    /* various data */
-+    GLuint maHelperTexture;
-+
-     /** When this method is not NULL, it is called in display method to prepare the slides, scene, etc.
-      ** We might later replace this by cleaner derived class.
-      */
-     void (OGLTransitionImpl::*mmPrepare)( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
- 
-+    /** When this method is not NULL, it is called after glx context is ready to let the transition prepare GL related things, like GLSL program.
-+     ** We might later replace this by cleaner derived class.
-+     */
-+    void (OGLTransitionImpl::*mmPrepareTransition)( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
-+
-+    /** When this method is not NULL, it is called when the transition needs to clear after itself, like delete own textures etc.
-+     ** We might later replace this by cleaner derived class.
-+     */
-+    void (OGLTransitionImpl::*mmClearTransition)();
-+
-     /** When this method is not NULL, it is called in display method to display the slides.
-      ** We might later replace this by cleaner derived class.
-      */
-@@ -136,6 +166,10 @@ private:
-      */
-     void prepareDiamond( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
-     void displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
-+    void displaySlidesShaders( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
-+    void prepareStatic( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
-+    void prepareDissolve( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
-+    void preparePermShader();
+@@ -131,6 +144,16 @@ private:
+ 	 */
+ 	void (OGLTransitionImpl::*mmPrepare)( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
+ 
++	/** When this method is not NULL, it is called after glx context is ready to let the transition prepare GL related things, like GLSL program.
++	 ** We might later replace this by cleaner derived class.
++	 */
++	void (OGLTransitionImpl::*mmPrepareTransition)( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
++
++	/** When this method is not NULL, it is called when the transition needs to clear after itself, like delete own textures etc.
++	 ** We might later replace this by cleaner derived class.
++	 */
++	void (OGLTransitionImpl::*mmClearTransition)();
++
+ 	/** When this method is not NULL, it is called in display method to display the slides.
+ 	 ** We might later replace this by cleaner derived class.
+ 	 */
+@@ -145,6 +168,10 @@ private:
+ 	 */
+ 	void prepareDiamond( double nTime, double SlideWidth, double SlideHeight,double DispWidth, double DispHeight );
+ 	void displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
++	void displaySlidesShaders( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
++	void prepareStatic( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
++	void prepareDissolve( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
++	void preparePermShader();
  };
  
  class SceneObject
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]