Refactored ProcAddressTable generation.

 - ProcAddressTable is now the common superclass for all tables
 - Removed ProcAddressHelpers and added FunctionAddressResolver extension mechanism

2 files changed, 61 insertions, 109 deletions

diff --git a/src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressHelper.java b/src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressHelper.java
deleted file mode 100644
index 2031d9e..0000000
--- a/src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressHelper.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- */
-
-package com.jogamp.gluegen.runtime.opengl;
-
-import com.jogamp.common.os.DynamicLookupHelper;
-import com.jogamp.gluegen.runtime.*;
-
-// Debugging only
-import java.io.PrintStream;
-
-/** Helper class containing constants and methods to assist with the
-    manipulation of auto-generated ProcAddressTables. */
-
-public class GLProcAddressHelper extends ProcAddressHelper {
-
-  public static void resetProcAddressTable(Object table,
-                                           DynamicLookupHelper lookup) throws RuntimeException {
-    Class tableClass = table.getClass();
-    java.lang.reflect.Field[] fields = tableClass.getFields();
-    PrintStream dout = getDebugOutStream();
-    
-    if (DEBUG) {
-      dout.println("ProcAddressHelper.resetProcAddressTable(" + table.getClass().getName() + ")");
-    }
-    for (int i = 0; i < fields.length; ++i) {
-      String addressFieldName = fields[i].getName();
-      if (!addressFieldName.startsWith(ProcAddressHelper.PROCADDRESS_VAR_PREFIX)) {
-        // not a proc address variable
-        continue;
-      }
-      int startOfMethodName = ProcAddressHelper.PROCADDRESS_VAR_PREFIX.length();
-      String funcNameBase = addressFieldName.substring(startOfMethodName);
-      java.lang.reflect.Field addressField;
-      try {
-        addressField = fields[i];
-        assert(addressField.getType() == Long.TYPE);
-      } catch (Exception e) {
-        throw new RuntimeException("Can not get proper proc address field for method \"" +
-                                   funcNameBase + "\": Couldn't get field \"" + addressFieldName +
-                                   "\" in class " + tableClass.getName(), e);
-      }
-      long newProcAddress = 0;
-      int  funcNamePermNum = GLExtensionNames.getFuncNamePermutationNumber(funcNameBase);
-      String funcName = null;
-      for(int j = 0; 0==newProcAddress && j < funcNamePermNum; j++) {
-          funcName = GLExtensionNames.getFuncNamePermutation(funcNameBase, j);
-          try {
-            newProcAddress = lookup.dynamicLookupFunction(funcName);
-          } catch (Exception e) { 
-            if (DEBUG) {
-              dout.println(e);
-              e.printStackTrace();
-            }
-          }
-      } 
-      try {
-        // set the current value of the proc address variable in the table object
-        addressField.setLong(table, newProcAddress); 
-        if (DEBUG) {
-          dout.println("  " + addressField.getName() + " "+funcName+" -> 0x" + Long.toHexString(newProcAddress));
-        }
-      } catch (Exception e) {
-        throw new RuntimeException("Can not set proc address field for method \"" +
-                                   funcNameBase + "\": Couldn't set field \"" + addressFieldName +
-                                   "\" in class " + tableClass.getName(), e);
-      }
-    }
-    if (DEBUG) {
-      dout.flush();
-      if (DEBUG_PREFIX != null) {
-        dout.close();
-      }
-    }
-  }
-}
diff --git a/src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java b/src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java
new file mode 100644
index 0000000..ebe4d26
--- /dev/null
+++ b/src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2010, Michael Bien
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of JogAmp nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Michael Bien BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Created on Saturday, April 24 2010 16:44
+ */
+package com.jogamp.gluegen.runtime.opengl;
+
+import com.jogamp.common.os.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.FunctionAddressResolver;
+
+/**
+ * @author Sven Gothel
+ * @author Michael Bien
+ */
+public class GLProcAddressResolver implements FunctionAddressResolver {
+
+
+    public long resolve(String name, DynamicLookupHelper lookup) {
+
+        int permutations = GLExtensionNames.getFuncNamePermutationNumber(name);
+
+        for (int i = 0; i < permutations; i++) {
+            String funcName = GLExtensionNames.getFuncNamePermutation(name, i);
+            try {
+                return lookup.dynamicLookupFunction(funcName);
+            } catch (Exception e) {
+//                if (DEBUG) {
+//                    dout.println(e);
+//                    e.printStackTrace();
+//                }
+            }
+        }
+
+        throw new RuntimeException("unresolveable function name: "+name);
+    }
+}