ooo-build r11921 - trunk/patches/src680

[rodo svn gnome org]

Author: rodo
Date: Mon Mar 17 11:12:25 2008
New Revision: 11921
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11921&view=rev

Log:
comment out even more for gl < 2.0


Modified:
   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 11:12:25 2008
@@ -11,8 +11,8 @@
  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 10:42:19.000000000 +0100
-@@ -0,0 +1,112 @@
++++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx	2008-03-17 12:09:05.000000000 +0100
+@@ -0,0 +1,113 @@
 +#include <osl/diagnose.hxx>
 +
 +#include "OGLTrans_Shaders.hxx"
@@ -43,13 +43,12 @@
 +PFNGLGETUNIFORMLOCATIONPROC OGLShaders::glGetUniformLocation = NULL;
 +PFNGLUNIFORM1IPROC OGLShaders::glUniform1i = NULL;
 +PFNGLUNIFORM1FPROC OGLShaders::glUniform1f = NULL;
-+
 +#endif
 +
 +bool OGLShaders::Initialize()
 +{
-+    if( !cbInitialized ) {
 +#ifdef GL_VERSION_2_0
++    if( !cbInitialized ) {
 +        glCreateShader = (PFNGLCREATESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCreateShader" );
 +        glShaderSource = (PFNGLSHADERSOURCEPROC) unx::glXGetProcAddress( (unsigned char *) "glShaderSource" );
 +        glCompileShader = (PFNGLCOMPILESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCompileShader" );
@@ -66,11 +65,13 @@
 +        glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC) unx::glXGetProcAddress( (unsigned char *) "glGetUniformLocation" );
 +        glUniform1i = (PFNGLUNIFORM1IPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1i" );
 +        glUniform1f = (PFNGLUNIFORM1FPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1f" );
-+#endif
 +        cbInitialized = true;
 +    }
 +
 +    return glCreateShader != NULL;
++#else
++    return false;
++#endif
 +}
 +
 +GLuint OGLShaders::LinkProgram( const char *vertexShader, const char *fragmentShader )
@@ -127,7 +128,7 @@
 +
 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
++++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx	2008-03-17 12:08:41.000000000 +0100
 @@ -0,0 +1,40 @@
 +#ifndef INCLUDED_OGLTRANS_SHADERS_HXX_
 +#define INCLUDED_OGLTRANS_SHADERS_HXX_