[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3339] trunk/LWJGL/src

[<sp...@us...>]

Revision: 3339
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3339&view=rev
Author:   spasi
Date:     2010-05-07 17:03:36 +0000 (Fri, 07 May 2010)

Log Message:
-----------
Fix for OpenAL debug builds.
Added alternate methods for NV_fence.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_fence.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java	2010-05-01 09:19:00 UTC (rev 3338)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java	2010-05-07 17:03:36 UTC (rev 3339)
@@ -166,7 +166,9 @@
 		return null;
 	}
 
+	// DISABLED: We always generate indirect methods. (affects OpenAL only at the time of this change)
 	public static boolean isMethodIndirect(boolean generate_error_checks, boolean context_specific, MethodDeclaration method) {
+		/*
 		for (ParameterDeclaration param : method.getParameters()) {
 			if (isAddressableType(param.getType()) || getParameterAutoAnnotation(param) != null ||
 					param.getAnnotation(Constant.class) != null)
@@ -176,6 +178,8 @@
 			method.getAnnotation(CachedResult.class) != null ||
 			(generate_error_checks && method.getAnnotation(NoErrorCheck.class) == null) ||
 			context_specific;
+		*/
+		return true;
 	}
 
 	public static String getNativeQualifiedName(String qualified_name) {

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_fence.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_fence.java	2010-05-01 09:19:00 UTC (rev 3338)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_fence.java	2010-05-07 17:03:36 UTC (rev 3339)
@@ -42,8 +42,15 @@
 
 	void glGenFencesNV(@AutoSize("piFences") @GLsizei int n, @OutParameter @GLuint IntBuffer piFences);
 
+	@Alternate("glGenFencesNV")
+	@GLreturn("piFences")
+	void glGenFencesNV2(@Constant("1") @GLsizei int n, @OutParameter @GLuint IntBuffer piFences);
+
 	void glDeleteFencesNV(@AutoSize("piFences") @GLsizei int n, @Const @GLuint IntBuffer piFences);
 
+	@Alternate("glDeleteFencesNV")
+	void glDeleteFencesNV(@Constant("1") @GLsizei int n, @Const @GLuint @Constant(value = "APIUtils.getBufferInt().put(0, fence), 0", keepParam = true) int fence);
+
 	void glSetFenceNV(@GLuint int fence, @GLenum int condition);
 
 	boolean glTestFenceNV(@GLuint int fence);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.