java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 2701
          http://svn.sourceforge.net/java-game-lib/?rev=2701&view=rev
Author:   elias_naur
Date:     2006-12-20 11:24:25 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
Fix VBO tests and bump Sys native JNI library version

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-12-20 19:23:35 UTC (rev 2700)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-12-20 19:24:25 UTC (rev 2701)
@@ -57,7 +57,7 @@
 	private static final String VERSION = "1.0-rc1";
 
 	/** Current version of the JNI library */
-	static final int JNI_VERSION = 6;
+	static final int JNI_VERSION = 7;
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java	2006-12-20 19:23:35 UTC (rev 2700)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java	2006-12-20 19:24:25 UTC (rev 2701)
@@ -169,7 +169,6 @@
 
 		ByteBuffer new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB,
 		                                                              ARBBufferObject.GL_WRITE_ONLY_ARB,
-		                                                              2 * 4 * 4,
 		                                                              mapped_buffer);
 		if ( new_mapped_buffer != mapped_buffer )
 			mapped_float_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asFloatBuffer();
@@ -177,7 +176,6 @@
 
 		new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_ARB,
 		                                                   ARBBufferObject.GL_WRITE_ONLY_ARB,
-		                                                   4 * 4,
 		                                                   mapped_indices_buffer);
 		if ( new_mapped_buffer != mapped_indices_buffer )
 			mapped_indices_int_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asIntBuffer();

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java	2006-12-20 19:23:35 UTC (rev 2700)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java	2006-12-20 19:24:25 UTC (rev 2701)
@@ -163,7 +163,6 @@
 		GL11.glRotatef(angle, 0, 0, 1.0f);
 		ByteBuffer new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB,
 		                                                              ARBBufferObject.GL_WRITE_ONLY_ARB,
-		                                                              2 * 4 * 4,
 		                                                              mapped_buffer);
 		if ( new_mapped_buffer != mapped_buffer )
 			mapped_float_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asFloatBuffer();


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

Revision: 2700
          http://svn.sourceforge.net/java-game-lib/?rev=2700&view=rev
Author:   elias_naur
Date:     2006-12-20 11:23:35 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
Commit changes in automatically generated files

Modified Paths:
--------------
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/GL11.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/GL20.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram.java
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL15.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVVertexArrayRange.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVVertexProgram.c

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -195,19 +195,19 @@
 	 * <p/>
 	 * ByteBuffer mapped_buffer; mapped_buffer = glMapBufferARB(..., ..., ..., null); ... // Another map on the same buffer mapped_buffer = glMapBufferARB(..., ..., ..., mapped_buffer);
 	 * @param result_size   The size of the buffer area.
-	 * @param old_buffer    A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and no new buffer will be created. In that case, size is ignored.
+	 * @param old_buffer    A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no new buffer will be created.
 	 * @return A ByteBuffer representing the mapped buffer memory.
 	 */
-	public static java.nio.ByteBuffer glMapBufferARB(int target, int access, int result_size, java.nio.ByteBuffer old_buffer) {
+	public static java.nio.ByteBuffer glMapBufferARB(int target, int access, java.nio.ByteBuffer old_buffer) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.ARB_buffer_object_glMapBufferARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		if (old_buffer != null)
 			BufferChecks.checkDirect(old_buffer);
-		java.nio.ByteBuffer __result = nglMapBufferARB(target, access, result_size, old_buffer, function_pointer);
+		java.nio.ByteBuffer __result = nglMapBufferARB(target, access, GLChecks.getBufferObjectSizeARB(caps, target), old_buffer, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglMapBufferARB(int target, int access, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
+	private static native java.nio.ByteBuffer nglMapBufferARB(int target, int access, long result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
 
 	public static boolean glUnmapBufferARB(int target) {
 		ContextCapabilities caps = GLContext.getCapabilities();
@@ -227,12 +227,12 @@
 	}
 	private static native void nglGetBufferParameterivARB(int target, int pname, IntBuffer params, int params_position, long function_pointer);
 
-	public static java.nio.ByteBuffer glGetBufferPointerARB(int target, int pname, int result_size) {
+	public static java.nio.ByteBuffer glGetBufferPointerARB(int target, int pname) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.ARB_buffer_object_glGetBufferPointervARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		java.nio.ByteBuffer __result = nglGetBufferPointervARB(target, pname, result_size, function_pointer);
+		java.nio.ByteBuffer __result = nglGetBufferPointervARB(target, pname, GLChecks.getBufferObjectSizeARB(caps, target), function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglGetBufferPointervARB(int target, int pname, int result_size, long function_pointer);
+	private static native java.nio.ByteBuffer nglGetBufferPointervARB(int target, int pname, long result_size, long function_pointer);
 }

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -256,12 +256,12 @@
 	}
 	private static native void nglGetVertexAttribivARB(int index, int pname, IntBuffer params, int params_position, long function_pointer);
 
-	public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, int result_size) {
+	public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, long result_size) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.ARB_vertex_program_glGetVertexAttribPointervARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		java.nio.ByteBuffer __result = nglGetVertexAttribPointervARB(index, pname, result_size, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglGetVertexAttribPointervARB(int index, int pname, int result_size, long function_pointer);
+	private static native java.nio.ByteBuffer nglGetVertexAttribPointervARB(int index, int pname, long result_size, long function_pointer);
 }

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -299,12 +299,12 @@
 	}
 	private static native void nglGetVertexAttribivARB(int index, int pname, IntBuffer params, int params_position, long function_pointer);
 
-	public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, int result_size) {
+	public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, long result_size) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.ARB_vertex_shader_glGetVertexAttribPointervARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		java.nio.ByteBuffer __result = nglGetVertexAttribPointervARB(index, pname, result_size, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglGetVertexAttribPointervARB(int index, int pname, int result_size, long function_pointer);
+	private static native java.nio.ByteBuffer nglGetVertexAttribPointervARB(int index, int pname, long result_size, long function_pointer);
 }

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -18,12 +18,11 @@
 	 * oldBuffer is non-null, it will be returned if it points to the same mapped memory, otherwise a
 	 * new ByteBuffer is created.
 	 * @param result_size   The size of the buffer area.
-	 * @param old_buffer    A ByteBuffer. If this argument points to the same address as the new mapping,
-	 *                      it will be returned and no new buffer will be created. In that case, size is
-	 *                      ignored.
+	 * @param old_buffer    A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping,
+	 *                      it will be returned and no new buffer will be created.
 	 * @return A ByteBuffer representing the mapped object buffer memory.
 	 */
-	public static java.nio.ByteBuffer glMapObjectBufferATI(int buffer, int result_size, java.nio.ByteBuffer old_buffer) {
+	public static java.nio.ByteBuffer glMapObjectBufferATI(int buffer, long result_size, java.nio.ByteBuffer old_buffer) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.ATI_map_object_buffer_glMapObjectBufferATI_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
@@ -32,7 +31,7 @@
 		java.nio.ByteBuffer __result = nglMapObjectBufferATI(buffer, result_size, old_buffer, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglMapObjectBufferATI(int buffer, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
+	private static native java.nio.ByteBuffer nglMapObjectBufferATI(int buffer, long result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
 
 	public static void glUnmapObjectBufferATI(int buffer) {
 		ContextCapabilities caps = GLContext.getCapabilities();

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -526,14 +526,14 @@
 	}
 	private static native void nglGetVariantFloatvEXT(int id, int value, FloatBuffer pbData, int pbData_position, long function_pointer);
 
-	public static java.nio.ByteBuffer glGetVariantPointerEXT(int id, int value, int result_size) {
+	public static java.nio.ByteBuffer glGetVariantPointerEXT(int id, int value, long result_size) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.EXT_vertex_shader_glGetVariantPointervEXT_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		java.nio.ByteBuffer __result = nglGetVariantPointervEXT(id, value, result_size, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglGetVariantPointervEXT(int id, int value, int result_size, long function_pointer);
+	private static native java.nio.ByteBuffer nglGetVariantPointervEXT(int id, int value, long result_size, long function_pointer);
 
 	public static void glGetInvariantBooleanEXT(int id, int value, ByteBuffer pbData) {
 		ContextCapabilities caps = GLContext.getCapabilities();

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL11.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL11.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -1396,14 +1396,14 @@
 	}
 	private static native void nglFinish(long function_pointer);
 
-	public static java.nio.ByteBuffer glGetPointer(int pname, int result_size) {
+	public static java.nio.ByteBuffer glGetPointer(int pname, long result_size) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.GL11_glGetPointerv_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		java.nio.ByteBuffer __result = nglGetPointerv(pname, result_size, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglGetPointerv(int pname, int result_size, long function_pointer);
+	private static native java.nio.ByteBuffer nglGetPointerv(int pname, long result_size, long function_pointer);
 
 	public static boolean glIsEnabled(int cap) {
 		ContextCapabilities caps = GLContext.getCapabilities();

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -220,20 +220,20 @@
 	 * ByteBuffer mapped_buffer; mapped_buffer = glMapBuffer(..., ..., ..., null); ... // Another map on the same buffer
 	 * mapped_buffer = glMapBuffer(..., ..., ..., mapped_buffer);
 	 * @param result_size	The size of the buffer area.
-	 * @param old_buffer	A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and no
-	 *                  new buffer will be created. In that case, size is ignored.
+	 * @param old_buffer	A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no
+	 *                  new buffer will be created.
 	 * @return A ByteBuffer representing the mapped buffer memory.
 	 */
-	public static java.nio.ByteBuffer glMapBuffer(int target, int access, int result_size, java.nio.ByteBuffer old_buffer) {
+	public static java.nio.ByteBuffer glMapBuffer(int target, int access, java.nio.ByteBuffer old_buffer) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.GL15_glMapBuffer_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		if (old_buffer != null)
 			BufferChecks.checkDirect(old_buffer);
-		java.nio.ByteBuffer __result = nglMapBuffer(target, access, result_size, old_buffer, function_pointer);
+		java.nio.ByteBuffer __result = nglMapBuffer(target, access, GLChecks.getBufferObjectSize(caps, target), old_buffer, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglMapBuffer(int target, int access, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
+	private static native java.nio.ByteBuffer nglMapBuffer(int target, int access, long result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
 
 	public static boolean glUnmapBuffer(int target) {
 		ContextCapabilities caps = GLContext.getCapabilities();
@@ -253,14 +253,14 @@
 	}
 	private static native void nglGetBufferParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
 
-	public static java.nio.ByteBuffer glGetBufferPointer(int target, int pname, int result_size) {
+	public static java.nio.ByteBuffer glGetBufferPointer(int target, int pname) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.GL15_glGetBufferPointerv_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		java.nio.ByteBuffer __result = nglGetBufferPointerv(target, pname, result_size, function_pointer);
+		java.nio.ByteBuffer __result = nglGetBufferPointerv(target, pname, GLChecks.getBufferObjectSize(caps, target), function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglGetBufferPointerv(int target, int pname, int result_size, long function_pointer);
+	private static native java.nio.ByteBuffer nglGetBufferPointerv(int target, int pname, long result_size, long function_pointer);
 
 	public static void glGenQueries(IntBuffer ids) {
 		ContextCapabilities caps = GLContext.getCapabilities();

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL20.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL20.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -757,14 +757,14 @@
 	}
 	private static native void nglGetVertexAttribiv(int index, int pname, IntBuffer params, int params_position, long function_pointer);
 
-	public static java.nio.ByteBuffer glGetVertexAttribPointer(int index, int pname, int result_size) {
+	public static java.nio.ByteBuffer glGetVertexAttribPointer(int index, int pname, long result_size) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.GL20_glGetVertexAttribPointerv_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		java.nio.ByteBuffer __result = nglGetVertexAttribPointerv(index, pname, result_size, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglGetVertexAttribPointerv(int index, int pname, int result_size, long function_pointer);
+	private static native java.nio.ByteBuffer nglGetVertexAttribPointerv(int index, int pname, long result_size, long function_pointer);
 
 	public static void glBindAttribLocation(int program, int index, ByteBuffer name) {
 		ContextCapabilities caps = GLContext.getCapabilities();

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -1,181 +1,181 @@
-/* MACHINE GENERATED FILE, DO NOT EDIT */
-
-package org.lwjgl.opengl;
-
-import org.lwjgl.LWJGLException;
-import org.lwjgl.BufferChecks;
-import java.nio.*;
-
-public final class NVTransformFeedback {
-	/**
-	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
-	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
-	 * GetBufferPointerv, BindBufferRangeNV, BindBufferOffsetNV and
-	 * BindBufferBaseNV:
-	 */
-	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8c8e;
-	/**
-	 * Accepted by the &lt;param&gt; parameter of GetIntegerIndexedvEXT and
-	 * GetBooleanIndexedvEXT:
-	 */
-	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8c84;
-	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8c85;
-	public static final int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8c86;
-	/**
-	 * Accepted by the &lt;param&gt; parameter of GetIntegerIndexedvEXT and
-	 * GetBooleanIndexedvEXT, and by the &lt;pname&gt; parameter of GetBooleanv,
-	 * GetDoublev, GetIntegerv, and GetFloatv:
-	 */
-	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8c8f;
-	/**
-	 * Accepted by the &lt;bufferMode&gt; parameter of TransformFeedbackAttribsNV and
-	 * TransformFeedbackVaryingsNV:
-	 */
-	public static final int GL_INTERLEAVED_ATTRIBS_NV = 0x8c8c;
-	public static final int GL_SEPARATE_ATTRIBS_NV = 0x8c8d;
-	/**
-	 * Accepted by the &lt;target&gt; parameter of BeginQuery, EndQuery, and
-	 * GetQueryiv:
-	 */
-	public static final int GL_PRIMITIVES_GENERATED_NV = 0x8c87;
-	public static final int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8c88;
-	/**
-	 * Accepted by the &lt;cap&gt; parameter of Enable, Disable, and IsEnabled, and by
-	 * the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
-	 * GetDoublev:
-	 */
-	public static final int GL_RASTERIZER_DISCARD_NV = 0x8c89;
-	/**
-	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv,
-	 * and GetFloatv:
-	 */
-	public static final int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8c8a;
-	public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8c8b;
-	public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8c80;
-	public static final int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8c7e;
-	/**
-	 *Accepted by the &lt;pname&gt; parameter of GetProgramiv: 
-	 */
-	public static final int GL_ACTIVE_VARYINGS_NV = 0x8c81;
-	public static final int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8c82;
-	public static final int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8c83;
-	/**
-	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv,
-	 * GetFloatv, and GetProgramiv:
-	 */
-	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8c7f;
-	/**
-	 *Accepted by the &lt;attribs&gt; parameter of TransformFeedbackAttribsNV: 
-	 */
-	public static final int GL_BACK_PRIMARY_COLOR_NV = 0x8c77;
-	public static final int GL_BACK_SECONDARY_COLOR_NV = 0x8c78;
-	public static final int GL_TEXTURE_COORD_NV = 0x8c79;
-	public static final int GL_CLIP_DISTANCE_NV = 0x8c7a;
-	public static final int GL_VERTEX_ID_NV = 0x8c7b;
-	public static final int GL_PRIMITIVE_ID_NV = 0x8c7c;
-	public static final int GL_GENERIC_ATTRIB_NV = 0x8c7d;
-
-	private NVTransformFeedback() {
-	}
-
-
-	public static void glBindBufferRangeNV(int target, int index, int buffer, long offset, long size) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glBindBufferRangeNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBindBufferRangeNV(target, index, buffer, offset, size, function_pointer);
-	}
-	private static native void nglBindBufferRangeNV(int target, int index, int buffer, long offset, long size, long function_pointer);
-
-	public static void glBindBufferOffsetNV(int target, int index, int buffer, long offset) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glBindBufferOffsetNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBindBufferOffsetNV(target, index, buffer, offset, function_pointer);
-	}
-	private static native void nglBindBufferOffsetNV(int target, int index, int buffer, long offset, long function_pointer);
-
-	public static void glBindBufferBaseNV(int target, int index, int buffer) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glBindBufferBaseNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBindBufferBaseNV(target, index, buffer, function_pointer);
-	}
-	private static native void nglBindBufferBaseNV(int target, int index, int buffer, long function_pointer);
-
-	public static void glTransformFeedbackAttribsNV(IntBuffer attribs, int bufferMode) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glTransformFeedbackAttribsNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkDirect(attribs);
-		nglTransformFeedbackAttribsNV((attribs.remaining()), attribs, attribs.position(), bufferMode, function_pointer);
-	}
-	private static native void nglTransformFeedbackAttribsNV(int count, IntBuffer attribs, int attribs_position, int bufferMode, long function_pointer);
-
-	public static void glTransformFeedbackVaryingsNV(int program, IntBuffer locations, int bufferMode) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glTransformFeedbackVaryingsNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkDirect(locations);
-		nglTransformFeedbackVaryingsNV(program, (locations.remaining()), locations, locations.position(), bufferMode, function_pointer);
-	}
-	private static native void nglTransformFeedbackVaryingsNV(int program, int count, IntBuffer locations, int locations_position, int bufferMode, long function_pointer);
-
-	public static void glBeginTransformFeedbackNV(int primitiveMode) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glBeginTransformFeedbackNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBeginTransformFeedbackNV(primitiveMode, function_pointer);
-	}
-	private static native void nglBeginTransformFeedbackNV(int primitiveMode, long function_pointer);
-
-	public static void glEndTransformFeedbackNV() {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glEndTransformFeedbackNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglEndTransformFeedbackNV(function_pointer);
-	}
-	private static native void nglEndTransformFeedbackNV(long function_pointer);
-
-	public static int glGetVaryingLocationNV(int program, ByteBuffer name) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glGetVaryingLocationNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkDirect(name);
-		BufferChecks.checkNullTerminated(name);
-		int __result = nglGetVaryingLocationNV(program, name, name.position(), function_pointer);
-		return __result;
-	}
-	private static native int nglGetVaryingLocationNV(int program, ByteBuffer name, int name_position, long function_pointer);
-
-	public static void glGetActiveVaryingNV(int program, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glGetActiveVaryingNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(length, 1);
-		BufferChecks.checkBuffer(size, 1);
-		BufferChecks.checkBuffer(type, 1);
-		BufferChecks.checkDirect(name);
-		nglGetActiveVaryingNV(program, index, (name.remaining()), length, length.position(), size, size.position(), type, type.position(), name, name.position(), function_pointer);
-	}
-	private static native void nglGetActiveVaryingNV(int program, int index, int bufSize, IntBuffer length, int length_position, IntBuffer size, int size_position, IntBuffer type, int type_position, ByteBuffer name, int name_position, long function_pointer);
-
-	public static void glActiveVaryingNV(int program, ByteBuffer name) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glActiveVaryingNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkDirect(name);
-		BufferChecks.checkNullTerminated(name);
-		nglActiveVaryingNV(program, name, name.position(), function_pointer);
-	}
-	private static native void nglActiveVaryingNV(int program, ByteBuffer name, int name_position, long function_pointer);
-
-	public static void glGetTransformFeedbackVaryingNV(int program, int index, IntBuffer location) {
-		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_transform_feedback_glGetTransformFeedbackVaryingNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(location, 1);
-		nglGetTransformFeedbackVaryingNV(program, index, location, location.position(), function_pointer);
-	}
-	private static native void nglGetTransformFeedbackVaryingNV(int program, int index, IntBuffer location, int location_position, long function_pointer);
-}
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+package org.lwjgl.opengl;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.BufferChecks;
+import java.nio.*;
+
+public final class NVTransformFeedback {
+	/**
+	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+	 * GetBufferPointerv, BindBufferRangeNV, BindBufferOffsetNV and
+	 * BindBufferBaseNV:
+	 */
+	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8c8e;
+	/**
+	 * Accepted by the &lt;param&gt; parameter of GetIntegerIndexedvEXT and
+	 * GetBooleanIndexedvEXT:
+	 */
+	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8c84;
+	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8c85;
+	public static final int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8c86;
+	/**
+	 * Accepted by the &lt;param&gt; parameter of GetIntegerIndexedvEXT and
+	 * GetBooleanIndexedvEXT, and by the &lt;pname&gt; parameter of GetBooleanv,
+	 * GetDoublev, GetIntegerv, and GetFloatv:
+	 */
+	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8c8f;
+	/**
+	 * Accepted by the &lt;bufferMode&gt; parameter of TransformFeedbackAttribsNV and
+	 * TransformFeedbackVaryingsNV:
+	 */
+	public static final int GL_INTERLEAVED_ATTRIBS_NV = 0x8c8c;
+	public static final int GL_SEPARATE_ATTRIBS_NV = 0x8c8d;
+	/**
+	 * Accepted by the &lt;target&gt; parameter of BeginQuery, EndQuery, and
+	 * GetQueryiv:
+	 */
+	public static final int GL_PRIMITIVES_GENERATED_NV = 0x8c87;
+	public static final int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8c88;
+	/**
+	 * Accepted by the &lt;cap&gt; parameter of Enable, Disable, and IsEnabled, and by
+	 * the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev:
+	 */
+	public static final int GL_RASTERIZER_DISCARD_NV = 0x8c89;
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv,
+	 * and GetFloatv:
+	 */
+	public static final int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8c8a;
+	public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8c8b;
+	public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8c80;
+	public static final int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8c7e;
+	/**
+	 *Accepted by the &lt;pname&gt; parameter of GetProgramiv: 
+	 */
+	public static final int GL_ACTIVE_VARYINGS_NV = 0x8c81;
+	public static final int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8c82;
+	public static final int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8c83;
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv,
+	 * GetFloatv, and GetProgramiv:
+	 */
+	public static final int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8c7f;
+	/**
+	 *Accepted by the &lt;attribs&gt; parameter of TransformFeedbackAttribsNV: 
+	 */
+	public static final int GL_BACK_PRIMARY_COLOR_NV = 0x8c77;
+	public static final int GL_BACK_SECONDARY_COLOR_NV = 0x8c78;
+	public static final int GL_TEXTURE_COORD_NV = 0x8c79;
+	public static final int GL_CLIP_DISTANCE_NV = 0x8c7a;
+	public static final int GL_VERTEX_ID_NV = 0x8c7b;
+	public static final int GL_PRIMITIVE_ID_NV = 0x8c7c;
+	public static final int GL_GENERIC_ATTRIB_NV = 0x8c7d;
+
+	private NVTransformFeedback() {
+	}
+
+
+	public static void glBindBufferRangeNV(int target, int index, int buffer, long offset, long size) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glBindBufferRangeNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglBindBufferRangeNV(target, index, buffer, offset, size, function_pointer);
+	}
+	private static native void nglBindBufferRangeNV(int target, int index, int buffer, long offset, long size, long function_pointer);
+
+	public static void glBindBufferOffsetNV(int target, int index, int buffer, long offset) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glBindBufferOffsetNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglBindBufferOffsetNV(target, index, buffer, offset, function_pointer);
+	}
+	private static native void nglBindBufferOffsetNV(int target, int index, int buffer, long offset, long function_pointer);
+
+	public static void glBindBufferBaseNV(int target, int index, int buffer) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glBindBufferBaseNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglBindBufferBaseNV(target, index, buffer, function_pointer);
+	}
+	private static native void nglBindBufferBaseNV(int target, int index, int buffer, long function_pointer);
+
+	public static void glTransformFeedbackAttribsNV(IntBuffer attribs, int bufferMode) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glTransformFeedbackAttribsNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkDirect(attribs);
+		nglTransformFeedbackAttribsNV((attribs.remaining()), attribs, attribs.position(), bufferMode, function_pointer);
+	}
+	private static native void nglTransformFeedbackAttribsNV(int count, IntBuffer attribs, int attribs_position, int bufferMode, long function_pointer);
+
+	public static void glTransformFeedbackVaryingsNV(int program, IntBuffer locations, int bufferMode) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glTransformFeedbackVaryingsNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkDirect(locations);
+		nglTransformFeedbackVaryingsNV(program, (locations.remaining()), locations, locations.position(), bufferMode, function_pointer);
+	}
+	private static native void nglTransformFeedbackVaryingsNV(int program, int count, IntBuffer locations, int locations_position, int bufferMode, long function_pointer);
+
+	public static void glBeginTransformFeedbackNV(int primitiveMode) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glBeginTransformFeedbackNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglBeginTransformFeedbackNV(primitiveMode, function_pointer);
+	}
+	private static native void nglBeginTransformFeedbackNV(int primitiveMode, long function_pointer);
+
+	public static void glEndTransformFeedbackNV() {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glEndTransformFeedbackNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglEndTransformFeedbackNV(function_pointer);
+	}
+	private static native void nglEndTransformFeedbackNV(long function_pointer);
+
+	public static int glGetVaryingLocationNV(int program, ByteBuffer name) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glGetVaryingLocationNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkDirect(name);
+		BufferChecks.checkNullTerminated(name);
+		int __result = nglGetVaryingLocationNV(program, name, name.position(), function_pointer);
+		return __result;
+	}
+	private static native int nglGetVaryingLocationNV(int program, ByteBuffer name, int name_position, long function_pointer);
+
+	public static void glGetActiveVaryingNV(int program, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glGetActiveVaryingNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkBuffer(length, 1);
+		BufferChecks.checkBuffer(size, 1);
+		BufferChecks.checkBuffer(type, 1);
+		BufferChecks.checkDirect(name);
+		nglGetActiveVaryingNV(program, index, (name.remaining()), length, length.position(), size, size.position(), type, type.position(), name, name.position(), function_pointer);
+	}
+	private static native void nglGetActiveVaryingNV(int program, int index, int bufSize, IntBuffer length, int length_position, IntBuffer size, int size_position, IntBuffer type, int type_position, ByteBuffer name, int name_position, long function_pointer);
+
+	public static void glActiveVaryingNV(int program, ByteBuffer name) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glActiveVaryingNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkDirect(name);
+		BufferChecks.checkNullTerminated(name);
+		nglActiveVaryingNV(program, name, name.position(), function_pointer);
+	}
+	private static native void nglActiveVaryingNV(int program, ByteBuffer name, int name_position, long function_pointer);
+
+	public static void glGetTransformFeedbackVaryingNV(int program, int index, IntBuffer location) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		long function_pointer = caps.NV_transform_feedback_glGetTransformFeedbackVaryingNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkBuffer(location, 1);
+		nglGetTransformFeedbackVaryingNV(program, index, location, location.position(), function_pointer);
+	}
+	private static native void nglGetTransformFeedbackVaryingNV(int program, int index, IntBuffer location, int location_position, long function_pointer);
+}

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -69,7 +69,7 @@
 		java.nio.ByteBuffer __result = nglAllocateMemoryNV(size, readFrequency, writeFrequency, priority, size, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority, int result_size, long function_pointer);
+	private static native java.nio.ByteBuffer nglAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority, long result_size, long function_pointer);
 
 	public static void glFreeMemoryNV(ByteBuffer pointer) {
 		ContextCapabilities caps = GLContext.getCapabilities();

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram.java	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram.java	2006-12-20 19:23:35 UTC (rev 2700)
@@ -214,14 +214,14 @@
 	}
 	private static native void nglGetVertexAttribivNV(int index, int parameterName, IntBuffer params, int params_position, long function_pointer);
 
-	public static java.nio.ByteBuffer glGetVertexAttribPointerNV(int index, int parameterName, int result_size) {
+	public static java.nio.ByteBuffer glGetVertexAttribPointerNV(int index, int parameterName, long result_size) {
 		ContextCapabilities caps = GLContext.getCapabilities();
 		long function_pointer = caps.NV_vertex_program_glGetVertexAttribPointervNV_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		java.nio.ByteBuffer __result = nglGetVertexAttribPointervNV(index, parameterName, result_size, function_pointer);
 		return __result;
 	}
-	private static native java.nio.ByteBuffer nglGetVertexAttribPointervNV(int index, int parameterName, int result_size, long function_pointer);
+	private static native java.nio.ByteBuffer nglGetVertexAttribPointervNV(int index, int parameterName, long result_size, long function_pointer);
 
 	public static void glProgramParameter4fNV(int target, int index, float x, float y, float z, float w) {
 		ContextCapabilities caps = GLContext.getCapabilities();

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c	2006-12-20 19:23:35 UTC (rev 2700)
@@ -56,7 +56,7 @@
 	glGetBufferSubDataARB(target, offset, size, data_address);
 }
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglMapBufferARB(JNIEnv *env, jclass clazz, jint target, jint access, jint result_size, jobject old_buffer, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglMapBufferARB(JNIEnv *env, jclass clazz, jint target, jint access, jlong result_size, jobject old_buffer, jlong function_pointer) {
 	glMapBufferARBPROC glMapBufferARB = (glMapBufferARBPROC)((intptr_t)function_pointer);
 	GLvoid * __result = glMapBufferARB(target, access);
 	return safeNewBufferCached(env, __result, result_size, old_buffer);
@@ -74,7 +74,7 @@
 	glGetBufferParameterivARB(target, pname, params_address);
 }
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglGetBufferPointervARB(JNIEnv *env, jclass clazz, jint target, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglGetBufferPointervARB(JNIEnv *env, jclass clazz, jint target, jint pname, jlong result_size, jlong function_pointer) {
 	glGetBufferPointervARBPROC glGetBufferPointervARB = (glGetBufferPointervARBPROC)((intptr_t)function_pointer);
 	GLvoid * __result;
 	glGetBufferPointervARB(target, pname, &__result);

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c	2006-12-20 19:23:35 UTC (rev 2700)
@@ -129,7 +129,7 @@
 	glGetVertexAttribivARB(index, pname, params_address);
 }
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglGetVertexAttribPointervARB(JNIEnv *env, jclass clazz, jint index, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglGetVertexAttribPointervARB(JNIEnv *env, jclass clazz, jint index, jint pname, jlong result_size, jlong function_pointer) {
 	glGetVertexAttribPointervARBPROC glGetVertexAttribPointervARB = (glGetVertexAttribPointervARBPROC)((intptr_t)function_pointer);
 	GLvoid * __result;
 	glGetVertexAttribPointervARB(index, pname, &__result);

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c	2006-12-20 19:23:35 UTC (rev 2700)
@@ -154,7 +154,7 @@
 	glGetVertexAttribivARB(index, pname, params_address);
 }
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetVertexAttribPointervARB(JNIEnv *env, jclass clazz, jint index, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetVertexAttribPointervARB(JNIEnv *env, jclass clazz, jint index, jint pname, jlong result_size, jlong function_pointer) {
 	glGetVertexAttribPointervARBPROC glGetVertexAttribPointervARB = (glGetVertexAttribPointervARBPROC)((intptr_t)function_pointer);
 	GLvoid * __result;
 	glGetVertexAttribPointervARB(index, pname, &__result);

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c	2006-12-20 19:23:35 UTC (rev 2700)
@@ -6,7 +6,7 @@
 typedef GLvoid * (APIENTRY *glMapObjectBufferATIPROC) (GLuint buffer);
 typedef void (APIENTRY *glUnmapObjectBufferATIPROC) (GLuint buffer);
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_nglMapObjectBufferATI(JNIEnv *env, jclass clazz, jint buffer, jint result_size, jobject old_buffer, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_nglMapObjectBufferATI(JNIEnv *env, jclass clazz, jint buffer, jlong result_size, jobject old_buffer, jlong function_pointer) {
 	glMapObjectBufferATIPROC glMapObjectBufferATI = (glMapObjectBufferATIPROC)((intptr_t)function_pointer);
 	GLvoid * __result = glMapObjectBufferATI(buffer);
 	return safeNewBufferCached(env, __result, result_size, old_buffer);

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c	2006-12-20 19:23:35 UTC (rev 2700)
@@ -249,7 +249,7 @@
 	glGetVariantFloatvEXT(id, value, pbData_address);
 }
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantPointervEXT(JNIEnv *env, jclass clazz, jint id, jint value, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantPointervEXT(JNIEnv *env, jclass clazz, jint id, jint value, jlong result_size, jlong function_pointer) {
 	glGetVariantPointervEXTPROC glGetVariantPointervEXT = (glGetVariantPointervEXTPROC)((intptr_t)function_pointer);
 	GLvoid * __result;
 	glGetVariantPointervEXT(id, value, &__result);

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c	2006-12-20 19:23:35 UTC (rev 2700)
@@ -739,7 +739,7 @@
 	glFinish();
 }
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL11_nglGetPointerv(JNIEnv *env, jclass clazz, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL11_nglGetPointerv(JNIEnv *env, jclass clazz, jint pname, jlong result_size, jlong function_pointer) {
 	glGetPointervPROC glGetPointerv = (glGetPointervPROC)((intptr_t)function_pointer);
 	GLvoid * __result;
 	glGetPointerv(pname, &__result);

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL15.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL15.c	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL15.c	2006-12-20 19:23:35 UTC (rev 2700)
@@ -64,7 +64,7 @@
 	glGetBufferSubData(target, offset, size, data_address);
 }
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_nglMapBuffer(JNIEnv *env, jclass clazz, jint target, jint access, jint result_size, jobject old_buffer, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_nglMapBuffer(JNIEnv *env, jclass clazz, jint target, jint access, jlong result_size, jobject old_buffer, jlong function_pointer) {
 	glMapBufferPROC glMapBuffer = (glMapBufferPROC)((intptr_t)function_pointer);
 	GLvoid * __result = glMapBuffer(target, access);
 	return safeNewBufferCached(env, __result, result_size, old_buffer);
@@ -82,7 +82,7 @@
 	glGetBufferParameteriv(target, pname, params_address);
 }
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferPointerv(JNIEnv *env, jclass clazz, jint target, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferPointerv(JNIEnv *env, jclass clazz, jint target, jint pname, jlong result_size, jlong function_pointer) {
 	glGetBufferPointervPROC glGetBufferPointerv = (glGetBufferPointervPROC)((intptr_t)function_pointer);
 	GLvoid * __result;
 	glGetBufferPointerv(target, pname, &__result);

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c	2006-12-20 19:23:35 UTC (rev 2700)
@@ -423,7 +423,7 @@
 	glGetVertexAttribiv(index, pname, params_address);
 }
 
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL20_nglGetVertexAttribPointerv(JNIEnv *env, jclass clazz, jint index, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL20_nglGetVertexAttribPointerv(JNIEnv *env, jclass clazz, jint index, jint pname, jlong result_size, jlong function_pointer) {
 	glGetVertexAttribPointervPROC glGetVertexAttribPointerv = (glGetVertexAttribPointervPROC)((intptr_t)function_pointer);
 	GLvoid * __result;
 	glGetVertexAttribPointerv(index, pname, &__result);

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c	2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c	2006-12-20 19:23:35 UTC (rev 2700)
@@ -1,82 +1,82 @@
-/* MACHINE GENERATED FILE, DO NOT EDIT */
-
-#include <jni.h>
-#include "extgl.h"
-
-typedef void (APIENTRY *glBindBufferRangeNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRY *glBindBufferOffsetNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRY *glBindBufferBaseNVPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRY *glTransformFeedbackAttribsNVPROC) (GLsizei count, const GLint * attribs, GLenum bufferMode);
-typedef void (APIENTRY *glTransformFeedbackVaryingsNVPROC) (GLuint program, GLsizei count, const GLint * locations, GLenum bufferMode);
-typedef void (APIENTRY *glBeginTransformFeedbackNVPROC) (GLenum primitiveMode);
-typedef void (APIENTRY *glEndTransformFeedbackNVPROC) ();
-typedef GLint (APIENTRY *glGetVaryingLocationNVPROC) (GLuint program, const GLchar * name);
-typedef void (APIENTRY *glGetActiveVaryingNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name);
-typedef void (APIENTRY *glActiveVaryingNVPROC) (GLuint program, const GLchar * name);
-typedef void (APIENTRY *glGetTransformFeedbackVaryingNVPROC) (GLuint program, GLuint index, GLint * location);
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferRangeNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong size, jlong function_pointer) {
-	glBindBufferRangeNVPROC glBindBufferRangeNV = (glBindBufferRangeNVPROC)((intptr_t)function_pointer);
-	glBindBufferRangeNV(target, index, buffer, offset, size);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferOffsetNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong function_pointer) {
-	glBindBufferOffsetNVPROC glBindBufferOffsetNV = (glBindBufferOffsetNVPROC)((intptr_t)function_pointer);
-	glBindBufferOffsetNV(target, index, buffer, offset);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferBaseNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong function_pointer) {
-	glBindBufferBaseNVPROC glBindBufferBaseNV = (glBindBufferBaseNVPROC)((intptr_t)function_pointer);
-	glBindBufferBaseNV(target, index, buffer);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackAttribsNV(JNIEnv *env, jclass clazz, jint count, jobject attribs, jint attribs_position, jint bufferMode, jlong function_pointer) {
-	const GLint *attribs_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, attribs)) + attribs_position;
-	glTransformFeedbackAttribsNVPROC glTransformFeedbackAttribsNV = (glTransformFeedbackAttribsNVPROC)((intptr_t)function_pointer);
-	glTransformFeedbackAttribsNV(count, attribs_address, bufferMode);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackVaryingsNV(JNIEnv *env, jclass clazz, jint program, jint count, jobject locations, jint locations_position, jint bufferMode, jlong function_pointer) {
-	const GLint *locations_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, locations)) + locations_position;
-	glTransformFeedbackVaryingsNVPROC glTransformFeedbackVaryingsNV = (glTransformFeedbackVaryingsNVPROC)((intptr_t)function_pointer);
-	glTransformFeedbackVaryingsNV(program, count, locations_address, bufferMode);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBeginTransformFeedbackNV(JNIEnv *env, jclass clazz, jint primitiveMode, jlong function_pointer) {
-	glBeginTransformFeedbackNVPROC glBeginTransformFeedbackNV = (glBeginTransformFeedbackNVPROC)((intptr_t)function_pointer);
-	glBeginTransformFeedbackNV(primitiveMode);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglEndTransformFeedbackNV(JNIEnv *env, jclass clazz, jlong function_pointer) {
-	glEndTransformFeedbackNVPROC glEndTransformFeedbackNV = (glEndTransformFeedbackNVPROC)((intptr_t)function_pointer);
-	glEndTransformFeedbackNV();
-}
-
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetVaryingLocationNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
-	const GLchar *name_address = ((const GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
-	glGetVaryingLocationNVPROC glGetVaryingLocationNV = (glGetVaryingLocationNVPROC)((intptr_t)function_pointer);
-	GLint __result = glGetVaryingLocationNV(program, name_address);
-	return __result;
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jint bufSize, jobject length, jint length_position, jobject size, jint size_position, jobject type, jint type_position, jobject name, jint name_position, jlong function_pointer) {
-	GLsizei *length_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, length)) + length_position;
-	GLsizei *size_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, size)) + size_position;
-	GLenum *type_address = ((GLenum *)(*env)->GetDirectBufferAddress(env, type)) + type_position;
-	GLchar *name_address = ((GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
-	glGetActiveVaryingNVPROC glGetActiveVaryingNV = (glGetActiveVaryingNVPROC)((intptr_t)function_pointer);
-	glGetActiveVaryingNV(program, index, bufSize, length_address, size_address, type_address, name_address);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
-	const GLchar *name_address = ((const GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
-	glActiveVaryingNVPROC glActiveVaryingNV = (glActiveVaryingNVPROC)((intptr_t)function_pointer);
-	glActiveVaryingNV(program, name_address);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetTransformFeedbackVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jobject location, jint location_position, jlong function_pointer) {
-	GLint *location_address = ((GLint *)(*env)->GetDirectBufferAddress(env, location)) + location_position;
-	glGetTransformFeedbackVaryingNVPROC glGetTransformFeedbackVaryingNV = (glGetTransformFeedbackVaryingNVPROC)((intptr_t)function_pointer);
-	glGetTransformFeedbackVaryingNV(program, index, location_address);
-}
-
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+#include <jni.h>
+#include "extgl.h"
+
+typedef void (APIENTRY *glBindBufferRangeNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRY *glBindBufferOffsetNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRY *glBindBufferBaseNVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRY *glTransformFeedbackAttribsNVPROC) (GLsizei count, const GLint * attribs, GLenum bufferMode);
+typedef void (APIENTRY *glTransformFeedbackVaryingsNVPROC) (GLuint program, GLsizei count, const GLint * locations, GLenum bufferMode);
+typedef void (APIENTRY *glBeginTransformFeedbackNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRY *glEndTransformFeedbackNVPROC) ();
+typedef GLint (APIENTRY *glGetVaryingLocationNVPROC) (GLuint program, const GLchar * name);
+typedef void (APIENTRY *glGetActiveVaryingNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name);
+typedef void (APIENTRY *glActiveVaryingNVPROC) (GLuint program, const GLchar * name);
+typedef void (APIENTRY *glGetTransformFeedbackVaryingNVPROC) (GLuint program, GLuint index, GLint * location);
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferRangeNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong size, jlong function_pointer) {
+	glBindBufferRangeNVPROC glBindBufferRangeNV = (glBindBufferRangeNVPROC)((intptr_t)function_pointer);
+	glBindBufferRangeNV(target, index, buffer, offset, size);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferOffsetNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong function_pointer) {
+	glBindBufferOffsetNVPROC glBindBufferOffsetNV = (glBindBufferOffsetNVPROC)((intptr_t)function_pointer);
+	glBindBufferOffsetNV(target, index, buffer, offset);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferBaseNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong function_pointer) {
+	glBindBufferBaseNVPROC glBindBufferBaseNV = (glBindBufferBaseNVPROC)((intptr_t)function_pointer);
+	glBindBufferBaseNV(target, index, buffer);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackAttribsNV(JNIEnv *env, jclass clazz, jint count, jobject attribs, jint attribs_position, jint bufferMode, jlong function_pointer) {
+	const GLint *attribs_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, attribs)) + attribs_position;
+	glTransformFeedbackAttribsNVPROC glTransformFeedbackAttribsNV = (glTransformFeedbackAttribsNVPROC)((intptr_t)function_pointer);
+	glTransformFeedbackAttribsNV(count, attribs_address, bufferMode);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackVaryingsNV(JNIEnv *env, jclass clazz, jint program, jint count, jobject locations, jint locations_position, jint bufferMode, jlong function_pointer) {
+	const GLint *locations_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, locations)) + locations_position;
+	glTransformFeedbackVaryingsNVPROC glTransformFeedbackVaryingsNV = (glTransformFeedbackVaryingsNVPROC)((intptr_t)function_pointer);
+	glTransformFeedbackVaryingsNV(program, count, locations_address, bufferMode);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBeginTransformFeedbackNV(JNIEnv *env, jclass clazz, jint primitiveMode, jlong function_pointer) {
+	glBeginTransformFeedbackNVPROC glBeginTransformFeedbackNV = (glBeginTransformFeedbackNVPROC)((intptr_t)function_pointer);
+	glBeginTransformFeedbackNV(primitiveMode);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglEndTransformFeedbackNV(JNIEnv *env, jclass clazz, jlong function_pointer) {
+	glEndTransformFeedbackNVPROC glEndTransformFeedbackNV = (glEndTransformFeedbackNVPROC)((intptr_t)function_pointer);
+	glEndTransformFeedbackNV();
+}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetVaryingLocationNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
+	const GLchar *name_address = ((const GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
+	glGetVaryingLocationNVPROC glGetVaryingLocationNV = (glGetVaryingLocationNVPROC)((intptr_t)function_pointer);
+	GLint __result = glGetVaryingLocationNV(program, name_address);
+	return __result;
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jint bufSize, jobject length, jint length_position, jobject size, jint size_position, jobject type, jint type_position, jobject name, jint name_position, jlong function_pointer) {
+	GLsizei *length_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, length)) + length_position;
+	GLsizei *size_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, size)) + size_position;
+	GLenum *type_address = ((GLenum *)(*env)->GetDirectBufferAddress(env, type)) + type_position;
+	GLchar...
 
[truncated message content]

Revision: 2699
          http://svn.sourceforge.net/java-game-lib/?rev=2699&view=rev
Author:   elias_naur
Date:     2006-12-20 11:22:33 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
Add GLChecks support methods for GL15 and ARB_buffer_object

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java	2006-12-20 19:21:35 UTC (rev 2698)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java	2006-12-20 19:22:33 UTC (rev 2699)
@@ -59,6 +59,18 @@
 		return StateTracker.getReferencesStack(caps).getReferences();
 	}
 
+	static int getBufferObjectSize(ContextCapabilities caps, int buffer_enum) {
+		IntBuffer scratch_buffer = caps.scratch_int_buffer;
+		GL15.glGetBufferParameter(buffer_enum, GL15.GL_BUFFER_SIZE, scratch_buffer);
+		return scratch_buffer.get(0);
+	}
+
+	static int getBufferObjectSizeARB(ContextCapabilities caps, int buffer_enum) {
+		IntBuffer scratch_buffer = caps.scratch_int_buffer;
+		ARBBufferObject.glGetBufferParameterARB(buffer_enum, ARBBufferObject.GL_BUFFER_SIZE_ARB, scratch_buffer);
+		return scratch_buffer.get(0);
+	}
+
 	private static boolean checkBufferObject(ContextCapabilities caps, int buffer_enum, boolean state) {
 		IntBuffer scratch_buffer = caps.scratch_int_buffer;
 		GL11.glGetInteger(buffer_enum, scratch_buffer);


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

Revision: 2698
          http://svn.sourceforge.net/java-game-lib/?rev=2698&view=rev
Author:   elias_naur
Date:     2006-12-20 11:21:35 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
Make glGetBufferPointer and glMapBuffer in GL15 and ARB_buffer_object compute result_size automatically. Change NV_vertes_array_range to use the new AutoResultSize syntax.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2006-12-20 19:19:56 UTC (rev 2697)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2006-12-20 19:21:35 UTC (rev 2698)
@@ -116,6 +116,7 @@
 	 */
 	@CachedResult
 	@GLvoid
+	@AutoResultSize("GLChecks.getBufferObjectSizeARB(caps, target)")
 	ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access);
 
 	boolean glUnmapBufferARB(@GLenum int target);
@@ -124,5 +125,6 @@
 	void glGetBufferParameterivARB(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
 
 	@StripPostfix("pointer")
+	@AutoResultSize("GLChecks.getBufferObjectSizeARB(caps, target)")
 	void glGetBufferPointervARB(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer);
 }

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2006-12-20 19:19:56 UTC (rev 2697)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2006-12-20 19:21:35 UTC (rev 2698)
@@ -123,6 +123,7 @@
 	 */
 	@CachedResult
 	@GLvoid
+	@AutoResultSize("GLChecks.getBufferObjectSize(caps, target)")
 	ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access);
 
 	boolean glUnmapBuffer(@GLenum int target);
@@ -131,6 +132,7 @@
 	void glGetBufferParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
 
 	@StripPostfix("pointer")
+	@AutoResultSize("GLChecks.getBufferObjectSize(caps, target)")
 	void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer);
 
 	// -----------------------------------------------------------------

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java	2006-12-20 19:19:56 UTC (rev 2697)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java	2006-12-20 19:21:35 UTC (rev 2698)
@@ -54,7 +54,8 @@
 
 	@PlatformDependent({Platform.WGL, Platform.GLX})
 	@GLvoid
-	ByteBuffer glAllocateMemoryNV(@AutoResultSize int size, float readFrequency, float writeFrequency, float priority);
+	@AutoResultSize("size")
+	ByteBuffer glAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority);
 
 	@PlatformDependent({Platform.WGL, Platform.GLX})
 	void glFreeMemoryNV(@Check @GLbyte Buffer pointer);


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

Revision: 2697
          http://svn.sourceforge.net/java-game-lib/?rev=2697&view=rev
Author:   elias_naur
Date:     2006-12-20 11:19:56 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
Generator: Support arbitrary @AutoResultSize expressions. Make Buffer result sizes long instead of int

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java	2006-12-20 17:55:10 UTC (rev 2696)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java	2006-12-20 19:19:56 UTC (rev 2697)
@@ -33,8 +33,8 @@
 
 /**
  *
- * AutoResultSize specifies that a parameter should determine
- * the size of a Buffer result.
+ * AutoResultSize specifies the size of a returned Buffer
+ * as an expression.
  *
  * @author elias_naur <eli...@us...>
  * @version $Revision$
@@ -44,6 +44,7 @@
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
 
-@Target(ElementType.PARAMETER)
+@Target(ElementType.METHOD)
 public @interface AutoResultSize {
+	String value(); // The size as a java expression
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2006-12-20 17:55:10 UTC (rev 2696)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2006-12-20 19:19:56 UTC (rev 2697)
@@ -123,12 +123,14 @@
 			if (!first_parameter)
 				writer.print(", ");
 			first_parameter = false;
-			writer.print("int " + Utils.RESULT_SIZE_NAME);
-			if (method.getAnnotation(CachedResult.class) != null) {
+			writer.print("long " + Utils.RESULT_SIZE_NAME);
+		}
+		if (method.getAnnotation(CachedResult.class) != null) {
+			if (!first_parameter)
 				writer.print(", ");
-				printResultType(writer, method);
-				writer.print(" " + Utils.CACHED_BUFFER_NAME);
-			}
+			first_parameter = false;
+			printResultType(writer, method);
+			writer.print(" " + Utils.CACHED_BUFFER_NAME);
 		}
 		return first_parameter;
 	}
@@ -382,13 +384,13 @@
 			if (!first_parameter)
 				writer.print(", ");
 			first_parameter = false;
-			ParameterDeclaration auto_result_size_parameter = Utils.getAutoResultSizeParameter(method);
-			String result_size_parameter_name;
-			if (auto_result_size_parameter == null)
-				result_size_parameter_name = Utils.RESULT_SIZE_NAME;
+			AutoResultSize auto_result_size_annotation = method.getAnnotation(AutoResultSize.class);
+			String result_size_expression;
+			if (auto_result_size_annotation == null)
+				result_size_expression = Utils.RESULT_SIZE_NAME;
 			else
-				result_size_parameter_name = auto_result_size_parameter.getSimpleName();
-			Utils.printExtraCallArguments(writer, method, result_size_parameter_name);
+				result_size_expression = auto_result_size_annotation.value();
+			Utils.printExtraCallArguments(writer, method, result_size_expression);
 		}
 		return first_parameter;
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java	2006-12-20 17:55:10 UTC (rev 2696)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java	2006-12-20 19:19:56 UTC (rev 2697)
@@ -95,7 +95,7 @@
 		writer.print("(JNIEnv *env, jclass clazz");
 		generateParameters(writer, method.getParameters(), mode);
 		if (Utils.getNIOBufferType(result_type) != null) {
-			writer.print(", jint " + Utils.RESULT_SIZE_NAME);
+			writer.print(", jlong " + Utils.RESULT_SIZE_NAME);
 			if (method.getAnnotation(CachedResult.class) != null)
 				writer.print(", jobject " + Utils.CACHED_BUFFER_NAME);
 		}

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java	2006-12-20 17:55:10 UTC (rev 2696)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java	2006-12-20 19:19:56 UTC (rev 2697)
@@ -144,17 +144,6 @@
 		}
 	}
 
-	public static ParameterDeclaration getAutoResultSizeParameter(MethodDeclaration method) {
-		ParameterDeclaration result = null;
-		for (ParameterDeclaration param : method.getParameters())
-			if (param.getAnnotation(AutoResultSize.class) != null) {
-				if (result != null)
-					throw new RuntimeException(method + " contains multiple AutoResultSize annotations");
-				result = param;
-			}
-		return result;
-	}
-
 	public static AnnotationMirror getParameterAutoAnnotation(ParameterDeclaration param) {
 		for (AnnotationMirror annotation : param.getAnnotationMirrors())
 			if (NativeTypeTranslator.getAnnotation(annotation, Auto.class) != null)
@@ -210,7 +199,7 @@
 	}
 
 	public static boolean needResultSize(MethodDeclaration method) {
-		return getNIOBufferType(getMethodReturnType(method)) != null && getAutoResultSizeParameter(method) == null;
+		return getNIOBufferType(getMethodReturnType(method)) != null && method.getAnnotation(AutoResultSize.class) == null;
 	}
 	
 	public static void printExtraCallArguments(PrintWriter writer, MethodDeclaration method, String size_parameter_name) {


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

Revision: 2696
          http://svn.sourceforge.net/java-game-lib/?rev=2696&view=rev
Author:   elias_naur
Date:     2006-12-20 09:55:10 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
Check cached buffer results in OpenGL functions for matching capacity

Modified Paths:
--------------
    trunk/LWJGL/src/native/common/common_tools.h
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java

Modified: trunk/LWJGL/src/native/common/common_tools.h
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.h	2006-12-18 18:27:15 UTC (rev 2695)
+++ trunk/LWJGL/src/native/common/common_tools.h	2006-12-20 17:55:10 UTC (rev 2696)
@@ -89,7 +89,8 @@
 static inline jobject safeNewBufferCached(JNIEnv *env, void *p, int size, jobject old_buffer) {
 	if (old_buffer != NULL) {
 		void *old_buffer_address = (*env)->GetDirectBufferAddress(env, old_buffer);
-		if (old_buffer_address == p)
+		jlong capacity = (*env)->GetDirectBufferCapacity(env, old_buffer);
+		if (old_buffer_address == p && capacity == size)
 			return old_buffer;
 	}
 	return safeNewBuffer(env, p, size);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2006-12-18 18:27:15 UTC (rev 2695)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2006-12-20 17:55:10 UTC (rev 2696)
@@ -110,7 +110,7 @@
 	 * ByteBuffer mapped_buffer; mapped_buffer = glMapBufferARB(..., ..., ..., null); ... // Another map on the same buffer mapped_buffer = glMapBufferARB(..., ..., ..., mapped_buffer);
 	 *
 	 * @param result_size   The size of the buffer area.
-	 * @param old_buffer    A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and no new buffer will be created. In that case, size is ignored.
+	 * @param old_buffer    A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no new buffer will be created.
 	 *
 	 * @return A ByteBuffer representing the mapped buffer memory.
 	 */

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java	2006-12-18 18:27:15 UTC (rev 2695)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java	2006-12-20 17:55:10 UTC (rev 2696)
@@ -44,9 +44,8 @@
 	 * new ByteBuffer is created.
 	 *
 	 * @param result_size   The size of the buffer area.
-	 * @param old_buffer    A ByteBuffer. If this argument points to the same address as the new mapping,
-	 *                      it will be returned and no new buffer will be created. In that case, size is
-	 *                      ignored.
+	 * @param old_buffer    A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping,
+	 *                      it will be returned and no new buffer will be created.
 	 *
 	 * @return A ByteBuffer representing the mapped object buffer memory.
 	 */

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2006-12-18 18:27:15 UTC (rev 2695)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2006-12-20 17:55:10 UTC (rev 2696)
@@ -116,8 +116,8 @@
 	 * mapped_buffer = glMapBuffer(..., ..., ..., mapped_buffer);
 	 *
 	 * @param result_size	The size of the buffer area.
-	 * @param old_buffer	A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and no
-	 *                  new buffer will be created. In that case, size is ignored.
+	 * @param old_buffer	A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no
+	 *                  new buffer will be created.
 	 *
 	 * @return A ByteBuffer representing the mapped buffer memory.
 	 */


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