From ad50cb0572d410a04c09f362befdd7b824364940 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 11 Mar 2015 08:58:36 +0100 Subject: Bug 1144: Adapt to GlueGen commit 405512e1c8a2e24834b0d057f0b020b4a0f4c25b --- .../com/jogamp/gluegen/opengl/GLConfiguration.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java') diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java index 922a91531..878d7da37 100644 --- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java @@ -177,7 +177,7 @@ public class GLConfiguration extends ProcAddressConfiguration { public List javaPrologueForMethod(final MethodBinding binding, final boolean forImplementingMethodCall, final boolean eraseBufferAndArrayTypes) { List res = super.javaPrologueForMethod(binding, forImplementingMethodCall, eraseBufferAndArrayTypes); - final GLEmitter.BufferObjectKind kind = getBufferObjectKind(binding.getName()); + final GLEmitter.BufferObjectKind kind = getBufferObjectKind(binding.getCSymbol()); if (kind != null) { // Need to generate appropriate prologue based on both buffer // object kind and whether this variant of the MethodBinding @@ -382,12 +382,18 @@ public class GLConfiguration extends ProcAddressConfiguration { /** Returns the kind of buffer object this function deals with, or null if none. */ - GLEmitter.BufferObjectKind getBufferObjectKind(final String name) { - return bufferObjectKinds.get(name); + GLEmitter.BufferObjectKind getBufferObjectKind(final AliasedSymbol symbol) { + final String name = symbol.getName(); + final Set aliases = symbol.getAliasedNames(); + GLEmitter.BufferObjectKind res = bufferObjectKinds.get( name ); + if( null == res ) { + res = oneInMap(bufferObjectKinds, aliases); + } + return res; } - public boolean isBufferObjectFunction(final String name) { - return (getBufferObjectKind(name) != null); + public boolean isBufferObjectFunction(final AliasedSymbol symbol) { + return null != getBufferObjectKind(symbol); } public boolean isBufferObjectOnly(final String name) { -- cgit v1.2.3