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

[rodo svn gnome org]

Author: rodo
Date: Mon Mar 17 10:21:46 2008
New Revision: 11919
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11919&view=rev

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

	* build/ooh680-m12/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx: 
	* build/ooh680-m12/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx:
	more GL_VERSION_2_0 ifdef's to fix build.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/transogl-shader-transitions-1.diff

Modified: trunk/patches/src680/transogl-shader-transitions-1.diff
==============================================================================
--- trunk/patches/src680/transogl-shader-transitions-1.diff	(original)
+++ trunk/patches/src680/transogl-shader-transitions-1.diff	Mon Mar 17 10:21:46 2008
@@ -1,6 +1,6 @@
-diff -Nrup slideshow/source/engine/OGLTrans-orig/makefile.mk slideshow/source/engine/OGLTrans/makefile.mk
---- slideshow/source/engine/OGLTrans-orig/makefile.mk	2008-03-12 18:07:14.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/makefile.mk	2008-03-12 18:06:31.000000000 +0100
+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
  
  SLOFILES = \
@@ -9,10 +9,10 @@
          $(SLO)$/OGLTrans_TransitionerImpl.obj
  
  DLLPRE=
-diff -Nrup slideshow/source/engine/OGLTrans-orig/OGLTrans_Shaders.cxx slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx
---- slideshow/source/engine/OGLTrans-orig/OGLTrans_Shaders.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx	2008-03-12 18:10:04.000000000 +0100
-@@ -0,0 +1,107 @@
+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 10:42:19.000000000 +0100
+@@ -0,0 +1,112 @@
 +#include <osl/diagnose.hxx>
 +
 +#include "OGLTrans_Shaders.hxx"
@@ -25,6 +25,8 @@
 +
 +bool OGLShaders::cbInitialized = false;
 +
++#ifdef GL_VERSION_2_0
++
 +PFNGLCREATESHADERPROC OGLShaders::glCreateShader = NULL;
 +PFNGLSHADERSOURCEPROC OGLShaders::glShaderSource = NULL;
 +PFNGLCOMPILESHADERPROC OGLShaders::glCompileShader = NULL;
@@ -42,9 +44,12 @@
 +PFNGLUNIFORM1IPROC OGLShaders::glUniform1i = NULL;
 +PFNGLUNIFORM1FPROC OGLShaders::glUniform1f = NULL;
 +
++#endif
++
 +bool OGLShaders::Initialize()
 +{
 +    if( !cbInitialized ) {
++#ifdef GL_VERSION_2_0
 +        glCreateShader = (PFNGLCREATESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCreateShader" );
 +        glShaderSource = (PFNGLSHADERSOURCEPROC) unx::glXGetProcAddress( (unsigned char *) "glShaderSource" );
 +        glCompileShader = (PFNGLCOMPILESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCompileShader" );
@@ -61,7 +66,7 @@
 +        glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC) unx::glXGetProcAddress( (unsigned char *) "glGetUniformLocation" );
 +        glUniform1i = (PFNGLUNIFORM1IPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1i" );
 +        glUniform1f = (PFNGLUNIFORM1FPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1f" );
-+
++#endif
 +        cbInitialized = true;
 +    }
 +
@@ -120,9 +125,9 @@
 +#endif
 +}
 +
-diff -Nrup slideshow/source/engine/OGLTrans-orig/OGLTrans_Shaders.hxx slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx
---- slideshow/source/engine/OGLTrans-orig/OGLTrans_Shaders.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx	2008-03-12 18:06:31.000000000 +0100
+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 10:39:51.000000000 +0100
 @@ -0,0 +1,40 @@
 +#ifndef INCLUDED_OGLTRANS_SHADERS_HXX_
 +#define INCLUDED_OGLTRANS_SHADERS_HXX_
@@ -164,9 +169,9 @@
 +};
 +
 +#endif
-diff -Nrup 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-12 18:07:14.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-03-12 18:06:31.000000000 +0100
+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:
      static bool cbMesa;
  };
@@ -179,9 +184,9 @@
  void OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView )
  {
      // not thread safe
-diff -Nrup 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-12 18:07:14.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx	2008-03-12 18:06:31.000000000 +0100
+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
   *
@@ -315,7 +320,7 @@
  
      preparePermShader();
  }
-@@ -1234,9 +1185,9 @@ void OGLTransitionImpl::displaySlidesSha
+@@ -1234,16 +1185,16 @@ void OGLTransitionImpl::displaySlidesSha
  
  #ifdef GL_VERSION_2_0
      if( mProgramObject ) {
@@ -326,7 +331,15 @@
 +            OGLShaders::glUniform1f( location, nTime );
          }
      }
- #endif
+-#endif
+ 
+     glActiveTexture( GL_TEXTURE2 );
+     glBindTexture( GL_TEXTURE_2D, glEnteringSlideTex );
+     glActiveTexture( GL_TEXTURE0 );
++#endif
+ 
+     displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );
+ }
 @@ -1266,7 +1217,7 @@ void OGLTransitionImpl::makeStatic()
  
  void OGLTransitionImpl::prepareDissolve( ::sal_Int32 /* glLeavingSlideTex */, ::sal_Int32 /* glEnteringSlideTex */ )