From ae26bd0aac4a98c26aceb95584988defae970dde 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.
---
 src/java/com/sun/gluegen/opengl/GLConfiguration.java | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

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

diff --git a/src/java/com/sun/gluegen/opengl/GLConfiguration.java b/src/java/com/sun/gluegen/opengl/GLConfiguration.java
index 923dcf52d..4e8c0c369 100755
--- a/src/java/com/sun/gluegen/opengl/GLConfiguration.java
+++ b/src/java/com/sun/gluegen/opengl/GLConfiguration.java
@@ -202,13 +202,6 @@ public class GLConfiguration extends ProcAddressConfiguration {
     super.dumpIgnores();
   }
 
-  protected String getExtension(String symbol) {
-    if (glInfo != null) {
-        return glInfo.getExtension(symbol);
-    }
-    return null;
-  }
-
   protected boolean shouldIgnoreExtension(String symbol, boolean criteria) {
     if (criteria && glInfo != null) {
       String extension = glInfo.getExtension(symbol);
@@ -216,14 +209,14 @@ public class GLConfiguration extends ProcAddressConfiguration {
           ignoredExtensions.contains(extension)) {
           return true;
       }
-      boolean isGLFunc = GLExtensionNames.isGLFunction(symbol);
       boolean isGLEnum = GLExtensionNames.isGLEnumeration(symbol);
+      boolean isGLFunc = GLExtensionNames.isGLFunction(symbol);
       if(isGLFunc || isGLEnum) {
         if(GLExtensionNames.isExtensionVEN(symbol, isGLFunc)) {
           String extSuffix = GLExtensionNames.getExtensionSuffix(symbol, isGLFunc);
           if( getDropUniqVendorExtensions(extSuffix) ) {
             if(DEBUG_IGNORES) {
-              System.err.println("Ignore UniqVendorEXT: "+symbol);
+              System.err.println("Ignore UniqVendorEXT: "+symbol+", vendor "+extSuffix);
             }
             return true;
           }
-- 
cgit v1.2.3