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

Revision: 2346
Author:   elias_naur
Date:     2006-05-30 05:41:49 -0700 (Tue, 30 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2346&view=rev

Log Message:
-----------
Change AWTGLCanvas paint() to make current and release the context to avoid problems with different AWT event threads calling paint()

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2006-05-30 08:48:16 UTC (rev 2345)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2006-05-30 12:41:49 UTC (rev 2346)
@@ -270,13 +270,16 @@
 					context.makeCurrent();
 					initGL();
 				}
-				if (!context.isCurrent())
-					context.makeCurrent();
-				if (update_context) {
-					context.update();
-					update_context = false;
+				context.makeCurrent();
+				try {
+					if (update_context) {
+						context.update();
+						update_context = false;
+					}
+					paintGL();
+				} finally {
+					Context.releaseCurrentContext();
 				}
-				paintGL();
 			} finally {
 				peer_info.unlock();
 			}


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

Revision: 2345
Author:   elias_naur
Date:     2006-05-30 01:48:16 -0700 (Tue, 30 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2345&view=rev

Log Message:
-----------
Win32: Track directinput mouse buttons in the windows message state array. This should avoid some problems when switching from grabbed to non-grabbed

Modified Paths:
--------------
    trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c
Modified: trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c	2006-05-29 19:03:02 UTC (rev 2344)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c	2006-05-30 08:48:16 UTC (rev 2345)
@@ -506,6 +506,9 @@
 		}
 		for (j = 0; j < num_buttons; j++) {
 			buttons_buffer[j] = diMouseState.rgbButtons[j] != 0 ? JNI_TRUE : JNI_FALSE;
+			// track the button state in the windows message buffer state array
+			// to get accurate button information when releasing a grab
+			win32_message_button_states[j] = buttons_buffer[j];
 		}
 	} else {
 		coords[2] = accum_dwheel;


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

Revision: 2344
Author:   elias_naur
Date:     2006-05-29 12:03:02 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2344&view=rev

Log Message:
-----------
Linux: Added Xfixes to the list of libraries liblwjgl.so statically links to

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/Makefile
    trunk/LWJGL/src/native/linux/Makefile.amd64
Modified: trunk/LWJGL/src/native/linux/Makefile
===================================================================
--- trunk/LWJGL/src/native/linux/Makefile	2006-05-29 12:30:23 UTC (rev 2343)
+++ trunk/LWJGL/src/native/linux/Makefile	2006-05-29 19:03:02 UTC (rev 2344)
@@ -4,7 +4,7 @@
 LINKER=gcc
 STRIP=strip
 CFLAGS_LINK=-Wl,--version-script=lwjgl.map -O2 -shared -Wall
-LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared
+LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared
 CFLAGS_O=-fPIC -O2 -D_X11 -Wall -std=c99 -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
 SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
 OBJECTS=$(subst .c,.o,$(SRC))

Modified: trunk/LWJGL/src/native/linux/Makefile.amd64
===================================================================
--- trunk/LWJGL/src/native/linux/Makefile.amd64	2006-05-29 12:30:23 UTC (rev 2343)
+++ trunk/LWJGL/src/native/linux/Makefile.amd64	2006-05-29 19:03:02 UTC (rev 2344)
@@ -4,7 +4,7 @@
 LINKER=gcc
 STRIP=strip
 CFLAGS_LINK=-fPIC -shared -Wall
-LIBS=-L/usr/X11R6/lib64 -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/amd64 -ljawt -lXxf86vm -Wl,-static,-lXcursor,-lXrender,-lXrandr,-call_shared
+LIBS=-L/usr/X11R6/lib64 -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/amd64 -ljawt -lXxf86vm -Wl,-static,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared
 CFLAGS_O=-fPIC -O2 -D_X11 -Wall -std=c99 -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
 SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
 OBJECTS=$(subst .c,.o,$(SRC))


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

Revision: 2343
Author:   elias_naur
Date:     2006-05-29 05:30:23 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2343&view=rev

Log Message:
-----------
Split out the exception case in BufferChecks.checkBufferSize() to help the JVM inline it

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
Modified: trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2006-05-29 12:24:46 UTC (rev 2342)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2006-05-29 12:30:23 UTC (rev 2343)
@@ -178,6 +178,13 @@
 	}
 
 	/**
+	 * This is a separate call to help inline checkBufferSize.
+	 */
+	private static void throwBufferSizeException(Buffer buf, int size) {
+		throw new IllegalArgumentException("Number of remaining buffer elements is " + buf.remaining() + ", must be at least " + size);
+	}
+			
+	/**
 	 * Helper method to ensure a buffer is big enough to receive data from a
 	 * glGet* operation.
 	 *
@@ -189,7 +196,7 @@
 	 */
 	private static void checkBufferSize(Buffer buf, int size) {
 		if (buf.remaining() < size) {
-			throw new IllegalArgumentException("Number of remaining buffer elements is " + buf.remaining() + ", must be at least " + size);
+			throwBufferSizeException(buf, size);
 		}
 	}
 


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

Revision: 2342
Author:   elias_naur
Date:     2006-05-29 05:24:46 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2342&view=rev

Log Message:
-----------
Saved one getClientAttribStack() in StateTracker.pushAttrib()

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java	2006-05-26 12:58:37 UTC (rev 2341)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java	2006-05-29 12:24:46 UTC (rev 2342)
@@ -53,8 +53,9 @@
 	}
 	
 	static void pushAttrib(int mask) {
-		getClientAttribStack().pushState();
-		getClientAttribStack().setState(mask);
+		StateStack attrib_stack = getClientAttribStack();
+		attrib_stack.pushState();
+		attrib_stack.setState(mask);
 		if ((mask & GL11.GL_CLIENT_VERTEX_ARRAY_BIT) != 0) {
 			getReferencesStack().pushState();
 		}


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

Revision: 2341
Author:   spasi
Date:     2006-05-26 05:58:37 -0700 (Fri, 26 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2341&view=rev

Log Message:
-----------
Fixed i64 suffixes

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java	2006-05-25 13:03:35 UTC (rev 2340)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java	2006-05-26 12:58:37 UTC (rev 2341)
@@ -136,9 +136,9 @@
 		else if (annotation_type.equals(GLhalf.class))
 			return "h";
 		else if (annotation_type.equals(GLuint64EXT.class))
-			return "l";
+			return "i64";
 		else if (annotation_type.equals(GLint64EXT.class))
-			return "l";
+			return "i64";
 		else if (annotation_type.equals(GLboolean.class) || annotation_type.equals(GLvoid.class))
 			return "";
 		else

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java	2006-05-25 13:03:35 UTC (rev 2340)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java	2006-05-26 12:58:37 UTC (rev 2341)
@@ -153,7 +153,7 @@
 				type = "b";
 				break;
 			case LONG:
-				type = "l";
+				type = "i64";
 				break;
 			default:
 				throw new RuntimeException(kind + " is not allowed");
@@ -179,4 +179,4 @@
 	public void visitWildcardType(WildcardType t) {
 		throw new RuntimeException(t + " is not allowed");
 	}
-}
+}
\ No newline at end of file


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

Revision: 2340
Author:   spasi
Date:     2006-05-25 06:03:35 -0700 (Thu, 25 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2340&view=rev

Log Message:
-----------
Added EXT_timer_query extension
Added support for long (int64) types

Modified Paths:
--------------
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBOcclusionQuery.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/NVOcclusionQuery.java
    trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
    trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/TypeInfo.java
    trunk/LWJGL/src/native/common/extgl.h
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_text_fragment_shader.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_occlusion_query.java

Added Paths:
-----------
    trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTimerQuery.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64EXT.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64EXT.java
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTimerQuery.c
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_timer_query.java
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBOcclusionQuery.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBOcclusionQuery.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBOcclusionQuery.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -69,7 +69,7 @@
 	public static void glGetQueryARB(int target, int pname, IntBuffer params) {
 		long function_pointer = GLContext.getCapabilities().ARB_occlusion_query_glGetQueryivARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 4);
+		BufferChecks.checkBuffer(params, 1);
 		nglGetQueryivARB(target, pname, params, params.position(), function_pointer);
 	}
 	private static native void nglGetQueryivARB(int target, int pname, IntBuffer params, int params_position, long function_pointer);
@@ -77,7 +77,7 @@
 	public static void glGetQueryObjectARB(int id, int pname, IntBuffer params) {
 		long function_pointer = GLContext.getCapabilities().ARB_occlusion_query_glGetQueryObjectivARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 4);
+		BufferChecks.checkBuffer(params, 1);
 		nglGetQueryObjectivARB(id, pname, params, params.position(), function_pointer);
 	}
 	private static native void nglGetQueryObjectivARB(int id, int pname, IntBuffer params, int params_position, long function_pointer);
@@ -85,7 +85,7 @@
 	public static void glGetQueryObjectuARB(int id, int pname, IntBuffer params) {
 		long function_pointer = GLContext.getCapabilities().ARB_occlusion_query_glGetQueryObjectuivARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 4);
+		BufferChecks.checkBuffer(params, 1);
 		nglGetQueryObjectuivARB(id, pname, params, params.position(), function_pointer);
 	}
 	private static native void nglGetQueryObjectuivARB(int id, int pname, IntBuffer params, int params_position, long function_pointer);

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -8,9 +8,9 @@
 
 public final class ATITextFragmentShader {
 	/**
-	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
-	 * and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
-	 * and GetDoublev, and by the <target> parameter of ProgramStringARB,
+	 * Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled,
+	 * and by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev, and by the &lt;target&gt; parameter of ProgramStringARB,
 	 * BindProgramARB, ProgramEnvParameter4{d,dv,f,fv}ARB,
 	 * ProgramLocalParameter4{d,dv,f,fv}ARB,
 	 * GetProgramEnvParameter{dv,fv}ARB, GetProgramLocalParameter{dv,fv}ARB,

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -98,6 +98,7 @@
 	public final boolean GL_EXT_texture_mirror_clamp;
 	public final boolean GL_EXT_texture_rectangle;
 	public final boolean GL_EXT_texture_sRGB;
+	public final boolean GL_EXT_timer_query;
 	public final boolean GL_EXT_vertex_shader;
 	public final boolean GL_EXT_vertex_weighting;
 	public final boolean OpenGL11;
@@ -460,6 +461,8 @@
 	long EXT_secondary_color_glSecondaryColorPointerEXT_pointer;
 	long EXT_stencil_clear_tag_glStencilClearTagEXT_pointer;
 	long EXT_stencil_two_side_glActiveStencilFaceEXT_pointer;
+	long EXT_timer_query_glGetQueryObjecti64vEXT_pointer;
+	long EXT_timer_query_glGetQueryObjectui64vEXT_pointer;
 	long EXT_vertex_shader_glBeginVertexShaderEXT_pointer;
 	long EXT_vertex_shader_glEndVertexShaderEXT_pointer;
 	long EXT_vertex_shader_glBindVertexShaderEXT_pointer;
@@ -1477,6 +1480,12 @@
 			(EXT_stencil_two_side_glActiveStencilFaceEXT_pointer = GLContext.getFunctionAddress("glActiveStencilFaceEXT")) != 0;
 	}
 
+	private boolean EXT_timer_query_initNativeFunctionAddresses() {
+		return 
+			(EXT_timer_query_glGetQueryObjecti64vEXT_pointer = GLContext.getFunctionAddress("glGetQueryObjecti64vEXT")) != 0 &&
+			(EXT_timer_query_glGetQueryObjectui64vEXT_pointer = GLContext.getFunctionAddress("glGetQueryObjectui64vEXT")) != 0;
+	}
+
 	private boolean EXT_vertex_shader_initNativeFunctionAddresses() {
 		return 
 			(EXT_vertex_shader_glBeginVertexShaderEXT_pointer = GLContext.getFunctionAddress("glBeginVertexShaderEXT")) != 0 &&
@@ -2198,6 +2207,8 @@
 			supported_extensions.remove("GL_EXT_stencil_clear_tag");
 		if (supported_extensions.contains("GL_EXT_stencil_two_side") && !EXT_stencil_two_side_initNativeFunctionAddresses())
 			supported_extensions.remove("GL_EXT_stencil_two_side");
+		if (supported_extensions.contains("GL_EXT_timer_query") && !EXT_timer_query_initNativeFunctionAddresses())
+			supported_extensions.remove("GL_EXT_timer_query");
 		if (supported_extensions.contains("GL_EXT_vertex_shader") && !EXT_vertex_shader_initNativeFunctionAddresses())
 			supported_extensions.remove("GL_EXT_vertex_shader");
 		if (supported_extensions.contains("GL_EXT_vertex_weighting") && !EXT_vertex_weighting_initNativeFunctionAddresses())
@@ -2339,6 +2350,7 @@
 		this.GL_EXT_texture_mirror_clamp = supported_extensions.contains("GL_EXT_texture_mirror_clamp");
 		this.GL_EXT_texture_rectangle = supported_extensions.contains("GL_EXT_texture_rectangle");
 		this.GL_EXT_texture_sRGB = supported_extensions.contains("GL_EXT_texture_sRGB");
+		this.GL_EXT_timer_query = supported_extensions.contains("GL_EXT_timer_query");
 		this.GL_EXT_vertex_shader = supported_extensions.contains("GL_EXT_vertex_shader");
 		this.GL_EXT_vertex_weighting = supported_extensions.contains("GL_EXT_vertex_weighting");
 		this.OpenGL11 = supported_extensions.contains("OpenGL11");

Added: trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTimerQuery.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTimerQuery.java	                        (rev 0)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTimerQuery.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -0,0 +1,35 @@
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+package org.lwjgl.opengl;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.BufferChecks;
+import java.nio.*;
+
+public final class EXTTimerQuery {
+	/**
+	 * Accepted by the &lt;target&gt; parameter of BeginQuery, EndQuery, and
+	 * GetQueryiv:
+	 */
+	public static final int GL_TIME_ELAPSED_EXT = 0x88bf;
+
+	private EXTTimerQuery() {
+	}
+
+
+	public static void glGetQueryObjecti64EXT(int id, int pname, LongBuffer params) {
+		long function_pointer = GLContext.getCapabilities().EXT_timer_query_glGetQueryObjecti64vEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkBuffer(params, 1);
+		nglGetQueryObjecti64vEXT(id, pname, params, params.position(), function_pointer);
+	}
+	private static native void nglGetQueryObjecti64vEXT(int id, int pname, LongBuffer params, int params_position, long function_pointer);
+
+	public static void glGetQueryObjectui64EXT(int id, int pname, LongBuffer params) {
+		long function_pointer = GLContext.getCapabilities().EXT_timer_query_glGetQueryObjectui64vEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkBuffer(params, 1);
+		nglGetQueryObjectui64vEXT(id, pname, params, params.position(), function_pointer);
+	}
+	private static native void nglGetQueryObjectui64vEXT(int id, int pname, LongBuffer params, int params_position, long function_pointer);
+}

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -279,7 +279,7 @@
 	public static void glGetQuery(int target, int pname, IntBuffer params) {
 		long function_pointer = GLContext.getCapabilities().GL15_glGetQueryiv_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 4);
+		BufferChecks.checkBuffer(params, 1);
 		nglGetQueryiv(target, pname, params, params.position(), function_pointer);
 	}
 	private static native void nglGetQueryiv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
@@ -287,7 +287,7 @@
 	public static void glGetQueryObject(int id, int pname, IntBuffer params) {
 		long function_pointer = GLContext.getCapabilities().GL15_glGetQueryObjectiv_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 4);
+		BufferChecks.checkBuffer(params, 1);
 		nglGetQueryObjectiv(id, pname, params, params.position(), function_pointer);
 	}
 	private static native void nglGetQueryObjectiv(int id, int pname, IntBuffer params, int params_position, long function_pointer);
@@ -295,7 +295,7 @@
 	public static void glGetQueryObjectu(int id, int pname, IntBuffer params) {
 		long function_pointer = GLContext.getCapabilities().GL15_glGetQueryObjectuiv_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 4);
+		BufferChecks.checkBuffer(params, 1);
 		nglGetQueryObjectuiv(id, pname, params, params.position(), function_pointer);
 	}
 	private static native void nglGetQueryObjectuiv(int id, int pname, IntBuffer params, int params_position, long function_pointer);

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVOcclusionQuery.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVOcclusionQuery.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVOcclusionQuery.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -59,7 +59,7 @@
 	public static void glGetOcclusionQueryuNV(int id, int pname, IntBuffer params) {
 		long function_pointer = GLContext.getCapabilities().NV_occlusion_query_glGetOcclusionQueryuivNV_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 4);
+		BufferChecks.checkBuffer(params, 1);
 		nglGetOcclusionQueryuivNV(id, pname, params, params.position(), function_pointer);
 	}
 	private static native void nglGetOcclusionQueryuivNV(int id, int pname, IntBuffer params, int params_position, long function_pointer);
@@ -67,7 +67,7 @@
 	public static void glGetOcclusionQueryNV(int id, int pname, IntBuffer params) {
 		long function_pointer = GLContext.getCapabilities().NV_occlusion_query_glGetOcclusionQueryivNV_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 4);
+		BufferChecks.checkBuffer(params, 1);
 		nglGetOcclusionQueryivNV(id, pname, params, params.position(), function_pointer);
 	}
 	private static native void nglGetOcclusionQueryivNV(int id, int pname, IntBuffer params, int params_position, long function_pointer);

Modified: trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -37,6 +37,7 @@
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
+import java.nio.LongBuffer;
 
 /**
  * <p>A class to check buffer boundaries in general. If there is unsufficient space
@@ -46,7 +47,7 @@
  * @author cix_foo <ci...@us...>
  * @author elias_naur <eli...@us...>
  * @version $Revision$
- * $Id$ 
+ * $Id$
  */
 public class BufferChecks {
 	/** Static methods only! */
@@ -80,7 +81,7 @@
 		if (o == null)
 			throw new IllegalArgumentException("Null argument");
 	}
-	
+
 	/**
 	 * Helper methods to ensure a buffer is direct or null.
 	 */
@@ -90,24 +91,30 @@
 		}
 	}
 
-	public static void checkDirectOrNull(FloatBuffer buf) {
+	public static void checkDirectOrNull(ShortBuffer buf) {
 		if (buf != null) {
 			checkDirect(buf);
 		}
 	}
 
-	public static void checkDirectOrNull(ShortBuffer buf) {
+	public static void checkDirectOrNull(IntBuffer buf) {
 		if (buf != null) {
 			checkDirect(buf);
 		}
 	}
 
-	public static void checkDirectOrNull(IntBuffer buf) {
+	public static void checkDirectOrNull(LongBuffer buf) {
 		if (buf != null) {
 			checkDirect(buf);
 		}
 	}
 
+	public static void checkDirectOrNull(FloatBuffer buf) {
+		if (buf != null) {
+			checkDirect(buf);
+		}
+	}
+
 	public static void checkDirectOrNull(DoubleBuffer buf) {
 		if (buf != null) {
 			checkDirect(buf);
@@ -118,14 +125,16 @@
 	 * Helper methods to ensure a buffer is direct (and, implicitly, non-null).
 	 */
 	public static void checkDirectBuffer(Buffer buf) {
-		if (buf instanceof ByteBuffer)
+		if (buf instanceof FloatBuffer)
+			checkDirect((FloatBuffer)buf);
+		else if (buf instanceof ByteBuffer)
 			checkDirect((ByteBuffer)buf);
 		else if (buf instanceof ShortBuffer)
 			checkDirect((ShortBuffer)buf);
 		else if (buf instanceof IntBuffer)
 			checkDirect((IntBuffer)buf);
-		else if (buf instanceof FloatBuffer)
-			checkDirect((FloatBuffer)buf);
+		else if (buf instanceof LongBuffer)
+			checkDirect((LongBuffer)buf);
 		else if (buf instanceof DoubleBuffer)
 			checkDirect((DoubleBuffer)buf);
 		else
@@ -138,12 +147,6 @@
 		}
 	}
 
-	public static void checkDirect(FloatBuffer buf) {
-		if (!buf.isDirect()) {
-			throw new IllegalArgumentException("FloatBuffer is not direct");
-		}
-	}
-
 	public static void checkDirect(ShortBuffer buf) {
 		if (!buf.isDirect()) {
 			throw new IllegalArgumentException("ShortBuffer is not direct");
@@ -156,9 +159,21 @@
 		}
 	}
 
+	public static void checkDirect(LongBuffer buf) {
+		if (!buf.isDirect()) {
+			throw new IllegalArgumentException("LongBuffer is not direct");
+		}
+	}
+
+	public static void checkDirect(FloatBuffer buf) {
+		if (!buf.isDirect()) {
+			throw new IllegalArgumentException("FloatBuffer is not direct");
+		}
+	}
+
 	public static void checkDirect(DoubleBuffer buf) {
 		if (!buf.isDirect()) {
-			throw new IllegalArgumentException("IntBuffer is not direct");
+			throw new IllegalArgumentException("DoubleBuffer is not direct");
 		}
 	}
 
@@ -183,12 +198,17 @@
 		checkDirect(buf);
 	}
 
+	public static void checkBuffer(ShortBuffer buf, int size) {
+		checkBufferSize(buf, size);
+		checkDirect(buf);
+	}
+
 	public static void checkBuffer(IntBuffer buf, int size) {
 		checkBufferSize(buf, size);
 		checkDirect(buf);
 	}
 
-	public static void checkBuffer(ShortBuffer buf, int size) {
+	public static void checkBuffer(LongBuffer buf, int size) {
 		checkBufferSize(buf, size);
 		checkDirect(buf);
 	}
@@ -221,14 +241,18 @@
 		checkBuffer(buf, DEFAULT_BUFFER_SIZE);
 	}
 
-	public static void checkBuffer(FloatBuffer buf) {
+	public static void checkBuffer(IntBuffer buf) {
 		checkBuffer(buf, DEFAULT_BUFFER_SIZE);
 	}
 
-	public static void checkBuffer(IntBuffer buf) {
+	public static void checkBuffer(LongBuffer buf) {
 		checkBuffer(buf, DEFAULT_BUFFER_SIZE);
 	}
 
+	public static void checkBuffer(FloatBuffer buf) {
+		checkBuffer(buf, DEFAULT_BUFFER_SIZE);
+	}
+
 	public static void checkBuffer(DoubleBuffer buf) {
 		checkBuffer(buf, DEFAULT_BUFFER_SIZE);
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -1,31 +1,31 @@
-/* 
+/*
  * Copyright (c) 2002-2004 LWJGL Project
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
+ * modification, are permitted provided that the following conditions are
  * met:
- * 
- * * Redistributions of source code must retain the above copyright 
+ *
+ * * Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  *
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
@@ -50,16 +50,16 @@
  */
 
 public final class BufferUtils {
-	
+
 	/**
 	 * Construct a direct native-ordered bytebuffer with the specified size.
 	 * @param size The size, in bytes
 	 * @return a ByteBuffer
-	 */	
+	 */
 	public static ByteBuffer createByteBuffer(int size) {
 		return ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder());
 	}
-	
+
 	/**
 	 * Construct a direct native-order shortbuffer with the specified number
 	 * of elements.
@@ -81,6 +81,16 @@
 	}
 
 	/**
+	 * Construct a direct native-order intbuffer with the specified number
+	 * of elements.
+	 * @param size The size, in ints
+	 * @return an IntBuffer
+	 */
+	public static LongBuffer createLongBuffer(int size) {
+		return createByteBuffer(size << 3).asLongBuffer();
+	}
+
+	/**
 	 * Construct a direct native-order floatbuffer with the specified number
 	 * of elements.
 	 * @param size The size, in floats
@@ -91,6 +101,16 @@
 	}
 
 	/**
+	 * Construct a direct native-order doublebuffer with the specified number
+	 * of elements.
+	 * @param size The size, in floats
+	 * @return a FloatBuffer
+	 */
+	public static DoubleBuffer createDoubleBuffer(int size) {
+		return createByteBuffer(size << 3).asDoubleBuffer();
+	}
+
+	/**
 	 * @return n, where buffer_element_size=2^n.
 	 */
 	public static int getElementSizeExponent(Buffer buf) {
@@ -107,16 +127,6 @@
 	}
 
 	/**
-	 * Construct a direct native-order doublebuffer with the specified number
-	 * of elements.
-	 * @param size The size, in floats
-	 * @return a FloatBuffer
-	 */
-	public static DoubleBuffer createDoubleBuffer(int size) {
-		return createByteBuffer(size << 3).asDoubleBuffer();
-	}
-	
-	/**
 	 * A helper function which is used to get the byte offset in an arbitrary buffer
 	 * based on its position
 	 * @return the position of the buffer, in BYTES

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -76,6 +76,8 @@
 		native_types_to_primitive.put(GLsizeiptrARB.class, PrimitiveType.Kind.LONG);
 		native_types_to_primitive.put(GLubyte.class, PrimitiveType.Kind.BYTE);
 		native_types_to_primitive.put(GLvoid.class, PrimitiveType.Kind.BYTE);
+		native_types_to_primitive.put(GLint64EXT.class, PrimitiveType.Kind.LONG);
+		native_types_to_primitive.put(GLuint64EXT.class, PrimitiveType.Kind.LONG);
 	}
 
 	public PrimitiveType.Kind getPrimitiveTypeFromNativeType(Class native_type) {
@@ -106,6 +108,10 @@
 			return Signedness.UNSIGNED;
 		else if (GLbyte.class.equals(type))
 			return Signedness.SIGNED;
+		else if (GLuint64EXT.class.equals(type))
+			return Signedness.UNSIGNED;
+		else if (GLint64EXT.class.equals(type))
+			return Signedness.SIGNED;
 		else
 			return Signedness.NONE;
 	}
@@ -129,6 +135,10 @@
 			return "d";
 		else if (annotation_type.equals(GLhalf.class))
 			return "h";
+		else if (annotation_type.equals(GLuint64EXT.class))
+			return "l";
+		else if (annotation_type.equals(GLint64EXT.class))
+			return "l";
 		else if (annotation_type.equals(GLboolean.class) || annotation_type.equals(GLvoid.class))
 			return "";
 		else
@@ -153,6 +163,9 @@
 			case BYTE:
 				type = GLbyte.class;
 				break;
+			case LONG:
+				type = GLint64EXT.class;
+				break;
 			case BOOLEAN:
 				type = GLboolean.class;
 				break;
@@ -182,13 +195,15 @@
 			return new Class[]{GLhalf.class, GLshort.class, GLushort.class};
 		else if (type.equals(DoubleBuffer.class))
 			return new Class[]{GLclampd.class, GLdouble.class};
+		else if (type.equals(LongBuffer.class))
+			return new Class[]{GLint64EXT.class, GLuint64EXT.class};
 		else
 			return new Class[]{};
 	}
 
 	private static Class[] getValidPrimitiveTypes(Class type) {
-		if (type.equals(long .class))
-			return new Class[]{GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class};
+		if (type.equals(long.class))
+			return new Class[]{GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class, GLint64EXT.class, GLuint64EXT.class};
 		else if (type.equals(int.class))
 			return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLuint.class,
 							GLsizei.class};
@@ -242,6 +257,10 @@
 			return GLbyte.class;
 		else if (GLbyte.class.equals(type))
 			return GLubyte.class;
+		else if (GLuint64EXT.class.equals(type))
+			return GLint64EXT.class;
+		else if (GLint64EXT.class.equals(type))
+			return GLuint64EXT.class;
 		else
 			return null;
 	}

Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64EXT.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64EXT.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64EXT.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.util.generator;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@NativeType
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+public @interface GLint64EXT {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64EXT.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64EXT.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64EXT.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.util.generator;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@NativeType
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+public @interface GLuint64EXT {
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -106,6 +106,8 @@
 			return PrimitiveType.Kind.BYTE;
 		else if (FloatBuffer.class.equals(c))
 			return PrimitiveType.Kind.FLOAT;
+		else if (LongBuffer.class.equals(c))
+			return PrimitiveType.Kind.LONG;
 		else
 			throw new RuntimeException(c + " is not allowed");
 	}
@@ -183,7 +185,7 @@
 	public void visitReferenceType(ReferenceType t) {
 		throw new RuntimeException(t + " is not allowed");
 	}
-	
+
 	public void visitTypeMirror(TypeMirror t) {
 		throw new RuntimeException(t + " is not allowed");
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/PostfixTranslator.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -81,6 +81,8 @@
 			return PrimitiveType.Kind.BYTE;
 		else if (FloatBuffer.class.equals(c))
 			return PrimitiveType.Kind.FLOAT;
+		else if (LongBuffer.class.equals(c))
+			return PrimitiveType.Kind.LONG;
 		else
 			throw new RuntimeException(c + " is not allowed");
 	}
@@ -150,6 +152,9 @@
 			case BYTE:
 				type = "b";
 				break;
+			case LONG:
+				type = "l";
+				break;
 			default:
 				throw new RuntimeException(kind + " is not allowed");
 		}

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/TypeInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/TypeInfo.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/TypeInfo.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -116,6 +116,9 @@
 			case SHORT:
 				type = ShortBuffer.class;
 				break;
+			case LONG:
+				type = LongBuffer.class;
+				break;
 			case BYTE: /* fall through */
 			case BOOLEAN:
 				type = ByteBuffer.class;

Modified: trunk/LWJGL/src/native/common/extgl.h
===================================================================
--- trunk/LWJGL/src/native/common/extgl.h	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/native/common/extgl.h	2006-05-25 13:03:35 UTC (rev 2340)
@@ -107,37 +107,37 @@
 /* OpenGL 1.1 definition */
 
 #ifdef _MACOSX
-typedef unsigned long GLenum;
-typedef unsigned char GLboolean;
-typedef unsigned long GLbitfield;
-typedef signed char GLbyte;
-typedef short GLshort;
-typedef long GLint;
-typedef long GLsizei;
-typedef unsigned char GLubyte;
-typedef unsigned short GLushort;
-typedef unsigned long GLuint;
-typedef float GLfloat;
-typedef float GLclampf;
-typedef double GLdouble;
-typedef double GLclampd;
-typedef void GLvoid;
+	typedef unsigned long GLenum;
+	typedef unsigned char GLboolean;
+	typedef unsigned long GLbitfield;
+	typedef signed char GLbyte;
+	typedef short GLshort;
+	typedef long GLint;
+	typedef long GLsizei;
+	typedef unsigned char GLubyte;
+	typedef unsigned short GLushort;
+	typedef unsigned long GLuint;
+	typedef float GLfloat;
+	typedef float GLclampf;
+	typedef double GLdouble;
+	typedef double GLclampd;
+	typedef void GLvoid;
 #else
-typedef unsigned int GLenum;
-typedef unsigned char GLboolean;
-typedef unsigned int GLbitfield;
-typedef signed char GLbyte;
-typedef short GLshort;
-typedef int GLint;
-typedef int GLsizei;
-typedef unsigned char GLubyte;
-typedef unsigned short GLushort;
-typedef unsigned int GLuint;
-typedef float GLfloat;
-typedef float GLclampf;
-typedef double GLdouble;
-typedef double GLclampd;
-typedef void GLvoid;
+	typedef unsigned int GLenum;
+	typedef unsigned char GLboolean;
+	typedef unsigned int GLbitfield;
+	typedef signed char GLbyte;
+	typedef short GLshort;
+	typedef int GLint;
+	typedef int GLsizei;
+	typedef unsigned char GLubyte;
+	typedef unsigned short GLushort;
+	typedef unsigned int GLuint;
+	typedef float GLfloat;
+	typedef float GLclampf;
+	typedef double GLdouble;
+	typedef double GLclampd;
+	typedef void GLvoid;
 #endif
 
 // OpenGL 2.0 types
@@ -155,6 +155,10 @@
 // NV_half_float types
 typedef unsigned short GLhalf;
 
+// EXT_timer_query types
+typedef unsigned long GLuint64EXT;
+typedef long GLint64EXT;
+
 /* helper stuff */
 
 /* initializes everything, call this right after the rc is created. the function returns true if successful */

Added: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTimerQuery.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTimerQuery.c	                        (rev 0)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTimerQuery.c	2006-05-25 13:03:35 UTC (rev 2340)
@@ -0,0 +1,20 @@
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+#include <jni.h>
+#include "extgl.h"
+
+typedef void (APIENTRY *glGetQueryObjecti64vEXTPROC) (GLuint id, GLenum pname, GLint64EXT * params);
+typedef void (APIENTRY *glGetQueryObjectui64vEXTPROC) (GLuint id, GLenum pname, GLuint64EXT * params);
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTTimerQuery_nglGetQueryObjecti64vEXT(JNIEnv *env, jclass clazz, jint id, jint pname, jobject params, jint params_position, jlong function_pointer) {
+	GLint64EXT *params_address = ((GLint64EXT *)(*env)->GetDirectBufferAddress(env, params)) + params_position;
+	glGetQueryObjecti64vEXTPROC glGetQueryObjecti64vEXT = (glGetQueryObjecti64vEXTPROC)((intptr_t)function_pointer);
+	glGetQueryObjecti64vEXT(id, pname, params_address);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTTimerQuery_nglGetQueryObjectui64vEXT(JNIEnv *env, jclass clazz, jint id, jint pname, jobject params, jint params_position, jlong function_pointer) {
+	GLuint64EXT *params_address = ((GLuint64EXT *)(*env)->GetDirectBufferAddress(env, params)) + params_position;
+	glGetQueryObjectui64vEXTPROC glGetQueryObjectui64vEXT = (glGetQueryObjectui64vEXTPROC)((intptr_t)function_pointer);
+	glGetQueryObjectui64vEXT(id, pname, params_address);
+}
+

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -67,11 +67,11 @@
 	void glEndQueryARB(@GLenum int target);
 
 	@StripPostfix("params")
-	void glGetQueryivARB(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
+	void glGetQueryivARB(@GLenum int target, @GLenum int pname, @Check("1") IntBuffer params);
 
 	@StripPostfix("params")
-	void glGetQueryObjectivARB(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params);
+	void glGetQueryObjectivARB(@GLuint int id, @GLenum int pname, @Check("1") IntBuffer params);
 
 	@StripPostfix("params")
-	void glGetQueryObjectuivARB(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params);
-}
+	void glGetQueryObjectuivARB(@GLuint int id, @GLenum int pname, @Check("1") IntBuffer params);
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_text_fragment_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_text_fragment_shader.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_text_fragment_shader.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -34,9 +34,9 @@
 public interface ATI_text_fragment_shader {
 
 	/**
-	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
-	 * and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
-	 * and GetDoublev, and by the <target> parameter of ProgramStringARB,
+	 * Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled,
+	 * and by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev, and by the &lt;target&gt; parameter of ProgramStringARB,
 	 * BindProgramARB, ProgramEnvParameter4{d,dv,f,fv}ARB,
 	 * ProgramLocalParameter4{d,dv,f,fv}ARB,
 	 * GetProgramEnvParameter{dv,fv}ARB, GetProgramLocalParameter{dv,fv}ARB,

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_timer_query.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_timer_query.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_timer_query.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.*;
+
+public interface EXT_timer_query {
+
+	/**
+	 * Accepted by the &lt;target&gt; parameter of BeginQuery, EndQuery, and
+	 * GetQueryiv:
+	 */
+	int GL_TIME_ELAPSED_EXT = 0x88BF;
+
+	@StripPostfix("params")
+	void glGetQueryObjecti64vEXT(@GLuint int id, @GLenum int pname, @Check("1") @GLint64EXT LongBuffer params);
+
+	@StripPostfix("params")
+	void glGetQueryObjectui64vEXT(@GLuint int id, @GLenum int pname, @Check("1") @GLuint64EXT LongBuffer params);
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -167,11 +167,11 @@
 	void glEndQuery(@GLenum int target);
 
 	@StripPostfix("params")
-	void glGetQueryiv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
+	void glGetQueryiv(@GLenum int target, @GLenum int pname, @Check("1") IntBuffer params);
 
 	@StripPostfix("params")
-	void glGetQueryObjectiv(@GLenum int id, @GLenum int pname, @Check("4") @GLint IntBuffer params);
+	void glGetQueryObjectiv(@GLenum int id, @GLenum int pname, @Check("1") @GLint IntBuffer params);
 
 	@StripPostfix("params")
-	void glGetQueryObjectuiv(@GLenum int id, @GLenum int pname, @Check("4") @GLuint IntBuffer params);
+	void glGetQueryObjectuiv(@GLenum int id, @GLenum int pname, @Check("1") @GLuint IntBuffer params);
 }

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_occlusion_query.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_occlusion_query.java	2006-05-18 12:11:37 UTC (rev 2339)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_occlusion_query.java	2006-05-25 13:03:35 UTC (rev 2340)
@@ -55,8 +55,8 @@
 	void glEndOcclusionQueryNV();
 
 	@StripPostfix("params")
-	void glGetOcclusionQueryuivNV(@GLuint int id, @GLenum int pname, @Check("4") @GLuint IntBuffer params);
+	void glGetOcclusionQueryuivNV(@GLuint int id, @GLenum int pname, @Check("1") @GLuint IntBuffer params);
 
 	@StripPostfix("params")
-	void glGetOcclusionQueryivNV(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params);
+	void glGetOcclusionQueryivNV(@GLuint int id, @GLenum int pname, @Check("1") IntBuffer params);
 }


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

Revision: 2339
Author:   elias_naur
Date:     2006-05-18 05:11:37 -0700 (Thu, 18 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2339&view=rev

Log Message:
-----------
Win32: Updated various native string handling to use the new _s "secure" variants.

Modified Paths:
--------------
    trunk/LWJGL/src/native/common/common_tools.c
    trunk/LWJGL/src/native/win32/display.c
    trunk/LWJGL/src/native/win32/org_lwjgl_Sys.c
Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2006-05-18 11:43:52 UTC (rev 2338)
+++ trunk/LWJGL/src/native/common/common_tools.c	2006-05-18 12:11:37 UTC (rev 2339)
@@ -83,7 +83,7 @@
 	char buffer[BUFFER_SIZE];
 	jstring str;
 #ifdef WIN32
-	_vsnprintf(buffer, BUFFER_SIZE, format, ap);
+	vsnprintf_s(buffer, BUFFER_SIZE, _TRUNCATE, format, ap);
 #else
 	vsnprintf(buffer, BUFFER_SIZE, format, ap);
 #endif

Modified: trunk/LWJGL/src/native/win32/display.c
===================================================================
--- trunk/LWJGL/src/native/win32/display.c	2006-05-18 11:43:52 UTC (rev 2338)
+++ trunk/LWJGL/src/native/win32/display.c	2006-05-18 12:11:37 UTC (rev 2339)
@@ -263,9 +263,11 @@
 
 jstring getVersion(JNIEnv * env, char *driver)
 {
+#define BUFFER_SIZE 1024
 	jstring ret = NULL;
 
-	TCHAR driverDLL[256] = "\0";
+	const char *dll_ext = ".dll";
+	TCHAR driverDLL[BUFFER_SIZE] = "\0";
 	DWORD var = 0;
 	DWORD dwInfoSize;
 	LPVOID lpInfoBuff;
@@ -274,8 +276,8 @@
 	if (driver == NULL) {
 		return NULL;
 	}
-	strcat(driverDLL, driver);
-	strcat(driverDLL, ".dll");
+	strncat_s(driverDLL, BUFFER_SIZE, driver, strlen(driver));
+	strncat_s(driverDLL, BUFFER_SIZE, dll_ext, strlen(dll_ext));
 	dwInfoSize = GetFileVersionInfoSize(driverDLL, &var);
 	lpInfoBuff = malloc(dwInfoSize);
 	bRetval = GetFileVersionInfo(driverDLL, 0, dwInfoSize, lpInfoBuff);
@@ -286,11 +288,11 @@
 		UINT uiLen = 0;
 		bRetval = VerQueryValue(lpInfoBuff, TEXT("\\"), (void **) &fxdFileInfo, &uiLen);
 		if (bRetval != 0) {
-			TCHAR version[256];
-			TCHAR ms[10], ls[10];
-			sprintf(ms, "%d.%d\0", fxdFileInfo->dwProductVersionMS >> 16, fxdFileInfo->dwProductVersionMS & 0xFFFF);
-			sprintf(ls, "%d.%d\0", fxdFileInfo->dwProductVersionLS >> 16, fxdFileInfo->dwProductVersionLS & 0xFFFF);
-			sprintf(version, "%s.%s\0", ms, ls);
+			TCHAR version[BUFFER_SIZE];
+			TCHAR ms[BUFFER_SIZE], ls[BUFFER_SIZE];
+			_snprintf_s(ms, BUFFER_SIZE, _TRUNCATE, "%d.%d\0", fxdFileInfo->dwProductVersionMS >> 16, fxdFileInfo->dwProductVersionMS & 0xFFFF);
+			_snprintf_s(ls, BUFFER_SIZE, _TRUNCATE, "%d.%d\0", fxdFileInfo->dwProductVersionLS >> 16, fxdFileInfo->dwProductVersionLS & 0xFFFF);
+			_snprintf_s(version, BUFFER_SIZE, _TRUNCATE, "%s.%s\0", ms, ls);
 			ret = NewStringNative(env, version);
 		}
 	}

Modified: trunk/LWJGL/src/native/win32/org_lwjgl_Sys.c
===================================================================
--- trunk/LWJGL/src/native/win32/org_lwjgl_Sys.c	2006-05-18 11:43:52 UTC (rev 2338)
+++ trunk/LWJGL/src/native/win32/org_lwjgl_Sys.c	2006-05-18 12:11:37 UTC (rev 2339)
@@ -101,15 +101,17 @@
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_NativeSysImplementation_openURL
   (JNIEnv * env, jobject ignored, jstring url)
 {
+#define BUFFER_SIZE 1024
+	const char *std_args = "rundll32 url.dll,FileProtocolHandler ";
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;
 
 	char * urlString = GetStringNativeChars(env, url);
 
-	char command[256];
-	strcpy(command, "");
-	strcat(command, "rundll32 url.dll,FileProtocolHandler ");
-	strncat(command, urlString, 200); // Prevent buffer overflow
+	char command[BUFFER_SIZE];
+	strncpy_s(command, BUFFER_SIZE, "", 1);
+	strncat_s(command, BUFFER_SIZE, std_args, _TRUNCATE);
+	strncat_s(command, BUFFER_SIZE, urlString, _TRUNCATE);
 	free(urlString);
 
 	ZeroMemory( &si, sizeof(si) );
@@ -140,8 +142,6 @@
 	return JNI_TRUE;
 }
 
-
-
 const void * getClipboard(int type)
 {
 


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

Revision: 2338
Author:   elias_naur
Date:     2006-05-18 04:43:52 -0700 (Thu, 18 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2338&view=rev

Log Message:
-----------
Win32: Update build.bat to use the free Visual Studio Express 2005 compiler. We can use the /delayload switch for the default build now.

Modified Paths:
--------------
    trunk/LWJGL/platform_build/win32_ms_cmdline/build.bat
Modified: trunk/LWJGL/platform_build/win32_ms_cmdline/build.bat
===================================================================
--- trunk/LWJGL/platform_build/win32_ms_cmdline/build.bat	2006-05-16 18:51:27 UTC (rev 2337)
+++ trunk/LWJGL/platform_build/win32_ms_cmdline/build.bat	2006-05-18 11:43:52 UTC (rev 2338)
@@ -6,23 +6,9 @@
 if "%ALHOME%" == "" goto erroralhome
 if "%DXHOME%" == "" goto errordxhome
 set COPTIONS=/Wp64 /I"%CHOME%\include" /I"%PLTSDKHOME%\include" /I"%DXHOME%\include" /I"%JAVA_HOME%\include" /I"%JAVA_HOME%\include\win32" /I"%ALHOME%\include" /I"..\..\src\native\common" /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LWJGL_EXPORTS" /D "_WINDLL"
-rem *************************************************
-rem ** Build using free compiler requires jawt.dll **
-rem ** and awt.dll in current dir. /delayload      **
-rem ** fixes this, but is not available in free		 **
-rem ** toolkit. Alternatively, remove AWT support  **
-rem ** all together (only works on win32)          **
-rem *************************************************
-set LINKEROPTS=/link /LIBPATH:"%JAVA_HOME%\lib" /LIBPATH:"%ALHOME%\libs" /LIBPATH:"%DXHOME%\Lib\x86" /LIBPATH:"%PLTSDKHOME%\Lib" /LIBPATH:"%CHOME%\Lib" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /MACHINE:X86 /NOLOGO /DLL
-set LIBS=dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib winmm.lib
 
-rem *************************************************
-rem ** Use the following lines below to build      **
-rem ** using the commercial toolkit which allows   **
-rem ** delayload option. \xEDe. Release build.        **
-rem *************************************************
-rem set LINKEROPTS=/link /LIBPATH:"%JAVA_HOME%\lib" /LIBPATH:"%ALHOME%\libs" /LIBPATH:"%DXHOME%\Lib" /LIBPATH:"%PLTSDKHOME%\Lib" /LIBPATH:"%CHOME%\Lib" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /MACHINE:X86 /NOLOGO /DLL /DELAYLOAD:jawt.dll
-rem set LIBS=Kernel32.lib dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib
+set LINKEROPTS=/link /LIBPATH:"%JAVA_HOME%\lib" /LIBPATH:"%ALHOME%\libs" /LIBPATH:"%DXHOME%\Lib\x86" /LIBPATH:"%PLTSDKHOME%\Lib" /LIBPATH:"%CHOME%\Lib" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /MACHINE:X86 /NOLOGO /DLL /DELAYLOAD:jawt.dll
+set LIBS=Kernel32.lib dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib
 
 for %%x in (..\..\src\native\win32\*.c) do cl %COPTIONS% %%x
 for %%x in (..\..\src\native\common\*.c) do cl %COPTIONS% %%x


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

Revision: 2336
Author:   elias_naur
Date:     2006-05-16 04:32:45 -0700 (Tue, 16 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2336&view=rev

Log Message:
-----------
Update doc/generator.txt

Modified Paths:
--------------
    trunk/LWJGL/doc/generator.txt
Modified: trunk/LWJGL/doc/generator.txt
===================================================================
--- trunk/LWJGL/doc/generator.txt	2006-05-16 07:58:16 UTC (rev 2335)
+++ trunk/LWJGL/doc/generator.txt	2006-05-16 11:32:45 UTC (rev 2336)
@@ -2,7 +2,7 @@
 --------------------------------------------------------------------
 
 OpenGL and OpenAL binding methods are now generated by the generator tool
-located in org.lwjgl.generator.*. This includes the OpenGL java source files in
+located in org.lwjgl.util.generator.*. This includes the OpenGL java source files in
 org.lwjgl.opengl.* and the OpenAL source files in org.lwjgl.openal.*. The
 generator itself is based on the Annotation Processing
 Tool, 'apt', bundled with the 1.5 JDK. The initial implementation is designed
@@ -19,7 +19,7 @@
 4. Changes in the naming convention (e.g., removing the 'gl' prefix).
 
 Note that all additional features can be enabled/disabled at build time,
-according the performance and conformance requirements.
+according to the performance and conformance requirements.
 
 You're invited to browse the generator source, the templates and the generated
 source to get a feel of how the generator works.
@@ -28,8 +28,8 @@
 ------------
 The generator needs a JDK 1.5, since template files depend on annotations and
 the generator itself works as an annotation processor in the APT framework.
-Since we support Mac OS X which does not include java 1.5 yet, the generated
-files are still in CVS and the generator is not invoked in a default build.
+Since we support Mac OS X which only includes java 1.5 from Mac OS X 10.4, the
+generated files are in CVS and the generator is not invoked in a default build.
 
 How to use it
 -------------


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

Revision: 2335
Author:   elias_naur
Date:     2006-05-16 00:58:16 -0700 (Tue, 16 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2335&view=rev

Log Message:
-----------
Added new lwjgl1.0beta tag

Added Paths:
-----------
    tags/lwjgl1.0beta/
Copied: tags/lwjgl1.0beta (from rev 2334, trunk/LWJGL)


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

Revision: 2334
Author:   elias_naur
Date:     2006-05-16 00:57:46 -0700 (Tue, 16 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2334&view=rev

Log Message:
-----------
Removed lwjgl1.0beta tag for retargeting

Removed Paths:
-------------
    tags/lwjgl1.0beta/

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

Revision: 2333
Author:   elias_naur
Date:     2006-05-15 12:37:29 -0700 (Mon, 15 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2333&view=rev

Log Message:
-----------
Linux: Apparently, some the Mesa GLX 1.3 glxChooseFBConfig don't like the GLX_STEREO attribute, even when set to False. So we'll only specify GLX_STEREO in case a stereo context is actually requested

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/context.c
Modified: trunk/LWJGL/src/native/linux/context.c
===================================================================
--- trunk/LWJGL/src/native/linux/context.c	2006-05-15 13:09:47 UTC (rev 2332)
+++ trunk/LWJGL/src/native/linux/context.c	2006-05-15 19:37:29 UTC (rev 2333)
@@ -142,7 +142,9 @@
 	putAttrib(&attrib_list, GLX_ACCUM_GREEN_SIZE); putAttrib(&attrib_list, accum_bpe);
 	putAttrib(&attrib_list, GLX_ACCUM_BLUE_SIZE); putAttrib(&attrib_list, accum_bpe);
 	putAttrib(&attrib_list, GLX_ACCUM_ALPHA_SIZE); putAttrib(&attrib_list, accum_alpha);
-	putAttrib(&attrib_list, GLX_STEREO); putAttrib(&attrib_list, stereo ? True : False);
+	if (stereo) {
+		putAttrib(&attrib_list, GLX_STEREO); putAttrib(&attrib_list, True);
+	}
 	// Assume the caller has checked support for multisample
 	if (samples > 0) {
 		putAttrib(&attrib_list, GLX_SAMPLE_BUFFERS_ARB); putAttrib(&attrib_list, 1);


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

Revision: 2332
Author:   spasi
Date:     2006-05-15 06:09:47 -0700 (Mon, 15 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2332&view=rev

Log Message:
-----------
Added ATI_text_fragment_shader extension

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

Added Paths:
-----------
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_text_fragment_shader.java
Added: trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java	                        (rev 0)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java	2006-05-15 13:09:47 UTC (rev 2332)
@@ -0,0 +1,24 @@
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+package org.lwjgl.opengl;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.BufferChecks;
+import java.nio.*;
+
+public final class ATITextFragmentShader {
+	/**
+	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
+	 * and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev, and by the <target> parameter of ProgramStringARB,
+	 * BindProgramARB, ProgramEnvParameter4{d,dv,f,fv}ARB,
+	 * ProgramLocalParameter4{d,dv,f,fv}ARB,
+	 * GetProgramEnvParameter{dv,fv}ARB, GetProgramLocalParameter{dv,fv}ARB,
+	 * GetProgramivARB, GetProgramfvATI, and GetProgramStringARB.
+	 */
+	public static final int GL_TEXT_FRAGMENT_SHADER_ATI = 0x8200;
+
+	private ATITextFragmentShader() {
+	}
+
+}

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java	2006-05-14 22:04:24 UTC (rev 2331)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java	2006-05-15 13:09:47 UTC (rev 2332)
@@ -55,6 +55,7 @@
 	public final boolean GL_ATI_pn_triangles;
 	public final boolean GL_ATI_separate_stencil;
 	public final boolean GL_ATI_shader_texture_lod;
+	public final boolean GL_ATI_text_fragment_shader;
 	public final boolean GL_ATI_texture_compression_3dc;
 	public final boolean GL_ATI_texture_float;
 	public final boolean GL_ATI_texture_mirror_once;
@@ -2294,6 +2295,7 @@
 		this.GL_ATI_pn_triangles = supported_extensions.contains("GL_ATI_pn_triangles");
 		this.GL_ATI_separate_stencil = supported_extensions.contains("GL_ATI_separate_stencil");
 		this.GL_ATI_shader_texture_lod = supported_extensions.contains("GL_ATI_shader_texture_lod");
+		this.GL_ATI_text_fragment_shader = supported_extensions.contains("GL_ATI_text_fragment_shader");
 		this.GL_ATI_texture_compression_3dc = supported_extensions.contains("GL_ATI_texture_compression_3dc");
 		this.GL_ATI_texture_float = supported_extensions.contains("GL_ATI_texture_float");
 		this.GL_ATI_texture_mirror_once = supported_extensions.contains("GL_ATI_texture_mirror_once");

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_text_fragment_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_text_fragment_shader.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_text_fragment_shader.java	2006-05-15 13:09:47 UTC (rev 2332)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface ATI_text_fragment_shader {
+
+	/**
+	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
+	 * and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev, and by the <target> parameter of ProgramStringARB,
+	 * BindProgramARB, ProgramEnvParameter4{d,dv,f,fv}ARB,
+	 * ProgramLocalParameter4{d,dv,f,fv}ARB,
+	 * GetProgramEnvParameter{dv,fv}ARB, GetProgramLocalParameter{dv,fv}ARB,
+	 * GetProgramivARB, GetProgramfvATI, and GetProgramStringARB.
+	 */
+	int GL_TEXT_FRAGMENT_SHADER_ATI = 0x8200;
+
+}
\ No newline at end of file


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

Revision: 2330
Author:   elias_naur
Date:     2006-05-14 15:04:02 -0700 (Sun, 14 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2330&view=rev

Log Message:
-----------
Removed Puppygames GUI

Removed Paths:
-------------
    trunk/Puppygames GUI/

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

Revision: 2331
Author:   elias_naur
Date:     2006-05-14 15:04:24 -0700 (Sun, 14 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2331&view=rev

Log Message:
-----------
Removed CVSROOT

Removed Paths:
-------------
    trunk/CVSROOT/

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

Revision: 2329
Author:   elias_naur
Date:     2006-05-14 15:02:28 -0700 (Sun, 14 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2329&view=rev

Log Message:
-----------
1.0 beta tag

Added Paths:
-----------
    tags/lwjgl1.0beta/
Copied: tags/lwjgl1.0beta (from rev 2328, trunk/LWJGL)


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

Revision: 2328
Author:   matzon
Date:     2006-05-14 14:55:57 -0700 (Sun, 14 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2328&view=rev

Log Message:
-----------
1.0beta version string
fixes to optional

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-05-14 21:54:48 UTC (rev 2327)
+++ trunk/LWJGL/build.xml	2006-05-14 21:55:57 UTC (rev 2328)
@@ -13,7 +13,7 @@
 	<property name="lwjgl.docs" 			value="./doc" />
 	<property name="lwjgl.temp" 			value="./temp" />
 	<property name="lwjgl.res" 			value="./res" />
-	<property name="lwjgl.version" 		value="1.0" />
+	<property name="lwjgl.version" 		value="1.0beta" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java"/>
 	<!-- ================================================================== -->
@@ -98,14 +98,14 @@
 	<patternset id="lwjgl-win32.fileset">
 		<include name="lwjgl.dll" />
 		<include name="OpenAL32.dll" />
-    <include name="jinput-dx8.dll" />
-    <include name="jinput-raw.dll" />
+    		<include name="jinput-dx8.dll" />
+    		<include name="jinput-raw.dll" />
 	</patternset>
 	
 	<!-- Files to include in win32 optional package -->
 	<patternset id="lwjgl-win32_optional.fileset">
-		<include name="lwjgl_fmod3.dll" />
-		<include name="lwjgl_devil.dll" />
+		<include name="lwjgl-fmod3.dll" />
+		<include name="lwjgl-devil.dll" />
 		<include name="DevIL.dll" />
 		<include name="ILU.dll" />
 		<include name="ILUT.dll" />
@@ -115,13 +115,13 @@
 	<patternset id="lwjgl-linux.fileset">
 		<include name="liblwjgl.so" />
 		<include name="libopenal.so" />    
-    <include name="libjinput-linux.so" />
+    		<include name="libjinput-linux.so" />
 	</patternset>
 	
 	<!-- Files to include in linux optional, glibc2.3 package -->
 	<patternset id="lwjgl-linux_optional.fileset">
-		<include name="liblwjgl_fmod3.so" />
-		<include name="liblwjgl_devil.so" />
+		<include name="liblwjgl-fmod3.so" />
+		<include name="liblwjgl-devil.so" />
 		<include name="libIL.so" />
 		<include name="libILU.so" />
 		<include name="libILUT.so" />
@@ -131,14 +131,14 @@
 	<patternset id="lwjgl-macosx.fileset">
 		<include name="liblwjgl.jnilib" />
 		<include name="openal.dylib" />
-    <include name="libjinput-osx.jnilib" />
-    <include name="libjinput-osx-legacy.jnilib" />
+	    <include name="libjinput-osx.jnilib" />
+	    <include name="libjinput-osx-legacy.jnilib" />
 	</patternset>
 	
 	<!-- Files to include in mac os x optional package -->
 	<patternset id="lwjgl-macosx_optional.fileset">
-		<include name="liblwjgl_fmod3.jnilib" />
-		<include name="liblwjgl_devil.jnilib" />
+		<include name="liblwjgl-fmod3.jnilib" />
+		<include name="liblwjgl-devil.jnilib" />
 		<include name="libIL.dylib" />
 		<include name="libILU.dylib" />
 		<include name="libILUT.dylib" />
@@ -157,11 +157,14 @@
 		<exclude name="jar/lwjgl_fmod3.jar" />
 		<exclude name="jar/lwjgl_devil.jar" />
 		<exclude name="jar/lwjgl_model.jar" />
+		<exclude name="native/win32/lwjgl-*.dll" />
 		<exclude name="native/win32/DevIL.dll" />
 		<exclude name="native/win32/ILU.dll" />
 		<exclude name="native/win32/ILUT.dll" />
 		<exclude name="native/linux/libIL*.so" />
+		<exclude name="native/linux/liblwjgl-*.so" />
 		<exclude name="native/macosx/libIL*.dylib" />
+		<exclude name="native/macosx/liblwjgl-*.jnilib" />
 		<exclude name="res/model/**" />
 		<exclude name="res/ILtest.*" />
 		<exclude name="res/Missing_you.mod" />
@@ -174,11 +177,14 @@
 		<include name="jar/lwjgl_fmod3.jar" />
 		<include name="jar/lwjgl_devil.jar" />
 		<include name="jar/lwjgl_model.jar" />
+		<include name="native/win32/lwjgl-*.dll" />
 		<include name="native/win32/DevIL.dll" />
 		<include name="native/win32/ILU.dll" />
 		<include name="native/win32/ILUT.dll" />
 		<include name="native/linux/libIL*.so" />
+		<include name="native/linux/liblwjgl-*.so" />
 		<include name="native/macosx/libIL*.dylib" />
+		<include name="native/macosx/liblwjgl-*.jnilib" />
 		<include name="res/**" />
 		<exclude name="res/logo/**" />
 		<exclude name="res/spaceinvaders/**" />
@@ -412,6 +418,7 @@
 			<class name="org.lwjgl.opengl.LinuxContextImplementation" />
 			<class name="org.lwjgl.opengl.LinuxCanvasImplementation" />
 		</javah>
+		
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/win32" force="yes">
 			<class name="org.lwjgl.opengl.Win32PbufferPeerInfo" />
 			<class name="org.lwjgl.opengl.Win32Display" />
@@ -422,6 +429,7 @@
 			<class name="org.lwjgl.opengl.Win32DisplayPeerInfo" />
 			<class name="org.lwjgl.opengl.Win32ContextImplementation" />
 		</javah>
+		
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
 			<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
 			<class name="org.lwjgl.opengl.MacOSXPeerInfo" />
@@ -429,6 +437,7 @@
 			<class name="org.lwjgl.opengl.MacOSXDisplay" />
 			<class name="org.lwjgl.opengl.MacOSXContextImplementation" />
 		</javah>
+		
 		<!-- lwjgl -->
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
 			<class name="org.lwjgl.opengl.AWTSurfaceLock" />


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

Revision: 2327
Author:   matzon
Date:     2006-05-14 14:54:48 -0700 (Sun, 14 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2327&view=rev

Log Message:
-----------
1.0beta version string

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
    trunk/LWJGL/src/native/common/common_tools.c
    trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-05-14 14:18:13 UTC (rev 2326)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-05-14 21:54:48 UTC (rev 2327)
@@ -51,7 +51,7 @@
 public final class Sys {
 
   /** Current version of library */
-	private static final String VERSION = "1.0";
+	private static final String VERSION = "1.0beta";
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;

Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java	2006-05-14 14:18:13 UTC (rev 2326)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java	2006-05-14 21:54:48 UTC (rev 2327)
@@ -199,7 +199,7 @@
 	private static String FMOD_OSX_LIBRARY_NAME = "fmod";
 
 	/** Version of FMOD */
-	public static final String VERSION = "1.0";
+	public static final String VERSION = "1.0beta";
 
 	static {
 		initialize();

Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2006-05-14 14:18:13 UTC (rev 2326)
+++ trunk/LWJGL/src/native/common/common_tools.c	2006-05-14 21:54:48 UTC (rev 2327)
@@ -48,7 +48,7 @@
 #include "org_lwjgl_DefaultSysImplementation.h"
 
 static bool debug = false;
-static const char* VERSION = "1.0";
+static const char* VERSION = "1.0beta";
 static JavaVM *jvm;
 
 void initAttribList(attrib_list_t *list) {

Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c	2006-05-14 14:18:13 UTC (rev 2326)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c	2006-05-14 21:54:48 UTC (rev 2327)
@@ -33,7 +33,7 @@
 #include "org_lwjgl_fmod3_FMOD.h"
 #include "extfmod3.h"
 
-static const char* VERSION = "1.0";
+static const char* VERSION = "1.0beta";
 
 /*
  * Class:     org_lwjgl_fmod3_FMOD


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

Revision: 2326
Author:   spasi
Date:     2006-05-14 07:18:13 -0700 (Sun, 14 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2326&view=rev

Log Message:
-----------
Added ATI_shader_texture_lod extension

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

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_shader_texture_lod.java
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java	2006-05-13 10:03:19 UTC (rev 2325)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java	2006-05-14 14:18:13 UTC (rev 2326)
@@ -54,6 +54,7 @@
 	public final boolean GL_ATI_map_object_buffer;
 	public final boolean GL_ATI_pn_triangles;
 	public final boolean GL_ATI_separate_stencil;
+	public final boolean GL_ATI_shader_texture_lod;
 	public final boolean GL_ATI_texture_compression_3dc;
 	public final boolean GL_ATI_texture_float;
 	public final boolean GL_ATI_texture_mirror_once;
@@ -2292,6 +2293,7 @@
 		this.GL_ATI_map_object_buffer = supported_extensions.contains("GL_ATI_map_object_buffer");
 		this.GL_ATI_pn_triangles = supported_extensions.contains("GL_ATI_pn_triangles");
 		this.GL_ATI_separate_stencil = supported_extensions.contains("GL_ATI_separate_stencil");
+		this.GL_ATI_shader_texture_lod = supported_extensions.contains("GL_ATI_shader_texture_lod");
 		this.GL_ATI_texture_compression_3dc = supported_extensions.contains("GL_ATI_texture_compression_3dc");
 		this.GL_ATI_texture_float = supported_extensions.contains("GL_ATI_texture_float");
 		this.GL_ATI_texture_mirror_once = supported_extensions.contains("GL_ATI_texture_mirror_once");

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_shader_texture_lod.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_shader_texture_lod.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_shader_texture_lod.java	2006-05-14 14:18:13 UTC (rev 2326)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface ATI_shader_texture_lod {
+}
\ No newline at end of file


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

Revision: 2325
Author:   elias_naur
Date:     2006-05-13 03:03:19 -0700 (Sat, 13 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2325&view=rev

Log Message:
-----------
Linux: Fixed accum color bits when accum_bpp = 0

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/context.c
Modified: trunk/LWJGL/src/native/linux/context.c
===================================================================
--- trunk/LWJGL/src/native/linux/context.c	2006-05-07 10:19:47 UTC (rev 2324)
+++ trunk/LWJGL/src/native/linux/context.c	2006-05-13 10:03:19 UTC (rev 2325)
@@ -98,6 +98,9 @@
 static int convertToBPE(int bpp) {
 	int bpe;
 	switch (bpp) {
+		case 0:
+			bpe = 0;
+			break;
 		case 32:
 		case 24:
 			bpe = 8;


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

Revision: 2324
Author:   elias_naur
Date:     2006-05-07 03:19:47 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2324&view=rev

Log Message:
-----------
Updated jinput.jar to fix a NPE in the directinput plugin

Modified Paths:
--------------
    trunk/LWJGL/libs/jinput.jar
Modified: trunk/LWJGL/libs/jinput.jar
===================================================================
(Binary files differ)


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

Revision: 2323
Author:   elias_naur
Date:     2006-05-06 12:45:12 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2323&view=rev

Log Message:
-----------
Mac OS X: build fixes

Modified Paths:
--------------
    trunk/LWJGL/src/native/macosx/build.xml
Modified: trunk/LWJGL/src/native/macosx/build.xml
===================================================================
--- trunk/LWJGL/src/native/macosx/build.xml	2006-05-05 08:14:28 UTC (rev 2322)
+++ trunk/LWJGL/src/native/macosx/build.xml	2006-05-06 19:45:12 UTC (rev 2323)
@@ -25,10 +25,9 @@
 	</target>
 	
 	<target name="link">
-		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" dest="${objdir}" skipemptyfilesets="true">
+		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
 			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/>
 			<fileset dir="${objdir}" includes="*.o"/>
-			<mapper type="merge" to="${libname}"/>
 		</apply>
 		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
 			<arg line="-S -X"/>
@@ -70,7 +69,6 @@
 			<srcfile/>
 			<arg value="-output"/>
 			<arg path="liblwjgl.jnilib"/>
-			<mapper type="merge" to="liblwjgl.jnilib"/>
 			<fileset file="ppc/liblwjgl-ppc.jnilib"/>
 			<fileset file="intel/liblwjgl-intel.jnilib"/>
 		</apply>


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

Revision: 2322
Author:   elias_naur
Date:     2006-05-05 01:14:28 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2322&view=rev

Log Message:
-----------
Removed the generator from lwjgl_util.jar

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-05-03 20:53:16 UTC (rev 2321)
+++ trunk/LWJGL/build.xml	2006-05-05 08:14:28 UTC (rev 2322)
@@ -52,6 +52,7 @@
 	<!-- Files to include in the lwjgl_util.jar file -->
 	<fileset id="lwjgl_util.fileset" dir="${lwjgl.bin}">
 		<exclude name="**.*" />
+		<exclude name="org/lwjgl/util/generator/**" />
 		<exclude name="org/lwjgl/util/model/**" />
 		<include name="org/lwjgl/util/**" />
 	</fileset>


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

Revision: 2321
Author:   elias_naur
Date:     2006-05-03 13:53:16 -0700 (Wed, 03 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2321&view=rev

Log Message:
-----------
Added Display.swapBuffers(). Combined with Display.processMessages() and Mouse/Keyboard/Controllers.poll() this method allows an application to create a custom policy for the rendering/polling loop in addition to the static Display.update() policy.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2006-05-03 08:04:57 UTC (rev 2320)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2006-05-03 20:53:16 UTC (rev 2321)
@@ -549,25 +549,37 @@
 	 */
 	public static void processMessages() {
 		if (!isCreated())
-			throw new IllegalStateException("Cannot update uncreated window");
+			throw new IllegalStateException("Display not created");
 
 		display_impl.update();
 	}
 
 	/**
+	 * Swap the display buffers. This method is called from update(), and should normally not be called by
+	 * the application.
+	 * @throws OpenGLException if an OpenGL error has occured since the last call to GL11.glGetError()
+	 */
+	public static void swapBuffers() throws LWJGLException {
+		if (!isCreated())
+			throw new IllegalStateException("Display not created");
+
+		Util.checkGLError();
+		Context.swapBuffers();
+	}
+
+	/**
 	 * Update the window. This calls processMessages(), and if the window is visible
-	 * clears the dirty flag and swaps the buffers and polls the input devices.
+	 * clears the dirty flag and calls swapBuffers() and finally polls the input devices.
 	 * @throws OpenGLException if an OpenGL error has occured since the last call to GL11.glGetError()
 	 */
 	public static void update() {
 		if (!isCreated())
-			throw new IllegalStateException("Cannot update uncreated window");
+			throw new IllegalStateException("Display not created");
 
 		// We paint only when the window is visible or dirty
 		if (isVisible() || isDirty()) {
-			Util.checkGLError();
 			try {
-				Context.swapBuffers();
+				swapBuffers();
 			} catch (LWJGLException e) {
 				throw new RuntimeException(e);
 			}


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