From 24fcece997ba911b0270033a357bbd83258d4f1a Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 16 Mar 2009 14:38:27 +0000 Subject: JOGL refactoring: Refactored JOGL into 3 independent components. 1 NWI - Native windowing interface Abstracts the the general NativeWindow interface and it's factory, incl the basic JAWT and Xlib toolkit. The latter was motivated to clean up the JOGL workspace, and to allow other to reuse this part. The generic core is nwi.core.jar, the AWT add-on is nwi.awt.jar. 2 JOGL - The OpenGL mapping Further cleanup of the SPEC. All non OpenGL toolkits are relocated to NWI and NEWT. There is still openmax and the windows audio layer .. Another cleanup of the fixed function pipeline emulation. Moved utilities and implementations where they belong .. Removed GLUnsupportedException. Misc .. changes 3 NEWT - The new windowing toolkit The generic NEWT, newt.core.jar. The JOGL and AWT modules are seperate, newt.ogl.jar newt.awt.jar. Their build can be switched off. The modules source and builds resides in their own directory. Because of their nature, they share the stub_includes, etc. Each module has it's own ant build script - build-nwi.xml - build-jogl.xml - build-newt.xml They can be build at once using build.xml as ususal, which just invokes the seperate build tasks. if rootrel.build=build, then the build location is jogl/build-nwi jogl/build-jogl jogl/build-newt and the sources are under jogl/src/nwi jogl/src/jogl jogl/src/newt Tested: jogl-demos, d4; Linux, MacOsX; Nvidia git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1868 232f8b59-042b-4e1e-8c03-345bb8c30851 --- make/stub_includes/common/cg.c | 26 -------------------------- make/stub_includes/common/gl.c | 7 ------- make/stub_includes/common/gles1.c | 9 --------- make/stub_includes/common/gles2.c | 8 -------- make/stub_includes/common/glu-impl.c | 3 --- make/stub_includes/common/glu.c | 2 -- make/stub_includes/opengl/cg.c | 26 ++++++++++++++++++++++++++ make/stub_includes/opengl/gl.c | 7 +++++++ make/stub_includes/opengl/gles1.c | 9 +++++++++ make/stub_includes/opengl/gles2.c | 8 ++++++++ make/stub_includes/opengl/glu-impl.c | 3 +++ make/stub_includes/opengl/glu.c | 2 ++ 12 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 make/stub_includes/common/cg.c delete mode 100644 make/stub_includes/common/gl.c delete mode 100755 make/stub_includes/common/gles1.c delete mode 100755 make/stub_includes/common/gles2.c delete mode 100644 make/stub_includes/common/glu-impl.c delete mode 100644 make/stub_includes/common/glu.c create mode 100644 make/stub_includes/opengl/cg.c create mode 100644 make/stub_includes/opengl/gl.c create mode 100755 make/stub_includes/opengl/gles1.c create mode 100755 make/stub_includes/opengl/gles2.c create mode 100644 make/stub_includes/opengl/glu-impl.c create mode 100644 make/stub_includes/opengl/glu.c (limited to 'make/stub_includes') diff --git a/make/stub_includes/common/cg.c b/make/stub_includes/common/cg.c deleted file mode 100644 index 98c824285..000000000 --- a/make/stub_includes/common/cg.c +++ /dev/null @@ -1,26 +0,0 @@ -// Define __gl_h_ so that GL/gl.h doesn't get bound as part of CgGL.java -// because cgGL.h tries to include it -#define __gl_h_ - -// Define some types so that cgGL.h has the types it expected to get by -// including GL/gl.h (which we disabled above) -typedef unsigned int GLenum; -typedef unsigned char GLboolean; -typedef unsigned int GLbitfield; -typedef void GLvoid; -typedef signed char GLbyte; /* 1-byte signed */ -typedef short GLshort; /* 2-byte signed */ -typedef int GLint; /* 4-byte signed */ -typedef unsigned char GLubyte; /* 1-byte unsigned */ -typedef unsigned short GLushort; /* 2-byte unsigned */ -typedef unsigned int GLuint; /* 4-byte unsigned */ -typedef int GLsizei; /* 4-byte signed */ -typedef float GLfloat; /* single precision float */ -typedef float GLclampf; /* single precision float in [0,1] */ -typedef double GLdouble; /* double precision float */ -typedef double GLclampd; /* double precision float in [0,1] */ - -#define CGDLL_API -#include - - diff --git a/make/stub_includes/common/gl.c b/make/stub_includes/common/gl.c deleted file mode 100644 index e91ee95f3..000000000 --- a/make/stub_includes/common/gl.c +++ /dev/null @@ -1,7 +0,0 @@ -#define GLAPI - -// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in -// "glext.h" are parsed. -#define GL_GLEXT_PROTOTYPES - -#include diff --git a/make/stub_includes/common/gles1.c b/make/stub_includes/common/gles1.c deleted file mode 100755 index 63df1c967..000000000 --- a/make/stub_includes/common/gles1.c +++ /dev/null @@ -1,9 +0,0 @@ -#define GLAPI -#define GL_APICALL - -// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in -// "glext.h" are parsed. -#define GL_GLEXT_PROTOTYPES - -#include -#include diff --git a/make/stub_includes/common/gles2.c b/make/stub_includes/common/gles2.c deleted file mode 100755 index f74b1686f..000000000 --- a/make/stub_includes/common/gles2.c +++ /dev/null @@ -1,8 +0,0 @@ -#define GL_APIENTRY -#define GL_APICALL - -// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in -// "glext.h" are parsed. -#define GL_GLEXT_PROTOTYPES - -#include diff --git a/make/stub_includes/common/glu-impl.c b/make/stub_includes/common/glu-impl.c deleted file mode 100644 index 2328639d8..000000000 --- a/make/stub_includes/common/glu-impl.c +++ /dev/null @@ -1,3 +0,0 @@ -#include - - diff --git a/make/stub_includes/common/glu.c b/make/stub_includes/common/glu.c deleted file mode 100644 index 91020e365..000000000 --- a/make/stub_includes/common/glu.c +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/make/stub_includes/opengl/cg.c b/make/stub_includes/opengl/cg.c new file mode 100644 index 000000000..98c824285 --- /dev/null +++ b/make/stub_includes/opengl/cg.c @@ -0,0 +1,26 @@ +// Define __gl_h_ so that GL/gl.h doesn't get bound as part of CgGL.java +// because cgGL.h tries to include it +#define __gl_h_ + +// Define some types so that cgGL.h has the types it expected to get by +// including GL/gl.h (which we disabled above) +typedef unsigned int GLenum; +typedef unsigned char GLboolean; +typedef unsigned int GLbitfield; +typedef void GLvoid; +typedef signed char GLbyte; /* 1-byte signed */ +typedef short GLshort; /* 2-byte signed */ +typedef int GLint; /* 4-byte signed */ +typedef unsigned char GLubyte; /* 1-byte unsigned */ +typedef unsigned short GLushort; /* 2-byte unsigned */ +typedef unsigned int GLuint; /* 4-byte unsigned */ +typedef int GLsizei; /* 4-byte signed */ +typedef float GLfloat; /* single precision float */ +typedef float GLclampf; /* single precision float in [0,1] */ +typedef double GLdouble; /* double precision float */ +typedef double GLclampd; /* double precision float in [0,1] */ + +#define CGDLL_API +#include + + diff --git a/make/stub_includes/opengl/gl.c b/make/stub_includes/opengl/gl.c new file mode 100644 index 000000000..e91ee95f3 --- /dev/null +++ b/make/stub_includes/opengl/gl.c @@ -0,0 +1,7 @@ +#define GLAPI + +// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in +// "glext.h" are parsed. +#define GL_GLEXT_PROTOTYPES + +#include diff --git a/make/stub_includes/opengl/gles1.c b/make/stub_includes/opengl/gles1.c new file mode 100755 index 000000000..63df1c967 --- /dev/null +++ b/make/stub_includes/opengl/gles1.c @@ -0,0 +1,9 @@ +#define GLAPI +#define GL_APICALL + +// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in +// "glext.h" are parsed. +#define GL_GLEXT_PROTOTYPES + +#include +#include diff --git a/make/stub_includes/opengl/gles2.c b/make/stub_includes/opengl/gles2.c new file mode 100755 index 000000000..f74b1686f --- /dev/null +++ b/make/stub_includes/opengl/gles2.c @@ -0,0 +1,8 @@ +#define GL_APIENTRY +#define GL_APICALL + +// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in +// "glext.h" are parsed. +#define GL_GLEXT_PROTOTYPES + +#include diff --git a/make/stub_includes/opengl/glu-impl.c b/make/stub_includes/opengl/glu-impl.c new file mode 100644 index 000000000..2328639d8 --- /dev/null +++ b/make/stub_includes/opengl/glu-impl.c @@ -0,0 +1,3 @@ +#include + + diff --git a/make/stub_includes/opengl/glu.c b/make/stub_includes/opengl/glu.c new file mode 100644 index 000000000..91020e365 --- /dev/null +++ b/make/stub_includes/opengl/glu.c @@ -0,0 +1,2 @@ +#include + -- cgit v1.2.3