From 485f5adca2a78ca2a621146081462d3f5e31f071 Mon Sep 17 00:00:00 2001 From: Ioannis Tsakpinis Date: Fri, 5 Nov 2010 17:13:56 +0000 Subject: [PATCH] Fixed @Reuse + @BufferObject generation. --- .../lwjgl/util/generator/JavaMethodsGenerator.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java index c25cb176..9724311c 100644 --- a/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java +++ b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java @@ -75,19 +75,19 @@ public class JavaMethodsGenerator { printMethodWithMultiType(env, type_map, writer, interface_decl, method, TypeInfo.getDefaultTypeInfoMap(method), Mode.CACHEDRESULT, generate_error_checks, context_specific); } - // Skip the native function if we're re-using. Reuse reuse_annotation = method.getAnnotation(Reuse.class); - if ( reuse_annotation != null ) - return; - Alternate alt_annotation = method.getAnnotation(Alternate.class); if ( alt_annotation == null || (alt_annotation.nativeAlt() && !alt_annotation.skipNative()) ) { if ( alt_annotation != null && method.getSimpleName().equals(alt_annotation.value()) ) throw new RuntimeException("An alternate function with native code should have a different name than the main function."); - printJavaNativeStub(writer, method, Mode.NORMAL, generate_error_checks, context_specific); + + if ( reuse_annotation == null ) + printJavaNativeStub(writer, method, Mode.NORMAL, generate_error_checks, context_specific); + if (Utils.hasMethodBufferObjectParameter(method)) { printMethodWithMultiType(env, type_map, writer, interface_decl, method, TypeInfo.getDefaultTypeInfoMap(method), Mode.BUFFEROBJECT, generate_error_checks, context_specific); - printJavaNativeStub(writer, method, Mode.BUFFEROBJECT, generate_error_checks, context_specific); + if ( reuse_annotation == null ) + printJavaNativeStub(writer, method, Mode.BUFFEROBJECT, generate_error_checks, context_specific); } } }