From ad50cb0572d410a04c09f362befdd7b824364940 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 11 Mar 2015 08:58:36 +0100
Subject: Bug 1144: Adapt to GlueGen commit
 405512e1c8a2e24834b0d057f0b020b4a0f4c25b

---
 .../classes/com/jogamp/gluegen/opengl/GLEmitter.java   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java')

diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
index 388f06150..c0a527ad7 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
@@ -257,6 +257,20 @@ public class GLEmitter extends ProcAddressEmitter {
         return new GLConfiguration(this);
     }
 
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Implementation sets the binding's native name to it's interface name,
+     * which is the final aliased shortest name.
+     * The latter is used for the proc-address-table etc ..
+     * </p>
+     */
+    @Override
+    protected void mangleBinding(final MethodBinding binding) {
+        binding.setNativeName(binding.getInterfaceName());
+        super.mangleBinding(binding);
+    }
+
     /** In order to implement Buffer Object variants of certain
     functions we generate another MethodBinding which maps the void*
     argument to a Java long. The generation of emitters then takes
@@ -272,7 +286,7 @@ public class GLEmitter extends ProcAddressEmitter {
         final GLConfiguration glConfig = getGLConfig();
         final List<MethodBinding> bindings = super.expandMethodBinding(binding);
 
-        if ( !glConfig.isBufferObjectFunction(binding.getName()) ) {
+        if ( !glConfig.isBufferObjectFunction(binding.getCSymbol()) ) {
             return bindings;
         }
         final boolean bufferObjectOnly = glConfig.isBufferObjectOnly(binding.getName());
@@ -466,7 +480,7 @@ public class GLEmitter extends ProcAddressEmitter {
     }
 
     protected boolean needsBufferObjectVariant(final FunctionSymbol sym) {
-        return getGLConfig().isBufferObjectFunction(sym.getName());
+        return getGLConfig().isBufferObjectFunction(sym);
     }
 
     protected GLConfiguration getGLConfig() {
-- 
cgit v1.2.3