Added pbuffer support to JOGL on X11; HWShadowmapsSimple and

ProceduralTexturePhysics demos are now working on Linux with the
appropriate hardware. Moved core GLX routines out of the public GLX
interface; this allowed XVisualInfo (and the new GLXFBConfig) to be
removed from the public API. Added support to GlueGen for returning
arrays of pointers as arrays of StructAccessors in Java and for
choosing the typedef name for a pointer-to-struct if the struct itself
does not have a typedef name. Added support to GLEmitter to emit
ProcAddressTables under arbitrary names and to support arbitrary
mechanisms for fetching those tables. Made GLU (on all platforms) and
GLX (on X11) be dynamically linked. Refactored ProcAddressTable
filling to be mostly shared code. Tested changes on Linux, Mac OS X
and Windows.


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

1 files changed, 7 insertions, 4 deletions

diff --git a/src/net/java/games/gluegen/opengl/JavaGLPAWrapperEmitter.java b/src/net/java/games/gluegen/opengl/JavaGLPAWrapperEmitter.java
index e0a098f2a..c3b17f6cb 100644
--- a/src/net/java/games/gluegen/opengl/JavaGLPAWrapperEmitter.java
+++ b/src/net/java/games/gluegen/opengl/JavaGLPAWrapperEmitter.java
@@ -50,10 +50,12 @@ public class JavaGLPAWrapperEmitter extends JavaMethodBindingImplEmitter
     new WrappedMethodCommentEmitter();
 
   private JavaMethodBindingEmitter emitterBeingWrapped;
+  private String getProcAddressTableExpr;
   
-  public JavaGLPAWrapperEmitter(JavaMethodBindingEmitter methodToWrap)
+  public JavaGLPAWrapperEmitter(JavaMethodBindingEmitter methodToWrap, String getProcAddressTableExpr)
   {    
     super(methodToWrap.getBinding(), methodToWrap.getDefaultOutput(), methodToWrap.getRuntimeExceptionType());
+    this.getProcAddressTableExpr = getProcAddressTableExpr;
 
     if (methodToWrap.getBinding().hasContainingType())
     {
@@ -119,6 +121,9 @@ public class JavaGLPAWrapperEmitter extends JavaMethodBindingImplEmitter
 
     // Now make our binding use the original access of the wrapped method
     this.addModifier(origAccess);
+    if (emitterBeingWrapped.hasModifier(STATIC)) {
+      this.addModifier(STATIC);
+    }
   }
 
   protected boolean needsBody() {
@@ -152,9 +157,7 @@ public class JavaGLPAWrapperEmitter extends JavaMethodBindingImplEmitter
     String procAddressVariable =
       GLEmitter.PROCADDRESS_VAR_PREFIX + wrappedBinding.getName();
 
-    writer.print("    final long addr = context.getGLProcAddressTable().");
-    writer.print(procAddressVariable);    
-    writer.println(';');    
+    writer.println("    final long addr = " + getProcAddressTableExpr + "." + procAddressVariable + ";");
     writer.println("    if (addr == 0) {");
     writer.println("      throw new GLException(\"Method \\\"" + binding.getName() + "\\\" not available\");");
     writer.println("    }");