Refactored glue code generation for APIs requiring run-time lookup of

individual function pointers into generic ProcAddressEmitter. Removed
all OpenGL-specific routines and names from this emitter. The new
ProcAddressConfiguration is more generic than the GLConfiguration and
supports mostly-arbitrary mappings from function names to function
pointer typedefs via the new ProcAddressNameExpr directive. Refactored
GLEmitter into thin layer on top of this ProcAddressEmitter providing
only ignoring of extensions and checking for buffer object variants of
functions. Made GLConfiguration a stand-alone class. Deleted
ContextVariableName directive in favor of more generic
GetProcAddressTableExpr command. Moved resetting of generated
ProcAddressTables into GlueGen runtime class ProcAddressHelper; user
provides the dynamic lookup function (dlsym, etc.) through new
DynamicLookupHelper interface. Fixed bug in generation of Java
epilogues for routines returning primitive values. Fixed bugs in
AccessControl directive, in particular when generating interfaces.
Made small changes to autogenerated comments for routines called
through function pointers.

These changes do not impact the public API of JOGL -- this has been
verified by examining diffs between the current and new autogenerated
code. They do make the GlueGen tool more generic and allow it to be
easily applied to the task of autogenerating the JOAL API and
implementation as well. Also verified by running JOGL demos and JOAL
demos in new JOAL workspace.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@500 232f8b59-042b-4e1e-8c03-345bb8c30851

7 files changed, 7 insertions, 7 deletions

diff --git a/make/cglext.cfg b/make/cglext.cfg
index 74e7ac841..0d1ae1dcc 100755
--- a/make/cglext.cfg
+++ b/make/cglext.cfg
@@ -12,7 +12,7 @@ Include gl-common-macosx.cfg
 
 EmitProcAddressTable true
 ProcAddressTableClassName CGLExtProcAddressTable
-ContextVariableName _context
+GetProcAddressTableExpr _context.getCGLExtProcAddressTable()
 
 # Ignore everything that doesn't start with cgl or CGL
 IgnoreNot ^(cgl|CGL).+
diff --git a/make/gl-macosx.cfg b/make/gl-macosx.cfg
index 156f66b77..106b90471 100644
--- a/make/gl-macosx.cfg
+++ b/make/gl-macosx.cfg
@@ -8,7 +8,7 @@ Include gl-common-macosx.cfg
 
 EmitProcAddressTable true
 ProcAddressTableClassName GLProcAddressTable
-ContextVariableName _context
+GetProcAddressTableExpr _context.getGLProcAddressTable()
 
 CustomCCode #include <inttypes.h>
 CustomCCode #include <stdlib.h>
diff --git a/make/gl-win32.cfg b/make/gl-win32.cfg
index 950d67320..978b624c1 100644
--- a/make/gl-win32.cfg
+++ b/make/gl-win32.cfg
@@ -8,7 +8,7 @@ Include gl-common-win32.cfg
 
 EmitProcAddressTable true
 ProcAddressTableClassName GLProcAddressTable
-ContextVariableName _context
+GetProcAddressTableExpr _context.getGLProcAddressTable()
 
 CustomCCode #define WIN32_LEAN_AND_MEAN
 CustomCCode #include <windows.h>
diff --git a/make/gl-x11.cfg b/make/gl-x11.cfg
index fd793c5b9..f67e301cc 100644
--- a/make/gl-x11.cfg
+++ b/make/gl-x11.cfg
@@ -8,7 +8,7 @@ Include gl-common-x11.cfg
 
 EmitProcAddressTable true
 ProcAddressTableClassName GLProcAddressTable
-ContextVariableName _context
+GetProcAddressTableExpr _context.getGLProcAddressTable()
 
 CustomCCode #include <inttypes.h>
 CustomCCode #include <stdlib.h>
diff --git a/make/glu-CustomJavaCode.java b/make/glu-CustomJavaCode.java
index e5fac91e6..56a3fc0c4 100644
--- a/make/glu-CustomJavaCode.java
+++ b/make/glu-CustomJavaCode.java
@@ -1436,7 +1436,7 @@ private static GLUProcAddressTable gluProcAddressTable;
 private static GLUProcAddressTable getGLUProcAddressTable() {
   if (gluProcAddressTable == null) {
     GLUProcAddressTable tmp = new GLUProcAddressTable();
-    GLDrawableFactoryImpl.getFactoryImpl().resetProcAddressTable(tmp);
+    ProcAddressHelper.resetProcAddressTable(tmp, GLDrawableFactoryImpl.getFactoryImpl());
     gluProcAddressTable = tmp;
   }
   return gluProcAddressTable;
diff --git a/make/glxext.cfg b/make/glxext.cfg
index b3186a254..88e6ba63d 100755
--- a/make/glxext.cfg
+++ b/make/glxext.cfg
@@ -9,7 +9,7 @@ Include gl-common-x11.cfg
 
 EmitProcAddressTable true
 ProcAddressTableClassName GLXExtProcAddressTable
-ContextVariableName _context
+GetProcAddressTableExpr _context.getGLXExtProcAddressTable()
 
 # Ignore everything that doesn't start with glX or GLX
 IgnoreNot ^(glX|GLX).+
diff --git a/make/wglext.cfg b/make/wglext.cfg
index bc27252a5..5c7537481 100644
--- a/make/wglext.cfg
+++ b/make/wglext.cfg
@@ -9,7 +9,7 @@ Include gl-common-win32.cfg
 
 EmitProcAddressTable true
 ProcAddressTableClassName WGLExtProcAddressTable
-ContextVariableName _context
+GetProcAddressTableExpr _context.getWGLExtProcAddressTable()
 
 # Ignore everything that doesn't start with wgl or WGL
 Ignore ^[^wW].+