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/opengl/GLJavaMethodBindingEmitter.java    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/java/com/sun/gluegen/opengl/GLJavaMethodBindingEmitter.java')

diff --git a/src/java/com/sun/gluegen/opengl/GLJavaMethodBindingEmitter.java b/src/java/com/sun/gluegen/opengl/GLJavaMethodBindingEmitter.java
index b952272..5e8bada 100755
--- a/src/java/com/sun/gluegen/opengl/GLJavaMethodBindingEmitter.java
+++ b/src/java/com/sun/gluegen/opengl/GLJavaMethodBindingEmitter.java
@@ -109,12 +109,21 @@ public class GLJavaMethodBindingEmitter extends ProcAddressJavaMethodBindingEmit
   {
     protected void emitBindingCSignature(MethodBinding binding, PrintWriter writer) {      
       super.emitBindingCSignature(binding, writer);
-      String extensionName = glEmitter.getGLConfig().getExtension(binding.getCSymbol().getName());
-      if(null!=extensionName) {
-          writer.print("<br>Part of <code>"+extensionName+"</code>");
-      } else {
-          writer.print("<br>Part of <code>unknown extension</code>");
+
+      String symbolRenamed = binding.getName();
+      StringBuffer newComment = new StringBuffer();
+      newComment.append("Part of <code>");
+      if(0==glEmitter.addExtensionsOfSymbols2Buffer(newComment, ", ", symbolRenamed, binding.getAliasedNames())) {
+          StringBuffer sb = new StringBuffer();
+          JavaEmitter.addStrings2Buffer(sb, ", ", symbolRenamed, binding.getAliasedNames());
+          RuntimeException ex = new RuntimeException("Couldn't find extension to: "+binding+" ; "+sb.toString());
+          ex.printStackTrace();
+          glEmitter.getGLConfig().getGLInfo().dump();
+          // glEmitter.getGLConfig().dumpRenames();
+          throw ex;
       }
+      newComment.append("</code>");
+      writer.print(newComment.toString());
     }
   }
 }
-- 
cgit v1.2.3