ooo-build r11884 - trunk/patches/src680
- From: rodo svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11884 - trunk/patches/src680
- Date: Wed, 12 Mar 2008 17:17:44 +0000 (GMT)
Author: rodo
Date: Wed Mar 12 17:17:44 2008
New Revision: 11884
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11884&view=rev
Log:
removed OGLShaders namespace and explicitely state class domain where needed
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 Wed Mar 12 17:17:44 2008
@@ -1,6 +1,6 @@
-diff -Nrup /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/makefile.mk slideshow/source/engine/OGLTrans/makefile.mk
---- /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/makefile.mk 2008-03-11 20:20:51.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/makefile.mk 2008-03-12 13:42:32.000000000 +0100
+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
@@ -55,6 +55,7 @@ ENABLE_EXCEPTIONS=TRUE
SLOFILES = \
@@ -9,9 +9,164 @@
$(SLO)$/OGLTrans_TransitionerImpl.obj
DLLPRE=
-diff -Nrup /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
---- /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx 2008-03-11 20:22:53.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx 2008-03-12 12:43:56.000000000 +0100
+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 @@
++#include <osl/diagnose.hxx>
++
++#include "OGLTrans_Shaders.hxx"
++
++namespace unx
++{
++#include <GL/glx.h>
++#include <GL/glxext.h>
++}
++
++bool OGLShaders::cbInitialized = false;
++
++PFNGLCREATESHADERPROC OGLShaders::glCreateShader = NULL;
++PFNGLSHADERSOURCEPROC OGLShaders::glShaderSource = NULL;
++PFNGLCOMPILESHADERPROC OGLShaders::glCompileShader = NULL;
++PFNGLGETSHADERIVPROC OGLShaders::glGetShaderiv = NULL;
++PFNGLGETSHADERINFOLOGPROC OGLShaders::glGetShaderInfoLog = NULL;
++PFNGLDELETESHADERPROC OGLShaders::glDeleteShader = NULL;
++PFNGLCREATEPROGRAMPROC OGLShaders::glCreateProgram = NULL;
++PFNGLATTACHSHADERPROC OGLShaders::glAttachShader = NULL;
++PFNGLLINKPROGRAMPROC OGLShaders::glLinkProgram = NULL;
++PFNGLGETPROGRAMIVPROC OGLShaders::glGetProgramiv = NULL;
++PFNGLGETPROGRAMINFOLOGPROC OGLShaders::glGetProgramInfoLog = NULL;
++PFNGLUSEPROGRAMPROC OGLShaders::glUseProgram = NULL;
++PFNGLDELETEPROGRAMPROC OGLShaders::glDeleteProgram = NULL;
++PFNGLGETUNIFORMLOCATIONPROC OGLShaders::glGetUniformLocation = NULL;
++PFNGLUNIFORM1IPROC OGLShaders::glUniform1i = NULL;
++PFNGLUNIFORM1FPROC OGLShaders::glUniform1f = NULL;
++
++bool OGLShaders::Initialize()
++{
++ if( !cbInitialized ) {
++ glCreateShader = (PFNGLCREATESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCreateShader" );
++ glShaderSource = (PFNGLSHADERSOURCEPROC) unx::glXGetProcAddress( (unsigned char *) "glShaderSource" );
++ glCompileShader = (PFNGLCOMPILESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCompileShader" );
++ glGetShaderiv = (PFNGLGETSHADERIVPROC) unx::glXGetProcAddress( (unsigned char *) "glGetShaderiv" );
++ glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC) unx::glXGetProcAddress( (unsigned char *) "glGetShaderInfoLog" );
++ glDeleteShader = (PFNGLDELETESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glDeleteShader" );
++ glCreateProgram = (PFNGLCREATEPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glCreateProgram" );
++ glAttachShader = (PFNGLATTACHSHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glAttachShader" );
++ glLinkProgram = (PFNGLLINKPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glLinkProgram" );
++ glGetProgramiv = (PFNGLGETPROGRAMIVPROC) unx::glXGetProcAddress( (unsigned char *) "glGetProgramiv" );
++ glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC) unx::glXGetProcAddress( (unsigned char *) "glGetProgramInfoLog" );
++ glUseProgram = (PFNGLUSEPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glUseProgram" );
++ glDeleteProgram = (PFNGLDELETEPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glDeleteProgram" );
++ glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC) unx::glXGetProcAddress( (unsigned char *) "glGetUniformLocation" );
++ glUniform1i = (PFNGLUNIFORM1IPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1i" );
++ glUniform1f = (PFNGLUNIFORM1FPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1f" );
++
++ cbInitialized = true;
++ }
++
++ return glCreateShader != NULL;
++}
++
++GLuint OGLShaders::LinkProgram( const char *vertexShader, const char *fragmentShader )
++{
++#ifdef GL_VERSION_2_0
++ if( !Initialize() )
++ return 0;
++
++ GLhandleARB vertexObject, fragmentObject, programObject;
++ GLint vertexCompiled, fragmentCompiled, programLinked;
++ char log[1024];
++
++ vertexObject = glCreateShader( GL_VERTEX_SHADER );
++ fragmentObject = glCreateShader( GL_FRAGMENT_SHADER );
++ OSL_TRACE("checkpoint 1: shaders created (%d) vertex: %d fragment: %d", glGetError() == GL_NO_ERROR, vertexObject, fragmentObject );
++
++
++ glShaderSource( vertexObject, 1, &vertexShader, NULL );
++ glShaderSource( fragmentObject, 1, &fragmentShader, NULL );
++
++ glCompileShader( vertexObject );
++ glGetShaderInfoLog( vertexObject, sizeof( log ), NULL, log );
++ OSL_TRACE("vertex compile log: %s", log);
++ glGetShaderiv( vertexObject, GL_COMPILE_STATUS, &vertexCompiled );
++ glCompileShader( fragmentObject );
++ glGetShaderInfoLog( fragmentObject, sizeof( log ), NULL, log );
++ OSL_TRACE("fragment compile log: %s", log);
++ glGetShaderiv( fragmentObject, GL_COMPILE_STATUS, &fragmentCompiled );
++
++ if( !vertexCompiled || !fragmentCompiled )
++ return 0;
++
++ OSL_TRACE("checkpoint 2: shaders compiled (%d)", glGetError() == GL_NO_ERROR);
++
++ programObject = glCreateProgram();
++ glAttachShader( programObject, vertexObject );
++ glAttachShader( programObject, fragmentObject );
++
++ glLinkProgram( programObject );
++ glGetProgramInfoLog( programObject, sizeof( log ), NULL, log );
++ OSL_TRACE("program link log: %s", log);
++ glGetProgramiv( programObject, GL_LINK_STATUS, &programLinked );
++
++ if( !programLinked )
++ return 0;
++
++ OSL_TRACE("checkpoint 3: program linked (%d)", glGetError() == GL_NO_ERROR);
++
++ return programObject;
++#else
++ return 0;
++#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
+@@ -0,0 +1,40 @@
++#ifndef INCLUDED_OGLTRANS_SHADERS_HXX_
++#define INCLUDED_OGLTRANS_SHADERS_HXX_
++
++#include <GL/gl.h>
++#include <GL/glext.h>
++
++class OGLShaders {
++ static bool Initialize();
++ static bool cbInitialized;
++
++public:
++
++ static GLuint LinkProgram( const char *vertexShader, const char *fragmentShader );
++
++ /** GL shader functions
++ */
++#ifdef GL_VERSION_2_0
++
++ static PFNGLCREATESHADERPROC glCreateShader;
++ static PFNGLSHADERSOURCEPROC glShaderSource;
++ static PFNGLCOMPILESHADERPROC glCompileShader;
++ static PFNGLGETSHADERIVPROC glGetShaderiv;
++ static PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
++ static PFNGLDELETESHADERPROC glDeleteShader;
++
++ static PFNGLCREATEPROGRAMPROC glCreateProgram;
++ static PFNGLATTACHSHADERPROC glAttachShader;
++ static PFNGLLINKPROGRAMPROC glLinkProgram;
++ static PFNGLGETPROGRAMIVPROC glGetProgramiv;
++ static PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
++ static PFNGLUSEPROGRAMPROC glUseProgram;
++ static PFNGLDELETEPROGRAMPROC glDeleteProgram;
++
++ static PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
++ static PFNGLUNIFORM1IPROC glUniform1i;
++ static PFNGLUNIFORM1FPROC glUniform1f;
++#endif
++};
++
++#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
@@ -167,6 +167,11 @@ public:
static bool cbMesa;
};
@@ -24,9 +179,9 @@
void OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView )
{
// not thread safe
-diff -Nrup /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
---- /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx 2008-03-11 20:20:51.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx 2008-03-12 13:42:15.000000000 +0100
+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
@@ -32,10 +32,10 @@
* MA 02111-1307 USA
*
@@ -181,160 +336,3 @@
preparePermShader();
}
-diff -Nrup /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/OGLTrans_TransitionShaders.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionShaders.cxx
---- /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/OGLTrans_TransitionShaders.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx 2008-03-12 13:46:05.000000000 +0100
-@@ -0,0 +1,109 @@
-+#include <osl/diagnose.hxx>
-+
-+#include "OGLTrans_Shaders.hxx"
-+
-+namespace unx
-+{
-+#include <GL/glx.h>
-+#include <GL/glxext.h>
-+}
-+
-+namespace OGLShaders {
-+
-+bool cbInitialized = false;
-+
-+PFNGLCREATESHADERPROC glCreateShader = NULL;
-+PFNGLSHADERSOURCEPROC glShaderSource = NULL;
-+PFNGLCOMPILESHADERPROC glCompileShader = NULL;
-+PFNGLGETSHADERIVPROC glGetShaderiv = NULL;
-+PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog = NULL;
-+PFNGLDELETESHADERPROC glDeleteShader = NULL;
-+PFNGLCREATEPROGRAMPROC glCreateProgram = NULL;
-+PFNGLATTACHSHADERPROC glAttachShader = NULL;
-+PFNGLLINKPROGRAMPROC glLinkProgram = NULL;
-+PFNGLGETPROGRAMIVPROC glGetProgramiv = NULL;
-+PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog = NULL;
-+PFNGLUSEPROGRAMPROC glUseProgram = NULL;
-+PFNGLDELETEPROGRAMPROC glDeleteProgram = NULL;
-+PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation = NULL;
-+PFNGLUNIFORM1IPROC glUniform1i = NULL;
-+PFNGLUNIFORM1FPROC glUniform1f = NULL;
-+
-+bool Initialize()
-+{
-+ if( !cbInitialized ) {
-+ glCreateShader = (PFNGLCREATESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCreateShader" );
-+ glShaderSource = (PFNGLSHADERSOURCEPROC) unx::glXGetProcAddress( (unsigned char *) "glShaderSource" );
-+ glCompileShader = (PFNGLCOMPILESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCompileShader" );
-+ glGetShaderiv = (PFNGLGETSHADERIVPROC) unx::glXGetProcAddress( (unsigned char *) "glGetShaderiv" );
-+ glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC) unx::glXGetProcAddress( (unsigned char *) "glGetShaderInfoLog" );
-+ glDeleteShader = (PFNGLDELETESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glDeleteShader" );
-+ glCreateProgram = (PFNGLCREATEPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glCreateProgram" );
-+ glAttachShader = (PFNGLATTACHSHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glAttachShader" );
-+ glLinkProgram = (PFNGLLINKPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glLinkProgram" );
-+ glGetProgramiv = (PFNGLGETPROGRAMIVPROC) unx::glXGetProcAddress( (unsigned char *) "glGetProgramiv" );
-+ glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC) unx::glXGetProcAddress( (unsigned char *) "glGetProgramInfoLog" );
-+ glUseProgram = (PFNGLUSEPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glUseProgram" );
-+ glDeleteProgram = (PFNGLDELETEPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glDeleteProgram" );
-+ glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC) unx::glXGetProcAddress( (unsigned char *) "glGetUniformLocation" );
-+ glUniform1i = (PFNGLUNIFORM1IPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1i" );
-+ glUniform1f = (PFNGLUNIFORM1FPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1f" );
-+
-+ cbInitialized = true;
-+ }
-+
-+ return glCreateShader != NULL;
-+}
-+
-+GLuint LinkProgram( const char *vertexShader, const char *fragmentShader )
-+{
-+#ifdef GL_VERSION_2_0
-+ if( !Initialize() )
-+ return 0;
-+
-+ GLhandleARB vertexObject, fragmentObject, programObject;
-+ GLint vertexCompiled, fragmentCompiled, programLinked;
-+ char log[1024];
-+
-+ vertexObject = glCreateShader( GL_VERTEX_SHADER );
-+ fragmentObject = glCreateShader( GL_FRAGMENT_SHADER );
-+ OSL_TRACE("checkpoint 1: shaders created (%d) vertex: %d fragment: %d", glGetError() == GL_NO_ERROR, vertexObject, fragmentObject );
-+
-+
-+ glShaderSource( vertexObject, 1, &vertexShader, NULL );
-+ glShaderSource( fragmentObject, 1, &fragmentShader, NULL );
-+
-+ glCompileShader( vertexObject );
-+ glGetShaderInfoLog( vertexObject, sizeof( log ), NULL, log );
-+ OSL_TRACE("vertex compile log: %s", log);
-+ glGetShaderiv( vertexObject, GL_COMPILE_STATUS, &vertexCompiled );
-+ glCompileShader( fragmentObject );
-+ glGetShaderInfoLog( fragmentObject, sizeof( log ), NULL, log );
-+ OSL_TRACE("fragment compile log: %s", log);
-+ glGetShaderiv( fragmentObject, GL_COMPILE_STATUS, &fragmentCompiled );
-+
-+ if( !vertexCompiled || !fragmentCompiled )
-+ return 0;
-+
-+ OSL_TRACE("checkpoint 2: shaders compiled (%d)", glGetError() == GL_NO_ERROR);
-+
-+ programObject = glCreateProgram();
-+ glAttachShader( programObject, vertexObject );
-+ glAttachShader( programObject, fragmentObject );
-+
-+ glLinkProgram( programObject );
-+ glGetProgramInfoLog( programObject, sizeof( log ), NULL, log );
-+ OSL_TRACE("program link log: %s", log);
-+ glGetProgramiv( programObject, GL_LINK_STATUS, &programLinked );
-+
-+ if( !programLinked )
-+ return 0;
-+
-+ OSL_TRACE("checkpoint 3: program linked (%d)", glGetError() == GL_NO_ERROR);
-+
-+ return programObject;
-+#else
-+ return 0;
-+#endif
-+}
-+}
-diff -Nrup /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/OGLTrans_TransitionShaders.hxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionShaders.hxx
---- /net/rychlik/home/rodo/svn/ooo-build-1/build/ooh680-m9/slideshow/source/engine/OGLTrans/OGLTrans_TransitionShaders.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx 2008-03-12 13:46:17.000000000 +0100
-@@ -0,0 +1,40 @@
-+#ifndef INCLUDED_OGLTRANS_SHADERS_HXX_
-+#define INCLUDED_OGLTRANS_SHADERS_HXX_
-+
-+#include <GL/gl.h>
-+#include <GL/glext.h>
-+
-+class OGLShaders {
-+ static bool Initialize();
-+ static bool cbInitialized;
-+
-+public:
-+
-+ static GLuint LinkProgram( const char *vertexShader, const char *fragmentShader );
-+
-+ /** GL shader functions
-+ */
-+#ifdef GL_VERSION_2_0
-+
-+ static PFNGLCREATESHADERPROC glCreateShader;
-+ static PFNGLSHADERSOURCEPROC glShaderSource;
-+ static PFNGLCOMPILESHADERPROC glCompileShader;
-+ static PFNGLGETSHADERIVPROC glGetShaderiv;
-+ static PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
-+ static PFNGLDELETESHADERPROC glDeleteShader;
-+
-+ static PFNGLCREATEPROGRAMPROC glCreateProgram;
-+ static PFNGLATTACHSHADERPROC glAttachShader;
-+ static PFNGLLINKPROGRAMPROC glLinkProgram;
-+ static PFNGLGETPROGRAMIVPROC glGetProgramiv;
-+ static PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
-+ static PFNGLUSEPROGRAMPROC glUseProgram;
-+ static PFNGLDELETEPROGRAMPROC glDeleteProgram;
-+
-+ static PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
-+ static PFNGLUNIFORM1IPROC glUniform1i;
-+ static PFNGLUNIFORM1FPROC glUniform1f;
-+#endif
-+};
-+
-+#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]