From aac675e3ae8be73d3e498cc8f1062a20839f8482 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 5 Aug 2009 07:31:49 -0700
Subject: Cleanup for a better OpenGL 3.2 integration, for subsuming
 extensions:     - Allow RenameExtensionIntoCore generate duplicate names,    
   ie those will not be generated.     - Add proper comment showing the
 extension of the symbol.     - Fail if no 'GLHeader' is specified, but we are
 processing a GL/ProcAddress config     - Fail if a GL function is not part of
 an extension

MethodBinding, ConstantDefinition cleanup:
    - getName() returns the renamed name
    - getOrigName() returns the original
    - getAliasedNames() returns the aliased ones

MethodBinding:
    - Change: equals() operates on renamed name
    - Add: hashCode() function - same criteria as equals()

Impact:
    - All config options etc shall trigger with the renamed name,
      but ignore, rename etc.
    - Generated Java impl. uses the renamed base name as well

Change: emitDefine() uses the ConstantDefinition

Add: JavaConfiguration: dumpRenames()

Change JavaConfiguration.shouldIgnoreInInterface/Impl():
    - respect the renamed symbol name as well

Change JavaEmitter.emitFunctions():
    - only emit a generated MethodBinding once,
      therefor store emitted method bindings in a HashSet

Fix BuildStaticGLInfo:
    - Allow white space at the end of #ifndef and #define
    - Trim strings
    - Allow 'const' qualifier in function pattern

Fix GLEmitter:
    - Fail if no 'GLHeader' is specified, but a RenameIntoCore option ..
    - Don't emit marker defines, marking an extension (ie not part of an extension)

Fix GLJavaMethodBindingEmitter:
    - Fail if a GL function is not part of an extension

Fix PCPP:
    - Pass constant type qualifiers for hex-constants: 'l' 'L' ...

Fix ProcAddressEmitter:
    - Operate on the aliased/renamed name for querying ProcAddress usage
      and generating code.
---
 .../gluegen/procaddress/ProcAddressEmitter.java    | 27 +++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java')

diff --git a/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java b/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java
index 8f849ac..871dc5e 100755
--- a/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java
+++ b/src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java
@@ -102,23 +102,21 @@ public class ProcAddressEmitter extends JavaEmitter
     return new ProcAddressConfiguration();
   }
 
-  protected List generateMethodBindingEmitters(FunctionSymbol sym) throws Exception
-  {
-    return generateMethodBindingEmittersImpl(sym);
+  protected List generateMethodBindingEmitters(HashSet/*<MethodBinding>*/ methodBindingSet, FunctionSymbol sym) throws Exception {
+    return generateMethodBindingEmittersImpl(methodBindingSet, sym);
   }
 
   protected boolean needsModifiedEmitters(FunctionSymbol sym) {
     if (!needsProcAddressWrapper(sym) ||
-        getConfig().isUnimplemented(sym.getName())) {
+        getConfig().isUnimplemented(getAliasedSymName(sym))) {
       return false;
     }
 
     return true;
   }
 
-  private List generateMethodBindingEmittersImpl(FunctionSymbol sym) throws Exception
-  {
-    List defaultEmitters = super.generateMethodBindingEmitters(sym);
+  private List generateMethodBindingEmittersImpl(HashSet/*<MethodBinding>*/ methodBindingSet, FunctionSymbol sym) throws Exception {
+    List defaultEmitters = super.generateMethodBindingEmitters(methodBindingSet, sym);
 
     // if the superclass didn't generate any bindings for the symbol, let's
     // honor that (for example, the superclass might have caught an Ignore
@@ -140,7 +138,7 @@ public class ProcAddressEmitter extends JavaEmitter
     if (needsProcAddressWrapper(sym)) {
       if (getProcAddressConfig().emitProcAddressTable()) {
         // emit an entry in the GL proc address table for this method.
-        emitProcAddressTableEntryForSymbol(sym);
+        emitProcAddressTableEntryForString(getAliasedSymName(sym));
       }
     }
     
@@ -254,9 +252,15 @@ public class ProcAddressEmitter extends JavaEmitter
     emitters.add(res);
   }
     
+  private String getAliasedSymName(FunctionSymbol sym) {
+    String symName = getConfig().getJavaSymbolRename(sym.getName());
+    if(null==symName) symName=sym.getName();
+    return symName;
+  }
+
   protected boolean needsProcAddressWrapper(FunctionSymbol sym)
   {
-    String symName =  sym.getName();
+    String symName = getAliasedSymName(sym);
 
     ProcAddressConfiguration config = getProcAddressConfig();
 
@@ -378,11 +382,6 @@ public class ProcAddressEmitter extends JavaEmitter
     w.close();
   }
 
-  protected void emitProcAddressTableEntryForSymbol(FunctionSymbol cFunc)
-  {
-    emitProcAddressTableEntryForString(cFunc.getName());
-  }
-
   protected void emitProcAddressTableEntryForString(String str)
   {
     // Deal gracefully with forced proc address generation in the face
-- 
cgit v1.2.3