Changed NativeLibrary.open() to accept boolean argument indicating

whether to search the system path first; perhaps useful if
applications ship only a backup version of native libraries associated
with a particular Java binding. In the case of JOAL we plan to ship a
recent OpenAL implementation so we will not need to search the system
path first. Changed ForceProcAddressGen directive to force
call-through-function-pointer semantics for the targeted function.
Changed JOAL to not link directly against the OpenAL library at all,
but instead to look up all entry points using the GlueGen
NativeLibrary class (instead of the custom dlsym code, now removed) in
particular to solve DSO versioning problems on Linux. Updated EAX
binding to work with dynamically loading OpenAL. Tested on Windows so
far; more testing needed on Linux in Java Web Start scenarios.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@42 a78bb65f-1512-4460-ba86-f6dc96a7bf27

1 files changed, 16 insertions, 1 deletions

diff --git a/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java b/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java
index 75fb59c..19d4fe3 100755
--- a/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java
+++ b/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java
@@ -58,6 +58,7 @@ public class ProcAddressEmitter extends JavaEmitter
   protected static final String WRAP_PREFIX = "dispatch_";
   private TypeDictionary typedefDictionary;
   private PrintWriter tableWriter;
+  private Set emittedTableEntries;
   private String tableClassPackage;
   private String tableClassName;
 
@@ -219,6 +220,7 @@ public class ProcAddressEmitter extends JavaEmitter
   {    
     // See whether we need a proc address entry for this one
     boolean callThroughProcAddress = needsProcAddressWrapper(baseCEmitter.getBinding().getCSymbol());
+    boolean forceProcAddress       = getProcAddressConfig().forceProcAddressGen(baseCEmitter.getBinding().getCSymbol().getName());
     // Note that we don't care much about the naming of the C argument
     // variables so to keep things simple we ignore the buffer object
     // property for the binding
@@ -226,7 +228,10 @@ public class ProcAddressEmitter extends JavaEmitter
     // The C-side JNI binding for this particular function will have an
     // extra final argument, which is the address (the OpenGL procedure
     // address) of the function it needs to call
-    ProcAddressCMethodBindingEmitter res = new ProcAddressCMethodBindingEmitter(baseCEmitter, callThroughProcAddress, this);
+    ProcAddressCMethodBindingEmitter res = new ProcAddressCMethodBindingEmitter(baseCEmitter,
+                                                                                callThroughProcAddress,
+                                                                                forceProcAddress,
+                                                                                this);
     MessageFormat exp = baseCEmitter.getReturnValueCapacityExpression();
     if (exp != null) {
       res.setReturnValueCapacityExpression(exp);
@@ -250,6 +255,10 @@ public class ProcAddressEmitter extends JavaEmitter
       shouldWrap = false;
     }
     
+    if (config.forceProcAddressGen(symName)) {
+      shouldWrap = true;
+    }
+    
     if (shouldWrap)
     {
       // Hoist argument names from function pointer if not supplied in prototype
@@ -281,6 +290,7 @@ public class ProcAddressEmitter extends JavaEmitter
       CodeGenUtils.packageAsPath(implPackageName);
 
     tableWriter = openFile(jImplRoot + File.separator + tableClassName + ".java");
+    emittedTableEntries = new HashSet();
 
     CodeGenUtils.emitAutogeneratedWarning(tableWriter, this);
     
@@ -358,6 +368,11 @@ public class ProcAddressEmitter extends JavaEmitter
 
   protected void emitProcAddressTableEntryForString(String str)
   {
+    // Deal gracefully with forced proc address generation in the face
+    // of having the function pointer typedef in the header file too
+    if (emittedTableEntries.contains(str))
+      return;
+    emittedTableEntries.add(str);
     tableWriter.print("  public long ");
     tableWriter.print(PROCADDRESS_VAR_PREFIX);
     tableWriter.print(str);