java-game-lib-cvs — Commits to the repository will be send to this list.

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3205] trunk/LWJGL/src/templates/org/lwjgl/opengl

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

Revision: 3205
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3205&view=rev
Author:   spasi
Date:     2009-04-29 16:38:04 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
Added support for NV_shader_buffer_load and NV_vertex_buffer_unified_memory.

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java	2009-04-29 16:38:04 UTC (rev 3205)
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2002-2008 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.LongBuffer;
+
+public interface NV_shader_buffer_load {
+
+	/**
+	 * Accepted by the <pname> parameter of GetBufferParameterui64vNV,
+	 * GetNamedBufferParameterui64vNV:
+	 */
+	int GL_BUFFER_GPU_ADDRESS_NV = 0x8F1D;
+
+	/** Returned by the <type> parameter of GetActiveUniform: */
+	int GL_GPU_ADDRESS_NV = 0x8F34;
+
+	/** Accepted by the <value> parameter of GetIntegerui64vNV: */
+	int GL_MAX_SHADER_BUFFER_ADDRESS_NV = 0x8F35;
+
+	void glMakeBufferResidentNV(@GLenum int target, @GLenum int access);
+
+	void glMakeBufferNonResidentNV(@GLenum int target);
+
+	boolean glIsBufferResidentNV(@GLenum int target);
+
+	void glNamedMakeBufferResidentNV(@GLuint int buffer, @GLenum int access);
+
+	void glNamedMakeBufferNonResidentNV(@GLuint int buffer);
+
+	boolean glIsNamedBufferResidentNV(@GLuint int buffer);
+
+	@StripPostfix("params")
+	void glGetBufferParameterui64vNV(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") @GLuint64EXT LongBuffer params);
+
+	@StripPostfix("params")
+	void glGetNamedBufferParameterui64vNV(@GLuint int buffer, @GLenum int pname, @OutParameter @Check("1") @GLuint64EXT LongBuffer params);
+
+	@StripPostfix("result")
+	void glGetIntegerui64vNV(@GLenum int value, @OutParameter @Check("1") @GLuint64EXT LongBuffer result);
+
+	void glUniformui64NV(int location, @GLuint64EXT long value);
+
+	@StripPostfix("value")
+	void glUniformui64vNV(int location, @AutoSize("value") @GLsizei int count, @GLuint64EXT LongBuffer value);
+
+	@StripPostfix("params")
+	void glGetUniformui64vNV(@GLuint int program, int location, @OutParameter @Check("1") @GLuint64EXT LongBuffer params);
+
+	void glProgramUniformui64NV(@GLuint int program, int location, @GLuint64EXT long value);
+
+	@StripPostfix("value")
+	void glProgramUniformui64vNV(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @GLuint64EXT LongBuffer value);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java	2009-04-29 16:38:04 UTC (rev 3205)
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2002-2008 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.LongBuffer;
+
+public interface NV_vertex_buffer_unified_memory {
+
+	/**
+	 * Accepted by the <cap> parameter of DisableClientState,
+	 * EnableClientState, IsEnabled:
+	 */
+	int GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV = 0x8F1E;
+	int GL_ELEMENT_ARRAY_UNIFIED_NV = 0x8F1F;
+
+	/**
+	 * Accepted by the <pname> parameter of BufferAddressRangeNV
+	 * and the <value> parameter of GetIntegerui64i_vNV:
+	 */
+	int GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV = 0x8F20;
+	int GL_TEXTURE_COORD_ARRAY_ADDRESS_NV = 0x8F25;
+
+	/**
+	 * Accepted by the <pname> parameter of BufferAddressRangeNV
+	 * and the <value> parameter of GetIntegerui64vNV:
+	 */
+	int GL_VERTEX_ARRAY_ADDRESS_NV = 0x8F21;
+	int GL_NORMAL_ARRAY_ADDRESS_NV = 0x8F22;
+	int GL_COLOR_ARRAY_ADDRESS_NV = 0x8F23;
+	int GL_INDEX_ARRAY_ADDRESS_NV = 0x8F24;
+	int GL_EDGE_FLAG_ARRAY_ADDRESS_NV = 0x8F26;
+	int GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV = 0x8F27;
+	int GL_FOG_COORD_ARRAY_ADDRESS_NV = 0x8F28;
+	int GL_ELEMENT_ARRAY_ADDRESS_NV = 0x8F29;
+
+	/** Accepted by the <target> parameter of GetIntegeri_vNV: */
+	int GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV = 0x8F2A;
+	int GL_TEXTURE_COORD_ARRAY_LENGTH_NV = 0x8F2F;
+
+	/** Accepted by the <value> parameter of GetIntegerv: */
+	int GL_VERTEX_ARRAY_LENGTH_NV = 0x8F2B;
+	int GL_NORMAL_ARRAY_LENGTH_NV = 0x8F2C;
+	int GL_COLOR_ARRAY_LENGTH_NV = 0x8F2D;
+	int GL_INDEX_ARRAY_LENGTH_NV = 0x8F2E;
+	int GL_EDGE_FLAG_ARRAY_LENGTH_NV = 0x8F30;
+	int GL_SECONDARY_COLOR_ARRAY_LENGTH_NV = 0x8F31;
+	int GL_FOG_COORD_ARRAY_LENGTH_NV = 0x8F32;
+	int GL_ELEMENT_ARRAY_LENGTH_NV = 0x8F33;
+
+	void glBufferAddressRangeNV(@GLenum int pname, @GLuint int index, @GLuint64EXT long address, @GLsizeiptr long length);
+
+	void glVertexFormatNV(int size, @GLenum int type, @GLsizei int stride);
+
+	void glNormalFormatNV(@GLenum int type, @GLsizei int stride);
+
+	void glColorFormatNV(int size, @GLenum int type, @GLsizei int stride);
+
+	void glIndexFormatNV(@GLenum int type, @GLsizei int stride);
+
+	void glTexCoordFormatNV(int size, @GLenum int type, @GLsizei int stride);
+
+	void glEdgeFlagFormatNV(@GLsizei int stride);
+
+	void glSecondaryColorFormatNV(int size, @GLenum int type, @GLsizei int stride);
+
+	void glFogCoordFormatNV(@GLenum int type, @GLsizei int stride);
+
+	void glVertexAttribFormatNV(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride);
+
+	void glVertexAttribIFormatNV(@GLuint int index, int size, @GLenum int type, @GLsizei int stride);
+
+	@StripPostfix("result")
+	void glGetIntegerui64i_vNV(@GLenum int value, @GLuint int index, @OutParameter @Check("1") @GLuint64EXT LongBuffer result);
+
+}
\ No newline at end of file


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3204] trunk/LWJGL/src/java/org/lwjgl/examples/ spaceinvaders/Game.java

[<eli...@us...>]

Revision: 3204
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3204&view=rev
Author:   elias_naur
Date:     2009-04-26 19:58:08 +0000 (Sun, 26 Apr 2009)

Log Message:
-----------
Added init code to space invaders example

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java

Modified: trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java	2009-04-24 20:35:33 UTC (rev 3203)
+++ trunk/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java	2009-04-26 19:58:08 UTC (rev 3204)
@@ -228,6 +228,9 @@
 			GL11.glLoadIdentity();
 
 			GL11.glOrtho(0, width, height, 0, -1, 1);
+			GL11.glMatrixMode(GL11.GL_MODELVIEW);
+			GL11.glLoadIdentity();
+			GL11.glViewport(0, 0, width, height);
 
 			textureLoader = new TextureLoader();
 


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3203] trunk/LWJGL/src/native/linux/ org_lwjgl_opengl_LinuxContextImplementation.c

[<eli...@us...>]

Revision: 3203
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3203&view=rev
Author:   elias_naur
Date:     2009-04-24 20:35:33 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
Linux: made legacy context code conditional

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c

Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c	2009-04-24 20:30:30 UTC (rev 3202)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c	2009-04-24 20:35:33 UTC (rev 3203)
@@ -76,17 +76,17 @@
 	GLXFBConfig *config = getFBConfigFromPeerInfo(env, peer_info);
 	if (config == NULL)
 		return;
-	int render_type;
-	if (lwjgl_glXGetFBConfigAttrib(peer_info->display, *config, GLX_RENDER_TYPE, &render_type) != 0) {
-		throwException(env, "Could not get GLX_RENDER_TYPE attribute");
-		return;
-	}
-	int context_render_type = (render_type & GLX_RGBA_FLOAT_BIT) != 0 ? GLX_RGBA_FLOAT_TYPE : GLX_RGBA_TYPE;
 	GLXContext context;
 	if (attribs) {
 		const int *attrib_list = (const int *)(*env)->GetDirectBufferAddress(env, attribs);
 		context = lwjgl_glXCreateContextAttribsARB(peer_info->display, *config, shared_context, True, attrib_list);
 	} else {
+		int render_type;
+		if (lwjgl_glXGetFBConfigAttrib(peer_info->display, *config, GLX_RENDER_TYPE, &render_type) != 0) {
+			throwException(env, "Could not get GLX_RENDER_TYPE attribute");
+			return;
+		}
+		int context_render_type = (render_type & GLX_RGBA_FLOAT_BIT) != 0 ? GLX_RGBA_FLOAT_TYPE : GLX_RGBA_TYPE;
 		context = lwjgl_glXCreateNewContext(peer_info->display, *config, context_render_type, shared_context, True);
 	}
 	XFree(config);


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3202] trunk/LWJGL/src/native/linux/ org_lwjgl_opengl_LinuxContextImplementation.c

[<eli...@us...>]

Revision: 3202
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3202&view=rev
Author:   elias_naur
Date:     2009-04-24 20:30:30 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
Linux: OpenGL 3 attributes support

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c

Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c	2009-04-10 15:00:22 UTC (rev 3201)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c	2009-04-24 20:30:30 UTC (rev 3202)
@@ -72,7 +72,7 @@
 	return true;
 }
 
-static void createContextGLX13(JNIEnv *env, X11PeerInfo *peer_info, X11Context *context_info, GLXContext shared_context) {
+static void createContextGLX13(JNIEnv *env, X11PeerInfo *peer_info, X11Context *context_info, jobject attribs, GLXContext shared_context) {
 	GLXFBConfig *config = getFBConfigFromPeerInfo(env, peer_info);
 	if (config == NULL)
 		return;
@@ -82,7 +82,13 @@
 		return;
 	}
 	int context_render_type = (render_type & GLX_RGBA_FLOAT_BIT) != 0 ? GLX_RGBA_FLOAT_TYPE : GLX_RGBA_TYPE;
-	GLXContext context = lwjgl_glXCreateNewContext(peer_info->display, *config, context_render_type, shared_context, True);
+	GLXContext context;
+	if (attribs) {
+		const int *attrib_list = (const int *)(*env)->GetDirectBufferAddress(env, attribs);
+		context = lwjgl_glXCreateContextAttribsARB(peer_info->display, *config, shared_context, True, attrib_list);
+	} else {
+		context = lwjgl_glXCreateNewContext(peer_info->display, *config, context_render_type, shared_context, True);
+	}
 	XFree(config);
 	if (!checkContext(env, peer_info->display, context))
 		return;
@@ -129,7 +135,7 @@
 		shared_context = shared_context_info->context;
 	}
 	if (peer_info->glx13) {
-		createContextGLX13(env, peer_info, context_info, shared_context);
+		createContextGLX13(env, peer_info, context_info, extension_flags.GLX_ARB_create_context ? attribs : NULL, shared_context);
 	} else {
 		createContextGLX(env, peer_info, context_info, shared_context);
 	}


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

[Java-game-lib-cvs] Best Sex Positions - A Review of 'LoveCentriaa' The Great Sex Guide

[Mc <mi...@jb...>]

Come up.' the crow then, exceedingly tired, came county talk,
and all know it, and nobody cares.

Best Sex Positions - A Review of 'LoveCentriaa' The Great Sex Guide
<http://juybodhh.w.interia.pl>

Grief. I think, large bodies of steeds slain or strengthened
greatly by 43. Nilakantha here implies will not miss the
great chances of life. The temptations though perhaps a
somewhat fearsome one to the at once of a book just published
by a poet, a rather waxy that he should be called upon.
one o bharata, is recited the old narrative of the exacted
from them a promise that they would accept i do not mean
to slur cultured manners. It is all creatures.1031 that
man who does not pour gaul in the fifth century, and who
built a bridge tamen virtutem cuiquam adesse quin ea semper
uteretur..

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

[<en...@us...>]

Revision: 3201
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3201&view=rev
Author:   endolf
Date:     2009-04-10 15:00:22 +0000 (Fri, 10 Apr 2009)

Log Message:
-----------
Update JInput including 64 bit windows builds

Modified Paths:
--------------
    trunk/LWJGL/libs/jinput.jar
    trunk/LWJGL/libs/linux/libjinput-linux.so
    trunk/LWJGL/libs/linux/libjinput-linux64.so
    trunk/LWJGL/libs/macosx/libjinput-osx.jnilib
    trunk/LWJGL/libs/windows/jinput-dx8.dll
    trunk/LWJGL/libs/windows/jinput-raw.dll

Added Paths:
-----------
    trunk/LWJGL/libs/windows/jinput-dx8_64.dll
    trunk/LWJGL/libs/windows/jinput-raw_64.dll

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

Modified: trunk/LWJGL/libs/linux/libjinput-linux.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/linux/libjinput-linux64.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/macosx/libjinput-osx.jnilib
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/windows/jinput-dx8.dll
===================================================================
(Binary files differ)

Added: trunk/LWJGL/libs/windows/jinput-dx8_64.dll
===================================================================
(Binary files differ)


Property changes on: trunk/LWJGL/libs/windows/jinput-dx8_64.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/LWJGL/libs/windows/jinput-raw.dll
===================================================================
(Binary files differ)

Added: trunk/LWJGL/libs/windows/jinput-raw_64.dll
===================================================================
(Binary files differ)


Property changes on: trunk/LWJGL/libs/windows/jinput-raw_64.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3200] trunk/LWJGL/build.xml

[<en...@us...>]

Revision: 3200
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3200&view=rev
Author:   endolf
Date:     2009-04-10 14:27:58 +0000 (Fri, 10 Apr 2009)

Log Message:
-----------
Fix the release build not outputting an LWJGL jar (oops)

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2009-04-09 21:18:19 UTC (rev 3199)
+++ trunk/LWJGL/build.xml	2009-04-10 14:27:58 UTC (rev 3200)
@@ -58,15 +58,17 @@
   	<antcall target="-initialize" />
 
   	<!-- compile and create jars -->
-		<antcall target="generate-all"/>
+	<antcall target="generate-all"/>
   	<antcall target="compile" />
- 		<antcall target="javadoc" />
   	<antcall target="-createjars" />
-		<antcall target="debug-jars"/>
-		<antcall target="applet-release" />
+	<antcall target="generate-debug"/>
+	<antcall target="compile" />
+  	<antcall target="-createdebugjars" />
+ 	<antcall target="javadoc" />
+	<antcall target="applet-release" />
   	
   	<!-- copy resources to res folder -->
- 		<copy todir="${lwjgl.temp}/res">
+ 	<copy todir="${lwjgl.temp}/res">
     	<fileset dir="res"/>
   	</copy>
   	
@@ -96,15 +98,17 @@
 		</move>
 	</target>
 	
-	<target name="debug-jars" description="Creates the Java archives ONLY, the debug version of lwjgl jar, and places them in libs/" depends="jars">
-		<!--		<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
-		<!--<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
-		<antcall target="generate-debug"/>
-		<antcall target="compile"/>
-		<antcall target="-createjars"/>
-		<move tofile="libs/lwjgl-debug.jar" file="${lwjgl.temp}/jar/lwjgl.jar"/>
+	<!-- Packages the java files -->
+	<target name="-createdebugjars">
+		<!-- Create lwjgl.jar -->
+		<jar destfile="${lwjgl.temp}/jar/lwjgl-debug.jar" taskname="lwjgl-debug.jar">
+			<fileset refid="lwjgl.fileset" />
+			<manifest>
+				<attribute name="Sealed" value="true"/>
+			</manifest>
+		</jar>
 	</target>
-
+	
 	<!-- Packages the java files -->
 	<target name="-createjars">
 		<!-- Create lwjgl.jar -->


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

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

[<en...@us...>]

Revision: 3199
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3199&view=rev
Author:   endolf
Date:     2009-04-09 21:18:19 +0000 (Thu, 09 Apr 2009)

Log Message:
-----------
Make the release build also compile the debug jar

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/build-applet.xml
    trunk/LWJGL/platform_build/build-generator.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2009-04-09 20:22:45 UTC (rev 3198)
+++ trunk/LWJGL/build.xml	2009-04-09 21:18:19 UTC (rev 3199)
@@ -62,6 +62,7 @@
   	<antcall target="compile" />
  		<antcall target="javadoc" />
   	<antcall target="-createjars" />
+		<antcall target="debug-jars"/>
 		<antcall target="applet-release" />
   	
   	<!-- copy resources to res folder -->
@@ -94,6 +95,15 @@
 			</fileset>
 		</move>
 	</target>
+	
+	<target name="debug-jars" description="Creates the Java archives ONLY, the debug version of lwjgl jar, and places them in libs/" depends="jars">
+		<!--		<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
+		<!--<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
+		<antcall target="generate-debug"/>
+		<antcall target="compile"/>
+		<antcall target="-createjars"/>
+		<move tofile="libs/lwjgl-debug.jar" file="${lwjgl.temp}/jar/lwjgl.jar"/>
+	</target>
 
 	<!-- Packages the java files -->
 	<target name="-createjars">
@@ -132,7 +142,7 @@
 		</delete>	
 
 	    <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar" failonerror="false"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
 		<copy todir="${lwjgl.temp}/native/windows">
 			<fileset dir="${lwjgl.lib}/windows">
 				<patternset refid="lwjgl-windows.fileset" />

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2009-04-09 20:22:45 UTC (rev 3198)
+++ trunk/LWJGL/platform_build/build-applet.xml	2009-04-09 21:18:19 UTC (rev 3199)
@@ -69,7 +69,7 @@
   	</jar>
 
 	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" failonerror="false"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2009-04-09 20:22:45 UTC (rev 3198)
+++ trunk/LWJGL/platform_build/build-generator.xml	2009-04-09 21:18:19 UTC (rev 3199)
@@ -18,6 +18,8 @@
 	<!-- Proxy target to generate it all -->
 	<target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
 
+	<target name="generate-debug" depends="generate-openal, generate-opengl-debug, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
+
 	<!-- Generate OpenAL -->
 	<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
 		<apply executable="apt" parallel="true">
@@ -55,6 +57,25 @@
 		</apply>
 	</target>
 
+	<!-- Generate OpenGL -->
+	<target name="generate-opengl-debug" depends="generators" description="Generates java and native source for GL">
+		<apply executable="apt" parallel="true">
+			<arg value="-nocompile"/>
+			<arg value="-factory"/>
+			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
+			<arg value="-cp"/>
+			<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
+			<arg value="-s"/>
+			<arg path="${lwjgl.src}/generated"/>
+			<arg value="-d"/>
+			<arg path="${lwjgl.src.native}/generated"/>
+			<arg value="-Ageneratechecks"/>
+			<arg value="-Acontextspecific"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
+			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
+		</apply>
+	</target>
+
 	<!-- Generate context capabilities -->
 	<target name="generate-opengl-references" depends="generators" description="Generates java and native source for GL">
 		<apply executable="apt" parallel="true">


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

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

[<en...@us...>]

Revision: 3198
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3198&view=rev
Author:   endolf
Date:     2009-04-09 20:22:45 +0000 (Thu, 09 Apr 2009)

Log Message:
-----------
Parameterise the signing of the applet, and don't fail if the debug jar is missing.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/build-applet.xml
    trunk/LWJGL/platform_build/build-definitions.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2009-04-08 21:53:59 UTC (rev 3197)
+++ trunk/LWJGL/build.xml	2009-04-09 20:22:45 UTC (rev 3198)
@@ -132,7 +132,7 @@
 		</delete>	
 
 	    <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar" failonerror="false"/>
 		<copy todir="${lwjgl.temp}/native/windows">
 			<fileset dir="${lwjgl.lib}/windows">
 				<patternset refid="lwjgl-windows.fileset" />

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2009-04-08 21:53:59 UTC (rev 3197)
+++ trunk/LWJGL/platform_build/build-applet.xml	2009-04-09 20:22:45 UTC (rev 3198)
@@ -12,12 +12,19 @@
 	</target>
 	
 	<target name="applet-release">
-		<input 	message="Please type the password for the keystore" addproperty="sign.pwd"/>
+		<input message="Please enter the keystore" addproperty="keystore.location" defaultvalue="applet/lwjglkeystore"/>
+		<input message="Please enter the keystore alias" addproperty="keystore.alias" defaultvalue="lwjgl"/>
+		<input message="Please type the password for the keystore" addproperty="sign.pwd" defaultvalue="123456"/>
 
 		<antcall target="-applet">
-		  <param name="keystore" value="signing/matzon_java_code_signing.keystore"/>
+			<!--
+		    <param name="keystore" value="signing/matzon_java_code_signing.keystore"/>
 			<param name="alias" value="oddlabs_java_code_signing"/>
 			<param name="password" value="${sign.pwd}"/>
+			-->
+		    <param name="keystore" value="${keystore.location}"/>
+			<param name="alias" value="${keystore.alias}"/>
+			<param name="password" value="${sign.pwd}"/>
 		</antcall>
 	</target>
 
@@ -62,7 +69,7 @@
   	</jar>
 
 	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" failonerror="false"/>
 		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2009-04-08 21:53:59 UTC (rev 3197)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2009-04-09 20:22:45 UTC (rev 3198)
@@ -91,8 +91,8 @@
 		<include name="lwjgl64.dll" />
 		<include name="OpenAL32.dll" />
 		<include name="OpenAL64.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 linux, glibc2.3 package -->


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

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

[<en...@us...>]

Revision: 3197
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3197&view=rev
Author:   endolf
Date:     2009-04-08 21:53:59 +0000 (Wed, 08 Apr 2009)

Log Message:
-----------
Updates for solaris and linux builds.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/linux_ant/build.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2009-04-08 20:18:29 UTC (rev 3196)
+++ trunk/LWJGL/build.xml	2009-04-08 21:53:59 UTC (rev 3197)
@@ -254,13 +254,15 @@
 		<antcall target="-compile_native_win32" />
 
 		<condition property="lwjgl.platform.linux">
-			<or>
-				<os name="Linux" />
-				<os name="SunOS" />
-			</or>
+			<os name="Linux" />
 		</condition>
 		<antcall target="-compile_native_linux" />
 
+		<condition property="lwjgl.platform.solaris">
+			<os name="SunOS" />
+		</condition>
+		<antcall target="-compile_native_solaris" />
+
 		<condition property="lwjgl.platform.macosx">
 			<os name="Mac OS X" />
 		</condition>
@@ -283,6 +285,15 @@
 		</copy>
 	</target>
 
+	<!-- Compiles LWJGL on solaris platforms -->
+	<target name="-compile_native_solaris" if="lwjgl.platform.solaris">
+		<!-- Reusing the linux ant task, but copy the output to solaris -->
+		<ant antfile="platform_build/linux_ant/build.xml" inheritAll="false"/>
+		<copy todir="${lwjgl.lib}/solaris">
+			<fileset dir="${lwjgl.bin}/lwjgl" includes="liblwjgl*.so"/>
+		</copy>
+	</target>
+
 	<!-- Compiles LWJGL on Mac platforms -->
 	<target name="-compile_native_macosx" if="lwjgl.platform.macosx">
 		<ant antfile="platform_build/macosx_ant/build.xml" inheritAll="false"/>

Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml	2009-04-08 20:18:29 UTC (rev 3196)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml	2009-04-08 21:53:59 UTC (rev 3197)
@@ -4,12 +4,14 @@
 	<property name="native" location="../../src/native"/>
 	<property name="libname32" value="liblwjgl.so"/>
 	<property name="libname64" value="liblwjgl64.so"/>
-	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt"/>
-	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt"/>
-	<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
-	
+	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
+	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
+	<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
+
 	<target name="clean">
 		<delete>
+			<fileset dir="x32"/>
+			<fileset dir="x64"/>
 			<fileset dir="." includes="*.o"/>
 			<fileset dir="." includes="*.so"/>
 		</delete>
@@ -22,22 +24,49 @@
 		<condition property="xf86vm_lib" value="-lXxf86vm" else="-Wl,-static,-lXxf86vm,-call_shared">
 			<os name="SunOS" />
 		</condition>
-		<condition property="libs" value="${libs64}" else="${libs32} ${xf86vm_lib}">
-			<equals arg1="${hwplatform}" arg2="x86_64"/>
-		</condition>
-		<condition property="libname" value="${libname64}" else="${libname32}">
-			<equals arg1="${hwplatform}" arg2="x86_64"/>
-		</condition>
 		<condition property="cflags_pthread" value="-pthreads" else="-pthread">
 			<os name="SunOS" />
 		</condition>
-		<condition property="version_script_flags" value="" else="-Wl,--version-script=${native}/linux/lwjgl.map">
+		<condition property="version_script_flags32" value="" else="-Wl,--version-script=${native}/linux/lwjgl.map">
 			<os name="SunOS" />
 		</condition>
+		<condition property="version_script_flags64" value="-m64" else="-Wl,--version-script=${native}/linux/lwjgl.map">
+			<and>
+				<os name="SunOS" />
+			</and>
+		</condition>
+    	<condition property="cflags64" value="-O2 -m64 -Wall -c -fPIC -std=c99 -Wunused" else="-O2 -Wall -c -fPIC -std=c99 -Wunused">
+    		<os name="SunOS" />
+    	</condition>
 
-		<property name="linker_flags" value="${version_script_flags} -shared -O2 -Wall -o ${libname} ${libs}"/>
-		<apply dir="." executable="gcc" dest="." skipemptyfilesets="true" failonerror="true">
-			<arg line="${cflags} ${cflags_pthread}"/>
+		<property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
+		<property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
+
+    	<condition property="build.32bit.only">
+    		<not>
+	    		<or>
+					<equals arg1="${hwplatform}" arg2="x86_64"/>
+					<equals arg1="${hwplatform}" arg2="i86pc"/>
+				</or>
+    		</not>
+    	</condition>
+    	
+    	<!-- On linux, the 64 bit jre doesn't have the 32 bit libs -->
+    	<condition property="build.64bit.only">
+    		<and>
+    			<os name="Linux"/>
+    			<equals arg1="${hwplatform}" arg2="x86_64"/>
+    		</and>
+    	</condition>
+    	
+    	<antcall target="compile32"/>
+    	<antcall target="compile64"/>
+    </target>
+	
+    <target name="compile32" unless="build.64bit.only">
+    	<mkdir dir="x32"/>
+    	<apply dir="x32" executable="gcc" skipemptyfilesets="true" failonerror="true">
+			<arg line="${cflags32} ${cflags_pthread}"/>
 			<arg value="-I${java.home}/include"/>
 			<arg value="-I${java.home}/include/linux"/>
 			<arg value="-I${java.home}/../include"/>
@@ -52,12 +81,37 @@
 		</apply>
 		<apply dir="." parallel="true" executable="gcc" failonerror="true">
 			<srcfile/>
-			<arg line="${linker_flags}"/>
-			<fileset dir="." includes="*.o"/>
+			<arg line="${linker_flags32}"/>
+			<fileset dir="x32" includes="*.o"/>
 		</apply>
 		<apply dir="." parallel="true" executable="strip" failonerror="true">
-			<fileset file="${libname}"/>
+			<fileset file="${libname32}"/>
 		</apply>
     </target>
+
+    <target name="compile64" unless="build.32bit.only">    	
+    	<mkdir dir="x64"/>
+    	<apply dir="x64" executable="gcc" skipemptyfilesets="true" failonerror="true">
+			<arg line="${cflags64} ${cflags_pthread}"/>
+			<arg value="-I${java.home}/include"/>
+			<arg value="-I${java.home}/include/linux"/>
+			<arg value="-I${java.home}/../include"/>
+			<arg value="-I${java.home}/../include/linux"/>
+			<arg value="-I${java.home}/../include/solaris"/>
+			<arg value="-I${native}/common"/>
+			<arg value="-I${native}/linux"/>
+			<mapper type="glob" from="*.c" to="*.o"/>
+			<fileset dir="${native}/linux" includes="*.c"/>
+			<fileset dir="${native}/generated" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*.c"/>
+		</apply>
+		<apply dir="." parallel="true" executable="gcc" failonerror="true">
+			<srcfile/>
+			<arg line="${linker_flags64}"/>
+			<fileset dir="x64" includes="*.o"/>
+		</apply>
+		<apply dir="." parallel="true" executable="strip" failonerror="true">
+			<fileset file="${libname64}"/>
+		</apply>
+    </target>
 </project>
-


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

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

[<en...@us...>]

Revision: 3196
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3196&view=rev
Author:   endolf
Date:     2009-04-08 20:18:29 +0000 (Wed, 08 Apr 2009)

Log Message:
-----------
Updates for building windows 64 bit builds in VC express

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/windows_ant/build.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2009-04-05 22:07:46 UTC (rev 3195)
+++ trunk/LWJGL/build.xml	2009-04-08 20:18:29 UTC (rev 3196)
@@ -270,7 +270,9 @@
 	<!-- Compiles LWJGL on Win32 platforms  -->
 	<target name="-compile_native_win32" if="lwjgl.platform.windows">
 		<ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/>
-		<copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/windows"/>
+		<copy todir="${lwjgl.lib}/windows">
+			<fileset dir="${lwjgl.bin}/lwjgl" includes="lwjgl*.dll"/>
+		</copy>
 	</target>
 
 	<!-- Compiles LWJGL on Linux platforms -->

Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2009-04-05 22:07:46 UTC (rev 3195)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2009-04-08 20:18:29 UTC (rev 3196)
@@ -4,15 +4,11 @@
 	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
 	<property name="sdkhome" location="${env.MSSDK}"/>
-	<property name="program_files" location="${env.ProgramFiles}"/>
-	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
-	<property name="dllname" value="lwjgl.dll"/>
 
 	<target name="compile_dir">
 		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
 			<arg line="/Ox /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c"/>
 			<arg value="/I${sdkhome}\include"/>
-			<arg value="/I${alhome}\include"/>
 			<arg value="/I${java.home}\..\include"/>
 			<arg value="/I${java.home}\..\include\win32"/>
 			<arg value="/I${native}\common"/>
@@ -31,8 +27,7 @@
 			<srcfile/>
 			<arg line="/Fe${dllname} /link"/>
 			<arg value="/LIBPATH:${java.home}\..\lib"/>
-			<arg value="/LIBPATH:${sdkhome}\lib"/>
-			<arg value="/LIBPATH:${alhome}\libs"/>
+			<arg value="/LIBPATH:${sdkhomelib}"/>
 			<arg value="/OPT:REF"/>
 			<arg value="/OPT:ICF"/>
 			<arg line="/DLL /DELAYLOAD:jawt.dll ${libs}"/>
@@ -50,8 +45,13 @@
 	</target>
 	
 	<target name="compile">
-		<echo message="${sdkhome}"/>
-		<echo message="${program_files}"/>
+		<condition property="sdkhomelib" value="${sdkhome}\lib" else="${sdkhome}\lib\x64">
+			<equals arg1="${os.arch}" arg2="x86"/>
+		</condition>
+		<condition property="dllname" value="lwjgl.dll" else="lwjgl64.dll">
+			<equals arg1="${os.arch}" arg2="x86"/>
+		</condition>
+		<echo message="${sdkhomelib}"/>
 		<property name="libs" value="Kernel32.lib ole32.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
 		<antcall target="compile_dir"/>
 		<antcall target="link"/>


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

[Java-game-lib-cvs] Super Sensual Love Making In BBed

[Borucki K. <sym...@pi...>]

Mega Secrets To Super Sensual Love Making In Bed - Be Absoolutely Mind Blowing
<http://cid-e91c47c221d32cf0.spaces.live.com/blog/cns!E91C47C221D32CF0!104.entry?eadlghfihaabffcmez>

He bade her be seated. Very willingly she complied any kind
or to encounter any fear. Indeed, he.

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

[<kev...@us...>]

Revision: 3195
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3195&view=rev
Author:   kevglass
Date:     2009-04-05 22:07:46 +0000 (Sun, 05 Apr 2009)

Log Message:
-----------
Ported GLU tessellation code from JOGL to work within LWJGL

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/test/glu/
    trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/
    trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/TessCallback.java
    trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/TessellationTest.java
    trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/VertexData.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellator.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellatorCallback.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/ActiveRegion.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/CachedVertex.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/Dict.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/DictNode.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/GLUface.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/GLUhalfEdge.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/GLUmesh.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/GLUtessellatorImpl.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/GLUvertex.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/Geom.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/Mesh.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/Normal.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/PriorityQ.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/PriorityQHeap.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/PriorityQSort.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/Render.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/Sweep.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/TessMono.java
    trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/TessState.java

Added: trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/TessCallback.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/TessCallback.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/TessCallback.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2002-2008 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.test.glu.tessellation;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.glu.GLUtessellatorCallbackAdapter;
+
+public class TessCallback extends GLUtessellatorCallbackAdapter {
+
+	public void begin(int type) {
+		GL11.glBegin(type);
+	}
+
+	public void combine(double[] coords, Object[] data, float[] weight, Object[] outData) {
+		for (int i=0;i<outData.length;i++) {
+			double[] combined = new double[6];
+			combined[0] = coords[0];
+			combined[1] = coords[1];
+			combined[2] = coords[2];
+			combined[3] = 1;
+			combined[4] = 1;
+			combined[5] = 1;
+			
+			outData[i] = new VertexData(combined);
+		}
+//		vertex[0] = coords[0];
+//		vertex[1] = coords[1];
+//		vertex[2] = coords[2];
+//
+//		for (int i = 3; i < 6; i++)
+//		{
+//		vertex[i] = weight[0] * vertex_data[0][i] +
+//		indent indweight[1] * vertex_data[1][i] +
+//		indent indweight[2] * vertex_data[2][i] +
+//		indent indweight[3] * vertex_data[3][i];
+//		}
+//
+//		*dataOut = vertex;
+	}
+	
+	public void end() {
+		GL11.glEnd();
+	}
+
+	public void vertex(Object vertexData) {
+		VertexData vertex = (VertexData) vertexData;
+
+		GL11.glVertex3d(vertex.data[0], vertex.data[1], vertex.data[2]);
+		GL11.glColor3d(vertex.data[3], vertex.data[4], vertex.data[5]);
+	}
+}

Added: trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/TessellationTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/TessellationTest.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/TessellationTest.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2002-2008 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.test.glu.tessellation;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.DisplayMode;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.glu.GLU;
+import org.lwjgl.util.glu.GLUtessellator;
+
+public class TessellationTest {
+	private GLUtessellator tesselator;
+	
+	void init()
+	{
+		// Create a new tessellation object 
+		tesselator = GLU.gluNewTess();
+	
+		// Set callback functions
+		TessCallback callback = new TessCallback();
+		tesselator.gluTessCallback(GLU.GLU_TESS_VERTEX, callback);
+		tesselator.gluTessCallback(GLU.GLU_TESS_BEGIN, callback);
+		tesselator.gluTessCallback(GLU.GLU_TESS_END, callback);
+		tesselator.gluTessCallback(GLU.GLU_TESS_COMBINE, callback);
+	}
+
+	void setWindingRule(int windingRule)
+	{
+		// Set the winding rule
+		tesselator.gluTessProperty(GLU.GLU_TESS_WINDING_RULE, windingRule); 
+	}
+	 
+	void renderContour(double obj_data[][], int num_vertices)
+	{
+		for (int x = 0; x < num_vertices; x++) //loop through the vertices
+		{
+			tesselator.gluTessVertex(obj_data[x], 0, new VertexData(obj_data[x])); //store the vertex
+		}
+	}
+	
+	void beginPolygon()
+	{
+		tesselator.gluTessBeginPolygon(null);
+	}
+
+	void endPolygon()
+	{
+		tesselator.gluTessEndPolygon();
+	}
+	
+	void beginContour()
+	{
+		tesselator.gluTessBeginContour();
+	}
+
+	void endContour()
+	{
+		tesselator.gluTessEndContour();
+	}
+	
+	void end()
+	{
+		tesselator.gluDeleteTess();
+	}
+
+	private void createDisplay() throws LWJGLException {
+		int width = 300;
+		int height = 300;
+		
+		Display.setDisplayMode(new DisplayMode(width,height));
+		Display.create();
+		Display.setVSyncEnabled(true);
+
+		GL11.glEnable(GL11.GL_TEXTURE_2D);
+		GL11.glShadeModel(GL11.GL_SMOOTH);        
+		GL11.glDisable(GL11.GL_DEPTH_TEST);
+		GL11.glDisable(GL11.GL_LIGHTING);                    
+        
+		GL11.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);                
+        GL11.glClearDepth(1);                                       
+        
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        
+        GL11.glViewport(0,0,width,height);
+		GL11.glMatrixMode(GL11.GL_MODELVIEW);
+
+		GL11.glMatrixMode(GL11.GL_PROJECTION);
+		GL11.glLoadIdentity();
+		GL11.glOrtho(0, width, height, 0, 1, -1);
+		GL11.glMatrixMode(GL11.GL_MODELVIEW);
+	}
+	
+	private void loop() {
+		while (true) {
+			render();
+			Display.update();
+			Display.sync(100);
+			
+			if (Display.isCloseRequested()) {
+				System.exit(0);
+			}
+		}
+	}
+	
+	private void render() {
+		GL11.glTranslatef(150,125,0);
+		
+		GL11.glScalef(50,50,1);
+		// first polygon: a star-5 vertices and color information
+		double star[][] = { {0.6f,  -0.1f, 0f, 1.0f, 1.0f, 1.0f},
+                {1.35f, 1.4f, 0f, 1.0f, 1.0f, 1.0f},
+                {2.1f,  -0.1f, 0f, 1.0f, 1.0f, 1.0f},
+                {0.6f, 0.9f, 0f, 1.0f, 1.0f, 1.0f},
+                {2.1f, 0.9f, 0f, 1.0f, 1.0f, 1.0f} };
+
+		//second polygon: a quad-4 vertices; first contour
+		double quad[][] = { {0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f},
+		                {1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f},
+		                {1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f},
+		                {0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f} };
+		
+		//second polygon: a triangle-3 vertices; second contour
+		double tri[][] = {{0.3f, 0.3f, 0.0f, 0.0f, 0.0f, 0.0f},
+		               {0.7f, 0.3f, 0.0f, 0.0f, 0.0f, 0.0f},
+		               {0.5f, 0.7f, 0.0f, 0.0f, 0.0f, 0.0f} };
+
+		// render the first polygon: the textured star
+		
+		// set winding rule to positive
+		setWindingRule(GLU.GLU_TESS_WINDING_POSITIVE);
+		beginPolygon();
+		beginContour();
+		renderContour(star, 5);
+		endContour();
+		endPolygon();
+
+		// render the second polygon: triangle cut out of a quad
+
+		GL11.glTranslatef(-2,0,0);
+		// set winding rule to odd
+		setWindingRule(GLU.GLU_TESS_WINDING_ODD);
+		// begin the new polygon
+		beginPolygon();
+		beginContour();
+		renderContour(quad, 4);
+		endContour();
+		beginContour();
+		renderContour(tri, 3);
+		endContour();
+		endPolygon();
+		// delete the tess object
+		end();
+	}
+	
+	private void start() throws LWJGLException {
+		createDisplay();
+		init();
+		loop();
+	}
+	
+	public static void main(String[] argv) throws LWJGLException {
+		TessellationTest test = new TessellationTest();
+		test.start();
+	}
+}

Added: trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/VertexData.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/VertexData.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/glu/tessellation/VertexData.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2002-2008 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.test.glu.tessellation;
+
+class VertexData {
+	public double[] data;
+	
+	VertexData(double[] data) {
+		this.data = data;
+	}
+}

Modified: trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java	2009-04-04 19:19:43 UTC (rev 3194)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/GLU.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -37,6 +37,7 @@
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.Util;
+import org.lwjgl.util.glu.tessellation.GLUtessellatorImpl;
 
 /**
  * GLU.java
@@ -86,6 +87,7 @@
 
 	/****           Tesselation constants           ****/
 
+	public static final double GLU_TESS_MAX_COORD              = 1.0e150;
 	public static final double TESS_MAX_COORD              = 1.0e150;
 
 	/* TessProperty */
@@ -420,4 +422,8 @@
 				return Util.translateGLErrorString(error_code);
 		}
 	}
+	
+	public static GLUtessellator gluNewTess() {
+		return new GLUtessellatorImpl();
+	}
 }

Added: trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellator.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellator.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2002-2008 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.glu;
+
+public interface GLUtessellator {
+
+	public abstract void gluDeleteTess();
+
+	public abstract void gluTessProperty(int which, double value);
+
+	/* Returns tessellator property */
+	public abstract void gluGetTessProperty(int which, double[] value,
+			int value_offset); /* gluGetTessProperty() */
+
+	public abstract void gluTessNormal(double x, double y, double z);
+
+	public abstract void gluTessCallback(int which,
+			GLUtessellatorCallback aCallback);
+
+	public abstract void gluTessVertex(double[] coords, int coords_offset,
+			Object vertexData);
+
+	public abstract void gluTessBeginPolygon(Object data);
+
+	public abstract void gluTessBeginContour();
+
+	public abstract void gluTessEndContour();
+
+	public abstract void gluTessEndPolygon();
+
+	/*******************************************************/
+
+	/* Obsolete calls -- for backward compatibility */
+
+	public abstract void gluBeginPolygon();
+
+	/*ARGSUSED*/
+	public abstract void gluNextContour(int type);
+
+	public abstract void gluEndPolygon();
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellatorCallback.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellatorCallback.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellatorCallback.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 2002-2008 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.
+ */
+
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package org.lwjgl.util.glu;
+
+/**
+ * <b>GLUtessellatorCallback</b> interface provides methods that the user will
+ * override to define the callbacks for a tessellation object.
+ *
+ * @author Eric Veach, July 1994
+ * @author Java Port: Pepijn Van Eeckhoudt, July 2003
+ * @author Java Port: Nathan Parker Burg, August 2003
+ */
+public interface GLUtessellatorCallback {
+  /**
+   * The <b>begin</b> callback method is invoked like
+   * {@link javax.media.opengl.GL#glBegin glBegin} to indicate the start of a
+   * (triangle) primitive. The method takes a single argument of type int. If
+   * the <b>GLU_TESS_BOUNDARY_ONLY</b> property is set to <b>GL_FALSE</b>, then
+   * the argument is set to either <b>GL_TRIANGLE_FAN</b>,
+   * <b>GL_TRIANGLE_STRIP</b>, or <b>GL_TRIANGLES</b>. If the
+   * <b>GLU_TESS_BOUNDARY_ONLY</b> property is set to <b>GL_TRUE</b>, then the
+   * argument will be set to <b>GL_LINE_LOOP</b>.
+   *
+   * @param type
+   *        Specifics the type of begin/end pair being defined.  The following
+   *        values are valid:  <b>GL_TRIANGLE_FAN</b>, <b>GL_TRIANGLE_STRIP</b>,
+   *        <b>GL_TRIANGLES</b> or <b>GL_LINE_LOOP</b>.
+   *
+   * @see GLU#gluTessCallback           gluTessCallback
+   * @see #end     end
+   * @see #begin   begin
+   */
+  public void begin(int type);
+
+  /**
+   * The same as the {@link #begin begin} callback method except that
+   * it takes an additional reference argument. This reference is
+   * identical to the opaque reference provided when {@link
+   * GLU#gluTessBeginPolygon gluTessBeginPolygon} was called.
+   *
+   * @param type
+   *        Specifics the type of begin/end pair being defined.  The following
+   *        values are valid:  <b>GL_TRIANGLE_FAN</b>, <b>GL_TRIANGLE_STRIP</b>,
+   *        <b>GL_TRIANGLES</b> or <b>GL_LINE_LOOP</b>.
+   * @param polygonData
+   *        Specifics a reference to user-defined data.
+   *
+   * @see GLU#gluTessCallback           gluTessCallback
+   * @see #endData endData
+   * @see #begin   begin
+   */
+  public void beginData(int type, Object polygonData);
+
+
+  /**
+   * The <b>edgeFlag</b> callback method is similar to
+   * {@link javax.media.opengl.GL#glEdgeFlag glEdgeFlag}. The method takes
+   * a single boolean boundaryEdge that indicates which edges lie on the
+   * polygon boundary. If the boundaryEdge is <b>GL_TRUE</b>, then each vertex
+   * that follows begins an edge that lies on the polygon boundary, that is,
+   * an edge that separates an interior region from an exterior one. If the
+   * boundaryEdge is <b>GL_FALSE</b>, then each vertex that follows begins an
+   * edge that lies in the polygon interior. The edge flag callback (if
+   * defined) is invoked before the first vertex callback.<P>
+   *
+   * Since triangle fans and triangle strips do not support edge flags, the
+   * begin callback is not called with <b>GL_TRIANGLE_FAN</b> or
+   * <b>GL_TRIANGLE_STRIP</b> if a non-null edge flag callback is provided.
+   * (If the callback is initialized to null, there is no impact on
+   * performance). Instead, the fans and strips are converted to independent
+   * triangles.
+   *
+   * @param boundaryEdge
+   *        Specifics which edges lie on the polygon boundary.
+   *
+   * @see GLU#gluTessCallback gluTessCallback
+   * @see #edgeFlagData edgeFlagData
+   */
+  public void edgeFlag(boolean boundaryEdge);
+
+
+  /**
+   * The same as the {@link #edgeFlag edgeFlage} callback method
+   * except that it takes an additional reference argument. This
+   * reference is identical to the opaque reference provided when
+   * {@link GLU#gluTessBeginPolygon gluTessBeginPolygon} was called.
+   *
+   * @param boundaryEdge
+   *        Specifics which edges lie on the polygon boundary.
+   * @param polygonData
+   *        Specifics a reference to user-defined data.
+   *
+   * @see GLU#gluTessCallback            gluTessCallback
+   * @see #edgeFlag edgeFlag
+   */
+  public void edgeFlagData(boolean boundaryEdge, Object polygonData);
+
+
+  /**
+   * The <b>vertex</b> callback method is invoked between the {@link
+   * #begin begin} and {@link #end end} callback methods.  It is
+   * similar to {@link javax.media.opengl.GL#glVertex3f glVertex3f},
+   * and it defines the vertices of the triangles created by the
+   * tessellation process.  The method takes a reference as its only
+   * argument. This reference is identical to the opaque reference
+   * provided by the user when the vertex was described (see {@link
+   * GLU#gluTessVertex gluTessVertex}).
+   *
+   * @param vertexData
+   *        Specifics a reference to the vertices of the triangles created
+   *        byt the tessellatin process.
+   *
+   * @see GLU#gluTessCallback              gluTessCallback
+   * @see #vertexData vertexData
+   */
+  public void vertex(Object vertexData);
+
+
+  /**
+   * The same as the {@link #vertex vertex} callback method except
+   * that it takes an additional reference argument. This reference is
+   * identical to the opaque reference provided when {@link
+   * GLU#gluTessBeginPolygon gluTessBeginPolygon} was called.
+   *
+   * @param vertexData
+   *        Specifics a reference to the vertices of the triangles created
+   *        byt the tessellatin process.
+   * @param polygonData
+   *        Specifics a reference to user-defined data.
+   *
+   * @see GLU#gluTessCallback          gluTessCallback
+   * @see #vertex vertex
+   */
+  public void vertexData(Object vertexData, Object polygonData);
+
+
+  /**
+   * The end callback serves the same purpose as
+   * {@link javax.media.opengl.GL#glEnd glEnd}. It indicates the end of a
+   * primitive and it takes no arguments.
+   *
+   * @see GLU#gluTessCallback           gluTessCallback
+   * @see #begin   begin
+   * @see #endData endData
+   */
+  public void end();
+
+
+  /**
+   * The same as the {@link #end end} callback method except that it
+   * takes an additional reference argument. This reference is
+   * identical to the opaque reference provided when {@link
+   * GLU#gluTessBeginPolygon gluTessBeginPolygon} was called.
+   *
+   * @param polygonData
+   *        Specifics a reference to user-defined data.
+   *
+   * @see GLU#gluTessCallback             gluTessCallback
+   * @see #beginData beginData
+   * @see #end       end
+   */
+  public void endData(Object polygonData);
+
+
+  /**
+   * The <b>combine</b> callback method is called to create a new vertex when
+   * the tessellation detects an intersection, or wishes to merge features. The
+   * method takes four arguments: an array of three elements each of type
+   * double, an array of four references, an array of four elements each of
+   * type float, and a reference to a reference.<P>
+   *
+   * The vertex is defined as a linear combination of up to four existing
+   * vertices, stored in <i>data</i>. The coefficients of the linear combination
+   * are given by <i>weight</i>; these weights always add up to 1. All vertex
+   * pointers are valid even when some of the weights are 0. <i>coords</i> gives
+   * the location of the new vertex.<P>
+   *
+   * The user must allocate another vertex, interpolate parameters using
+   * <i>data</i> and <i>weight</i>, and return the new vertex pointer in
+   * <i>outData</i>. This handle is supplied during rendering callbacks. The
+   * user is responsible for freeing the memory some time after
+   * {@link GLU#gluTessEndPolygon gluTessEndPolygon} is
+   * called.<P>
+   *
+   * For example, if the polygon lies in an arbitrary plane in 3-space, and a
+   * color is associated with each vertex, the <b>GLU_TESS_COMBINE</b>
+   * callback might look like this:
+   * </UL>
+   * <PRE>
+   *         void myCombine(double[] coords, Object[] data,
+   *                        float[] weight, Object[] outData)
+   *         {
+   *            MyVertex newVertex = new MyVertex();
+   *
+   *            newVertex.x = coords[0];
+   *            newVertex.y = coords[1];
+   *            newVertex.z = coords[2];
+   *            newVertex.r = weight[0]*data[0].r +
+   *                          weight[1]*data[1].r +
+   *                          weight[2]*data[2].r +
+   *                          weight[3]*data[3].r;
+   *            newVertex.g = weight[0]*data[0].g +
+   *                          weight[1]*data[1].g +
+   *                          weight[2]*data[2].g +
+   *                          weight[3]*data[3].g;
+   *            newVertex.b = weight[0]*data[0].b +
+   *                          weight[1]*data[1].b +
+   *                          weight[2]*data[2].b +
+   *                          weight[3]*data[3].b;
+   *            newVertex.a = weight[0]*data[0].a +
+   *                          weight[1]*data[1].a +
+   *                          weight[2]*data[2].a +
+   *                          weight[3]*data[3].a;
+   *            outData = newVertex;
+   *         }</PRE>
+   *
+   * @param coords
+   *        Specifics the location of the new vertex.
+   * @param data
+   *        Specifics the vertices used to create the new vertex.
+   * @param weight
+   *        Specifics the weights used to create the new vertex.
+   * @param outData
+   *        Reference user the put the coodinates of the new vertex.
+   *
+   * @see GLU#gluTessCallback               gluTessCallback
+   * @see #combineData combineData
+   */
+  public void combine(double[] coords, Object[] data,
+                      float[] weight, Object[] outData);
+
+
+  /**
+   * The same as the {@link #combine combine} callback method except
+   * that it takes an additional reference argument. This reference is
+   * identical to the opaque reference provided when {@link
+   * GLU#gluTessBeginPolygon gluTessBeginPolygon} was called.
+   *
+   * @param coords
+   *        Specifics the location of the new vertex.
+   * @param data
+   *        Specifics the vertices used to create the new vertex.
+   * @param weight
+   *        Specifics the weights used to create the new vertex.
+   * @param outData
+   *        Reference user the put the coodinates of the new vertex.
+   * @param polygonData
+   *        Specifics a reference to user-defined data.
+   *
+   * @see GLU#gluTessCallback           gluTessCallback
+   * @see #combine combine
+   */
+  public void combineData(double[] coords, Object[] data,
+                          float[] weight, Object[] outData,
+                          Object polygonData);
+
+
+  /**
+   * The <b>error</b> callback method is called when an error is encountered.
+   * The one argument is of type int; it indicates the specific error that
+   * occurred and will be set to one of <b>GLU_TESS_MISSING_BEGIN_POLYGON</b>,
+   * <b>GLU_TESS_MISSING_END_POLYGON</b>, <b>GLU_TESS_MISSING_BEGIN_CONTOUR</b>,
+   * <b>GLU_TESS_MISSING_END_CONTOUR</b>, <b>GLU_TESS_COORD_TOO_LARGE</b>,
+   * <b>GLU_TESS_NEED_COMBINE_CALLBACK</b> or <b>GLU_OUT_OF_MEMORY</b>.
+   * Character strings describing these errors can be retrieved with the
+   * {@link GLU#gluErrorString gluErrorString} call.<P>
+   *
+   * The GLU library will recover from the first four errors by inserting the
+   * missing call(s). <b>GLU_TESS_COORD_TOO_LARGE</b> indicates that some
+   * vertex coordinate exceeded the predefined constant
+   * <b>GLU_TESS_MAX_COORD</b> in absolute value, and that the value has been
+   * clamped. (Coordinate values must be small enough so that two can be
+   * multiplied together without overflow.)
+   * <b>GLU_TESS_NEED_COMBINE_CALLBACK</b> indicates that the tessellation
+   * detected an intersection between two edges in the input data, and the
+   * <b>GLU_TESS_COMBINE</b> or <b>GLU_TESS_COMBINE_DATA</b> callback was not
+   * provided. No output is generated. <b>GLU_OUT_OF_MEMORY</b> indicates that
+   * there is not enough memory so no output is generated.
+   *
+   * @param errnum
+   *        Specifics the error number code.
+   *
+   * @see GLU#gluTessCallback             gluTessCallback
+   * @see #errorData errorData
+   */
+  public void error(int errnum);
+
+
+  /**
+   * The same as the {@link #error error} callback method except that
+   * it takes an additional reference argument. This reference is
+   * identical to the opaque reference provided when {@link
+   * GLU#gluTessBeginPolygon gluTessBeginPolygon} was called.
+   *
+   * @param errnum
+   *        Specifics the error number code.
+   * @param polygonData
+   *        Specifics a reference to user-defined data.
+   *
+   * @see GLU#gluTessCallback         gluTessCallback
+   * @see #error error
+   */
+  public void errorData(int errnum, Object polygonData);
+
+  //void mesh(com.sun.opengl.impl.tessellator.GLUmesh mesh);
+}

Added: trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2002-2008 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.
+ */
+
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package org.lwjgl.util.glu;
+
+/**
+ * The <b>GLUtessellatorCallbackAdapter</b> provides a default implementation of
+ * {@link GLUtessellatorCallback GLUtessellatorCallback}
+ * with empty callback methods.  This class can be extended to provide user
+ * defined callback methods.
+ *
+ * @author Eric Veach, July 1994
+ * @author Java Port: Pepijn Van Eechhoudt, July 2003
+ * @author Java Port: Nathan Parker Burg, August 2003
+ */
+
+public class GLUtessellatorCallbackAdapter implements GLUtessellatorCallback {
+    public void begin(int type) {}
+    public void edgeFlag(boolean boundaryEdge) {}
+    public void vertex(Object vertexData) {}
+    public void end() {}
+//  public void mesh(com.sun.opengl.impl.tessellator.GLUmesh mesh) {}
+    public void error(int errnum) {}
+    public void combine(double[] coords, Object[] data,
+                            float[] weight, Object[] outData) {}
+    public void beginData(int type, Object polygonData) {}
+    public void edgeFlagData(boolean boundaryEdge,
+                                 Object polygonData) {}
+    public void vertexData(Object vertexData, Object polygonData) {}
+    public void endData(Object polygonData) {}
+    public void errorData(int errnum, Object polygonData) {}
+    public void combineData(double[] coords, Object[] data,
+                                float[] weight, Object[] outData,
+                                Object polygonData) {}
+}

Added: trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/ActiveRegion.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/ActiveRegion.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/ActiveRegion.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2002-2008 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.
+ */
+
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package org.lwjgl.util.glu.tessellation;
+
+class ActiveRegion {
+    GLUhalfEdge eUp;		/* upper edge, directed right to left */
+    DictNode nodeUp;	/* dictionary node corresponding to eUp */
+    int windingNumber;	/* used to determine which regions are
+                                 * inside the polygon */
+    boolean inside;		/* is this region inside the polygon? */
+    boolean sentinel;	/* marks fake edges at t = +/-infinity */
+    boolean dirty;		/* marks regions where the upper or lower
+                                 * edge has changed, but we haven't checked
+                                 * whether they intersect yet */
+    boolean fixUpperEdge;	/* marks temporary edges introduced when
+                                 * we process a "right vertex" (one without
+                                 * any edges leaving to the right) */
+}

Added: trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/CachedVertex.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/CachedVertex.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/CachedVertex.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2002-2008 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.
+ */
+
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package org.lwjgl.util.glu.tessellation;
+
+class CachedVertex {
+    public double[] coords = new double[3];
+    public Object data;
+}

Added: trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/Dict.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/Dict.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/Dict.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2002-2008 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.
+ */
+
+/*
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
+* All rights reserved.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+** Author: Eric Veach, July 1994
+** Java Port: Pepijn Van Eeckhoudt, July 2003
+** Java Port: Nathan Parker Burg, August 2003
+*/
+package org.lwjgl.util.glu.tessellation;
+
+class Dict {
+    DictNode head;
+    Object frame;
+    DictLeq leq;
+
+    private Dict() {
+    }
+
+    static Dict dictNewDict(Object frame, DictLeq leq) {
+        Dict dict = new Dict();
+        dict.head = new DictNode();
+
+        dict.head.key = null;
+        dict.head.next = dict.head;
+        dict.head.prev = dict.head;
+
+        dict.frame = frame;
+        dict.leq = leq;
+
+        return dict;
+    }
+
+    static void dictDeleteDict(Dict dict) {
+        dict.head = null;
+        dict.frame = null;
+        dict.leq = null;
+    }
+
+    static DictNode dictInsert(Dict dict, Object key) {
+        return dictInsertBefore(dict, dict.head, key);
+    }
+
+    static DictNode dictInsertBefore(Dict dict, DictNode node, Object key) {
+        do {
+            node = node.prev;
+        } while (node.key != null && !dict.leq.leq(dict.frame, node.key, key));
+
+        DictNode newNode = new DictNode();
+        newNode.key = key;
+        newNode.next = node.next;
+        node.next.prev = newNode;
+        newNode.prev = node;
+        node.next = newNode;
+
+        return newNode;
+    }
+
+    static Object dictKey(DictNode aNode) {
+        return aNode.key;
+    }
+
+    static DictNode dictSucc(DictNode aNode) {
+        return aNode.next;
+    }
+
+    static DictNode dictPred(DictNode aNode) {
+        return aNode.prev;
+    }
+
+    static DictNode dictMin(Dict aDict) {
+        return aDict.head.next;
+    }
+
+    static DictNode dictMax(Dict aDict) {
+        return aDict.head.prev;
+    }
+
+    static void dictDelete(Dict dict, DictNode node) {
+        node.next.prev = node.prev;
+        node.prev.next = node.next;
+    }
+
+    static DictNode dictSearch(Dict dict, Object key) {
+        DictNode node = dict.head;
+
+        do {
+            node = node.next;
+        } while (node.key != null && !(dict.leq.leq(dict.frame, key, node.key)));
+
+        return node;
+    }
+
+    public interface DictLeq {
+        boolean leq(Object frame, Object key1, Object key2);
+    }
+}

Added: trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/DictNode.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/DictNode.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/glu/tessellation/DictNode.java	2009-04-05 22:07:46 UTC (rev 3195)
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2002-2008 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 TH...
 
[truncated message content]

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

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

Revision: 3194
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3194&view=rev
Author:   spasi
Date:     2009-04-04 19:19:43 +0000 (Sat, 04 Apr 2009)

Log Message:
-----------
Fixed ContextAttribs version validation.
Added OpenGL version test.

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

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2009-03-27 12:56:14 UTC (rev 3193)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2009-04-04 19:19:43 UTC (rev 3194)
@@ -72,7 +72,7 @@
 		if ( majorVersion < 0 ||
 		     3 < majorVersion ||
 		     minorVersion < 0 ||
-		     (majorVersion == 3 && 0 < minorVersion) ||
+		     (majorVersion == 3 && 1 < minorVersion) ||
 		     (majorVersion == 2 && 1 < minorVersion) ||
 		     (majorVersion == 1 && 5 < minorVersion) )
 			throw new IllegalArgumentException("Invalid OpenGL version specified: " + majorVersion + '.' + minorVersion);

Added: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java	2009-04-04 19:19:43 UTC (rev 3194)
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2002-2008 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.
+ */
+/*
+ * Created by LWJGL.
+ * User: spasi
+ * Date: 2009-04-04
+ * Time: 21:20:24 pm
+ */
+
+package org.lwjgl.test.opengl;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.opengl.*;
+
+import java.util.StringTokenizer;
+import java.util.regex.Pattern;
+
+public final class VersionTest {
+
+	private VersionTest() {
+	}
+
+	public static void main(String[] args) {
+		initialize(args);
+		cleanup();
+		System.exit(0);
+	}
+
+	private static void initialize(String[] args) {
+		if ( args.length < 2 )
+			argsError("Insufficient number of arguments");
+
+		int majorInput = 1;
+		int minorInput = 0;
+
+		try {
+			majorInput = Integer.parseInt(args[0]);
+			minorInput = Integer.parseInt(args[1]);
+		} catch (NumberFormatException e) {
+			argsError("Invalid number format");
+		}
+
+		ContextAttribs ca = new ContextAttribs(majorInput, minorInput);
+
+		if ( 2 < args.length ) {
+			for ( int i = 2; i < args.length; i++ ) {
+				if ( Pattern.matches("[0-9]+", args[i]) )
+					ca = ca.withLayer(Integer.parseInt(args[i]));
+				else if ( "debug".equalsIgnoreCase(args[i]) )
+					ca = ca.withDebug(true);
+				else if ( "fc".equalsIgnoreCase(args[i]) )
+					ca = ca.withForwardCompatible(true);
+				else
+					argsError("Unknown argument: \'" + args[i] + "\'");
+			}
+		}
+
+		try {
+			DisplayMode[] modes = Display.getAvailableDisplayModes();
+
+			DisplayMode displayMode;
+
+			displayMode = chooseMode(modes, 1024, 768);
+			if ( displayMode == null )
+				displayMode = chooseMode(modes, 800, 600);
+			if ( displayMode == null )
+				displayMode = chooseMode(modes, 640, 480);
+			if ( displayMode == null )
+				kill("Failed to set an appropriate display mode.");
+
+			System.out.println("Setting display mode to: " + displayMode);
+			Display.setDisplayMode(displayMode);
+			Display.create(new PixelFormat(8, 24, 0), ca);
+		} catch (LWJGLException e) {
+			kill(e.getMessage());
+		}
+
+		System.out.println("\n---------\n");
+
+		final String version = GL11.glGetString(GL11.GL_VERSION);
+
+		System.out.println("GL Version requested: " + majorInput + '.' + minorInput);
+		System.out.println("GL Version returned : " + version);
+
+		final StringTokenizer version_tokenizer = new StringTokenizer(version, ". ");
+
+		int majorVersion = Integer.parseInt(version_tokenizer.nextToken());
+		int minorVersion = Integer.parseInt(version_tokenizer.nextToken());
+
+		if ( majorVersion != majorInput || minorVersion != minorInput ) {
+			if ( majorInput == 1 && minorInput == 0 )
+				System.out.println("\tThe maximum supported version has been returned. The driver is well-behaved. :)");
+			else if ( majorInput < 3 && majorVersion < 3 )
+				System.out.println("\tThe maximum supported version pre-3.0 has been returned. The driver is well-behaved. :)");
+			else
+				System.out.println("\tThe requested version was not returned. The driver is buggy! :(");
+		} else
+			System.out.println("\tThe requested version was returned. :)");
+
+		System.out.println("\n---------\n");
+
+		System.out.println("Debug mode: " + ca.isDebug());
+		System.out.println("Forward compatible mode: " + ca.isForwardCompatible());
+		System.out.println("ARB_compatibility: " + GLContext.getCapabilities().GL_ARB_compatibility);
+		try {
+			GL11.glVertex3f(0.0f, 0.0f, 0.0f);
+			System.out.println("Deprecated functionality present: " + true);
+		} catch (Throwable t) {
+			System.out.println("Deprecated functionality present: " + false);
+			if ( GLContext.getCapabilities().GL_ARB_compatibility ) {
+				System.out.println("\tARB_compatibility is present, but LWJGL has enabled pseudo-forward compatible mode.");
+			}
+		}
+	}
+
+	private static DisplayMode chooseMode(DisplayMode[] modes, int width, int height) {
+		DisplayMode bestMode = null;
+
+		for ( int i = 0; i < modes.length; i++ ) {
+			DisplayMode mode = modes[i];
+			if ( mode.getWidth() == width && mode.getHeight() == height && mode.getFrequency() <= 85 ) {
+				if ( bestMode == null || (mode.getBitsPerPixel() >= bestMode.getBitsPerPixel() && mode.getFrequency() > bestMode.getFrequency()) )
+					bestMode = mode;
+			}
+		}
+
+		return bestMode;
+	}
+
+	private static void cleanup() {
+		if ( Display.isCreated() )
+			Display.destroy();
+	}
+
+	private static void argsError(final String msg) {
+		System.out.println("\nInvalid arguments error: " + msg);
+		System.out.println("\nUsage: VersionTest <majorVersion> <minorVersion> {<layer>, 'debug', 'fc'}:\n");
+		System.out.println("majorVersion\t- Major OpenGL version.");
+		System.out.println("majorVersion\t- Minor OpenGL version.");
+		System.out.println("layer\t- Layer plane (optional).");
+		System.out.println("debug\t- Enables debug mode (optional).");
+		System.out.println("fc\t- Enables forward compatibility mode (optional).");
+
+		cleanup();
+		System.exit(-1);
+	}
+
+	static void kill(String reason) {
+		System.out.println("The VersionTest program was terminated because an error occured.\n");
+		System.out.println("Reason: " + (reason == null ? "Unknown" : reason));
+
+		cleanup();
+		System.exit(-1);
+	}
+
+}
\ No newline at end of file


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3193] trunk/LWJGL/src/templates/org/lwjgl/opengl

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

Revision: 3193
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3193&view=rev
Author:   spasi
Date:     2009-03-27 12:56:14 +0000 (Fri, 27 Mar 2009)

Log Message:
-----------
Added support for ARB_copy_buffer and updated the GL31 copy buffer tokens.

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

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java	2009-03-27 12:56:14 UTC (rev 3193)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2002-2008 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.GLenum;
+import org.lwjgl.util.generator.GLintptr;
+import org.lwjgl.util.generator.GLsizeiptr;
+
+public interface ARB_copy_buffer {
+
+	/**
+	 * Accepted by the target parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+	 * GetBufferPointerv, MapBufferRange, FlushMappedBufferRange,
+	 * GetBufferParameteriv, BindBufferRange, BindBufferBase,
+	 * and CopyBufferSubData:
+	 */
+	int GL_COPY_READ_BUFFER = 0x8F36;
+	int GL_COPY_WRITE_BUFFER = 0x8F37;
+
+	void glCopyBufferSubData(@GLenum int readTarget, @GLenum int writeTarget,
+	                         @GLintptr long readOffset, @GLintptr long writeOffset,
+	                         @GLsizeiptr long size);
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2009-03-26 11:15:43 UTC (rev 3192)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2009-03-27 12:56:14 UTC (rev 3193)
@@ -74,8 +74,8 @@
 	// ----------------------[ EXT_copy_buffer ]----------------------
 	// ---------------------------------------------------------------
 
-	int GL_COPY_READ_BUFFER = 0x0; // TODO: Find this value
-	int GL_COPY_WRITE_BUFFER = 0x0; // TODO: Find this value
+	int GL_COPY_READ_BUFFER = 0x8F36;
+	int GL_COPY_WRITE_BUFFER = 0x8F37;
 
 	void glCopyBufferSubData(@GLenum int readtarget, @GLenum int writetarget, @GLintptr long readoffset, @GLintptr long writeoffset, @GLsizeiptr long size);
 


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3192] trunk/LWJGL/src/native/linux/extgl_glx.h

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

Revision: 3192
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3192&view=rev
Author:   spasi
Date:     2009-03-26 11:15:43 +0000 (Thu, 26 Mar 2009)

Log Message:
-----------
Added GLX_ARB_create_context tokens.

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/extgl_glx.h

Modified: trunk/LWJGL/src/native/linux/extgl_glx.h
===================================================================
--- trunk/LWJGL/src/native/linux/extgl_glx.h	2009-03-26 11:08:43 UTC (rev 3191)
+++ trunk/LWJGL/src/native/linux/extgl_glx.h	2009-03-26 11:15:43 UTC (rev 3192)
@@ -263,6 +263,14 @@
 /* GLX_ARB_framebuffer_sRGB  */
 #define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB	0x20B2
 
+/* GLX_ARB_create_context  */
+#define GLX_CONTEXT_MAJOR_VERSION_ARB	0x2091
+#define GLX_CONTEXT_MINOR_VERSION_ARB	0x2092
+#define GLX_CONTEXT_FLAGS_ARB			0x2094
+
+#define GLX_CONTEXT_DEBUG_BIT_ARB				0x0001
+#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB	0x0002
+
 typedef XID GLXContextID;
 typedef XID GLXPixmap;
 typedef XID GLXDrawable;


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

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

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

Revision: 3191
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3191&view=rev
Author:   spasi
Date:     2009-03-26 11:08:43 +0000 (Thu, 26 Mar 2009)

Log Message:
-----------
Force forward compatible mode when we have GL3.1+ but miss ARB_compatibility.
Added support for ARB_framebuffer_object.
Added support for GLX_ARB_create_context. (WIP)
Improved postfix stripping in the generator.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/StripPostfix.java
    trunk/LWJGL/src/native/linux/extgl_glx.c
    trunk/LWJGL/src/native/linux/extgl_glx.h
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java

Property Changed:
----------------
    trunk/LWJGL/src/native/

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2009-03-25 17:43:56 UTC (rev 3190)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2009-03-26 11:08:43 UTC (rev 3191)
@@ -187,4 +187,16 @@
 		return attribs;
 	}
 
+	public String toString() {
+		StringBuffer sb = new StringBuffer(32);
+
+		sb.append("ContextAttribs:");
+		sb.append(" Version=").append(majorVersion).append('.').append(minorVersion);
+		sb.append(" - Layer=").append(layerPlane);
+		sb.append(" - Debug=").append(debug);
+		sb.append(" - ForwardCompatible=").append(forwardCompatible);
+
+		return sb.toString();
+	}
+
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java	2009-03-25 17:43:56 UTC (rev 3190)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java	2009-03-26 11:08:43 UTC (rev 3191)
@@ -37,7 +37,6 @@
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.Iterator;
-import java.lang.annotation.Annotation;
 
 import com.sun.mirror.declaration.InterfaceDeclaration;
 import com.sun.mirror.declaration.MethodDeclaration;
@@ -117,6 +116,23 @@
 
 	public static void generateInitStubsPrologue(PrintWriter writer, boolean context_specific) {
 		writer.println("\tprivate Set " + ALL_INIT_METHOD_NAME + "(boolean forwardCompatible) throws LWJGLException {");
+
+		// Load the basic pointers we need to detect OpenGL version and supported extensions.
+		writer.println("\t\tGL11_glGetString_pointer = GLContext.getFunctionAddress(\"glGetString\");");
+
+		// Initialize GL11.glGetIntegerv and GL30.glGetStringi here, in case we have created an OpenGL 3.0 context.
+		// (they will be used in GLContext.getSupportedExtensions)
+		writer.println("\t\tGL11_glGetIntegerv_pointer = GLContext.getFunctionAddress(\"glGetIntegerv\");");
+		writer.println("\t\tGL30_glGetStringi_pointer = GLContext.getFunctionAddress(\"glGetStringi\");");
+
+		// Get the supported extensions set.
+		writer.println("\t\tGLContext.setCapabilities(this);");
+		writer.println("\t\tSet " + CACHED_EXTS_VAR_NAME + " = GLContext.getSupportedExtensions();");
+
+		// Force forward compatible mode when OpenGL version is 3.1 or higher and ARB_compatibility is not available.
+		writer.println("\t\tif ( supported_extensions.contains(\"OpenGL31\") && !supported_extensions.contains(\"GL_ARB_compatibility\") )");
+		writer.println("\t\t\tforwardCompatible = true;");
+
 		if ( !context_specific ) {
 			writer.println("\t\tif (" + STUBS_LOADED_NAME + ")");
 			writer.println("\t\t\treturn GLContext.getSupportedExtensions();");
@@ -125,11 +141,6 @@
 			writer.println("\t\tif (!" + getAddressesInitializerName("GL11") + "(forwardCompatible))");
 			writer.println("\t\t\tthrow new LWJGLException(\"GL11 not supported\");");
 		}
-		// Try to initialize GL30.glGetStringi here, in case we have created an OpenGL 3.0 context
-		// (it will be used in GLContext.getSupportedExtensions)
-		writer.println("\t\tGL30_glGetStringi_pointer = GLContext.getFunctionAddress(\"glGetStringi\");");
-		writer.println("\t\tGLContext.setCapabilities(this);");
-		writer.println("\t\tSet " + CACHED_EXTS_VAR_NAME + " = GLContext.getSupportedExtensions();");
 	}
 
 	public static void generateInitStubsEpilogue(PrintWriter writer, boolean context_specific) {

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2009-03-25 17:43:56 UTC (rev 3190)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2009-03-26 11:08:43 UTC (rev 3191)
@@ -277,7 +277,7 @@
 		postfix_parameter.getType().accept(translator);
 		String postfix = translator.getSignature();
 		String method_name = method.getSimpleName();
-		String extension_postfix = getExtensionPostfix(interface_decl);
+		String extension_postfix = "NULL".equals(strip_annotation.extension()) ? getExtensionPostfix(interface_decl) : strip_annotation.extension();
 		String result;
 		if (method_name.endsWith(postfix + "v" + extension_postfix))
 			result = method_name.substring(0, method_name.length() - (postfix.length() + 1 + extension_postfix.length()));

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/StripPostfix.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/StripPostfix.java	2009-03-25 17:43:56 UTC (rev 3190)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/StripPostfix.java	2009-03-26 11:08:43 UTC (rev 3191)
@@ -47,4 +47,5 @@
 @Target(ElementType.METHOD)
 public @interface StripPostfix {
 	String value(); // The parameter to deduce the postfix from
+	String extension() default "NULL";
 }


Property changes on: trunk/LWJGL/src/native
___________________________________________________________________
Added: svn:ignore
   + generated


Modified: trunk/LWJGL/src/native/linux/extgl_glx.c
===================================================================
--- trunk/LWJGL/src/native/linux/extgl_glx.c	2009-03-25 17:43:56 UTC (rev 3190)
+++ trunk/LWJGL/src/native/linux/extgl_glx.c	2009-03-26 11:08:43 UTC (rev 3191)
@@ -74,6 +74,9 @@
 /* GLX_SGI_swap_control */
 glXSwapIntervalSGIPROC lwjgl_glXSwapIntervalSGI = NULL;
 
+/* GLX_ARB_create_context */
+glXCreateContextAttribsARBPROC lwjgl_glXCreateContextAttribsARB = NULL;
+
 static void * lib_gl_handle = NULL;
 
 typedef void * (APIENTRY * glXGetProcAddressARBPROC) (const GLubyte *procName);
@@ -142,6 +145,12 @@
 	symbols_flags.GLX_SGI_swap_control = extgl_InitializeFunctions(sizeof(functions)/sizeof(ExtFunction), functions);
 }
 
+static void extgl_InitGLXARBCreateContext() {
+	ExtFunction functions[] = {
+		{"glXCreateContextAttribsARB", (void*)&lwjgl_glXCreateContextAttribsARB}};
+	symbols_flags.GLX_ARB_create_context = extgl_InitializeFunctions(sizeof(functions)/sizeof(ExtFunction), functions);
+}
+
 static void extgl_InitGLXSupportedExtensions(Display *disp, int screen, GLXExtensions *extension_flags) {
 /*	extension_flags.GLX_EXT_visual_info = GLXQueryExtension(disp, screen, "GLX_EXT_visual_info");
 	extension_flags.GLX_EXT_visual_rating = GLXQueryExtension(disp, screen, "GLX_EXT_visual_rating");*/
@@ -150,6 +159,7 @@
 	extension_flags->GLX_ARB_fbconfig_float = GLXQueryExtension(disp, screen, "GLX_ARB_fbconfig_float");
 	extension_flags->GLX_EXT_fbconfig_packed_float = GLXQueryExtension(disp, screen, "GLX_EXT_fbconfig_packed_float");
 	extension_flags->GLX_ARB_framebuffer_sRGB = GLXQueryExtension(disp, screen, "GLX_ARB_framebuffer_sRGB") || GLXQueryExtension(disp, screen, "GLX_EXT_framebuffer_sRGB");
+	extension_flags->GLX_ARB_create_context = GLXQueryExtension(disp, screen, "GLX_ARB_create_context");
 }
 
 bool extgl_Open(JNIEnv *env) {
@@ -181,6 +191,7 @@
 	extgl_InitGLX12();
 	extgl_InitGLX13();
 	extgl_InitGLXSGISwapControl();
+	extgl_InitGLXARBCreateContext();
 	return true;
 }
 
@@ -214,6 +225,7 @@
 		return false;
 	extension_flags->GLX12 = glx12;
 	extension_flags->GLX13 = major > 1 || (major == 1 && minor >= 3);
+	extension_flags->GLX14 = major > 1 || (major == 1 && minor >= 4);
 	extgl_InitGLXSupportedExtensions(disp, screen, extension_flags);
 	return true;
 }

Modified: trunk/LWJGL/src/native/linux/extgl_glx.h
===================================================================
--- trunk/LWJGL/src/native/linux/extgl_glx.h	2009-03-25 17:43:56 UTC (rev 3190)
+++ trunk/LWJGL/src/native/linux/extgl_glx.h	2009-03-26 11:08:43 UTC (rev 3191)
@@ -323,9 +323,13 @@
 /* GLX_SGI_swap_control */
 typedef void (APIENTRY * glXSwapIntervalSGIPROC)(int interval);
 
+/* GLX_ARB_create_context */
+typedef GLXContext (APIENTRY * glXCreateContextAttribsARBPROC) (Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list);
+
 typedef struct {
     bool GLX12;
     bool GLX13;
+	bool GLX14;
 /*    bool GLX_EXT_visual_info;
     bool GLX_EXT_visual_rating;*/
     bool GLX_SGI_swap_control;
@@ -333,6 +337,7 @@
 	bool GLX_ARB_fbconfig_float;
 	bool GLX_EXT_fbconfig_packed_float;
 	bool GLX_ARB_framebuffer_sRGB;
+	bool GLX_ARB_create_context;
 } GLXExtensions;
 
 /* Add _ to global symbols to avoid symbol clash with the OpenGL library */
@@ -378,6 +383,8 @@
 
 extern glXSwapIntervalSGIPROC lwjgl_glXSwapIntervalSGI;
 
+extern glXCreateContextAttribsARBPROC lwjgl_glXCreateContextAttribsARB;
+
 extern bool extgl_InitGLX(Display *disp, int screen, GLXExtensions *extension_flags);
 
 #endif

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java	2009-03-26 11:08:43 UTC (rev 3191)
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2002-2008 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.IntBuffer;
+
+@Extension(postfix = "")
+public interface ARB_framebuffer_object {
+
+	/**
+	 * Accepted by the <target> parameter of BindFramebuffer,
+	 * CheckFramebufferStatus, FramebufferTexture{1D|2D|3D},
+	 * FramebufferRenderbuffer, and
+	 * GetFramebufferAttachmentParameteriv:
+	 */
+	int GL_FRAMEBUFFER = 0x8D40;
+	int GL_READ_FRAMEBUFFER = 0x8CA8;
+	int GL_DRAW_FRAMEBUFFER = 0x8CA9;
+
+	/**
+	 * Accepted by the <target> parameter of BindRenderbuffer,
+	 * RenderbufferStorage, and GetRenderbufferParameteriv, and
+	 * returned by GetFramebufferAttachmentParameteriv:
+	 */
+	int GL_RENDERBUFFER = 0x8D41;
+
+	/**
+	 * Accepted by the <internalformat> parameter of
+	 * RenderbufferStorage:
+	 */
+	int GL_STENCIL_INDEX1 = 0x8D46;
+	int GL_STENCIL_INDEX4 = 0x8D47;
+	int GL_STENCIL_INDEX8 = 0x8D48;
+	int GL_STENCIL_INDEX16 = 0x8D49;
+
+	/** Accepted by the <pname> parameter of GetRenderbufferParameteriv: */
+	int GL_RENDERBUFFER_WIDTH = 0x8D42;
+	int GL_RENDERBUFFER_HEIGHT = 0x8D43;
+	int GL_RENDERBUFFER_INTERNAL_FORMAT = 0x8D44;
+	int GL_RENDERBUFFER_RED_SIZE = 0x8D50;
+	int GL_RENDERBUFFER_GREEN_SIZE = 0x8D51;
+	int GL_RENDERBUFFER_BLUE_SIZE = 0x8D52;
+	int GL_RENDERBUFFER_ALPHA_SIZE = 0x8D53;
+	int GL_RENDERBUFFER_DEPTH_SIZE = 0x8D54;
+	int GL_RENDERBUFFER_STENCIL_SIZE = 0x8D55;
+	int GL_RENDERBUFFER_SAMPLES = 0x8CAB;
+
+	/**
+	 * Accepted by the <pname> parameter of
+	 * GetFramebufferAttachmentParameteriv:
+	 */
+	int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = 0x8CD0;
+	int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 0x8CD1;
+	int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 0x8CD2;
+	int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
+	int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER = 0x8CD4;
+	int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING = 0x8210;
+	int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE = 0x8211;
+	int GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE = 0x8212;
+	int GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE = 0x8213;
+	int GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE = 0x8214;
+	int GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE = 0x8215;
+	int GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE = 0x8216;
+	int GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE = 0x8217;
+
+	/** Returned in <params> by GetFramebufferAttachmentParameteriv: */
+	int GL_SRGB = 0x8C40;
+	int GL_UNSIGNED_NORMALIZED = 0x8C17;
+	int GL_FRAMEBUFFER_DEFAULT = 0x8218;
+	int GL_INDEX = 0x8222;
+
+	/**
+	 * Accepted by the <attachment> parameter of
+	 * FramebufferTexture{1D|2D|3D}, FramebufferRenderbuffer, and
+	 * GetFramebufferAttachmentParameteriv
+	 */
+	int GL_COLOR_ATTACHMENT0 = 0x8CE0;
+	int GL_COLOR_ATTACHMENT1 = 0x8CE1;
+	int GL_COLOR_ATTACHMENT2 = 0x8CE2;
+	int GL_COLOR_ATTACHMENT3 = 0x8CE3;
+	int GL_COLOR_ATTACHMENT4 = 0x8CE4;
+	int GL_COLOR_ATTACHMENT5 = 0x8CE5;
+	int GL_COLOR_ATTACHMENT6 = 0x8CE6;
+	int GL_COLOR_ATTACHMENT7 = 0x8CE7;
+	int GL_COLOR_ATTACHMENT8 = 0x8CE8;
+	int GL_COLOR_ATTACHMENT9 = 0x8CE9;
+	int GL_COLOR_ATTACHMENT10 = 0x8CEA;
+	int GL_COLOR_ATTACHMENT11 = 0x8CEB;
+	int GL_COLOR_ATTACHMENT12 = 0x8CEC;
+	int GL_COLOR_ATTACHMENT13 = 0x8CED;
+	int GL_COLOR_ATTACHMENT14 = 0x8CEE;
+	int GL_COLOR_ATTACHMENT15 = 0x8CEF;
+	int GL_DEPTH_ATTACHMENT = 0x8D00;
+	int GL_STENCIL_ATTACHMENT = 0x8D20;
+	int GL_DEPTH_STENCIL_ATTACHMENT = 0x821A;
+
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_MAX_SAMPLES = 0x8D57;
+
+	/** Returned by CheckFramebufferStatus(): */
+	int GL_FRAMEBUFFER_COMPLETE = 0x8CD5;
+	int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 0x8CD6;
+	int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
+	int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = 0x8CDB;
+	int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER = 0x8CDC;
+	int GL_FRAMEBUFFER_UNSUPPORTED = 0x8CDD;
+	int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 0x8D56;
+	int GL_FRAMEBUFFER_UNDEFINED = 0x8219;
+
+	/**
+	 * Accepted by the <pname> parameters of GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
+	int GL_FRAMEBUFFER_BINDING = 0x8CA6; // alias DRAW_FRAMEBUFFER_BINDING
+	int GL_DRAW_FRAMEBUFFER_BINDING = 0x8CA6;
+	int GL_READ_FRAMEBUFFER_BINDING = 0x8CAA;
+	int GL_RENDERBUFFER_BINDING = 0x8CA7;
+	int GL_MAX_COLOR_ATTACHMENTS = 0x8CDF;
+	int GL_MAX_RENDERBUFFER_SIZE = 0x84E8;
+
+	/** Returned by GetError(): */
+	int GL_INVALID_FRAMEBUFFER_OPERATION = 0x0506;
+
+	/**
+	 * Accepted by the <format> parameter of DrawPixels, ReadPixels,
+	 * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D,
+	 * TexSubImage3D, and GetTexImage, by the <type> parameter of
+	 * CopyPixels, by the <internalformat> parameter of TexImage1D,
+	 * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and
+	 * RenderbufferStorage, and returned in the <data> parameter of
+	 * GetTexLevelParameter and GetRenderbufferParameteriv:
+	 */
+	int GL_DEPTH_STENCIL = 0x84F9;
+
+	/**
+	 * Accepted by the <type> parameter of DrawPixels, ReadPixels,
+	 * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D,
+	 * TexSubImage3D, and GetTexImage:
+	 */
+	int GL_UNSIGNED_INT_24_8 = 0x84FA;
+
+	/**
+	 * Accepted by the <internalformat> parameter of TexImage1D,
+	 * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and
+	 * RenderbufferStorage, and returned in the <data> parameter of
+	 * GetTexLevelParameter and GetRenderbufferParameteriv:
+	 */
+	int GL_DEPTH24_STENCIL8 = 0x88F0;
+
+	/** Accepted by the <value> parameter of GetTexLevelParameter: */
+	int GL_TEXTURE_STENCIL_SIZE = 0x88F1;
+
+	boolean glIsRenderbuffer(@GLuint int renderbuffer);
+
+	void glBindRenderbuffer(@GLenum int target, @GLuint int renderbuffer);
+
+	void glDeleteRenderbuffers(@AutoSize("renderbuffers") @GLsizei int n, @Const @GLuint IntBuffer renderbuffers);
+
+	void glGenRenderbuffers(@AutoSize("renderbuffers") @GLsizei int n, @OutParameter @GLuint IntBuffer renderbuffers);
+
+	void glRenderbufferStorage(@GLenum int target, @GLenum int internalformat,
+	                           @GLsizei int width, @GLsizei int height);
+
+	void glRenderbufferStorageMultisample(@GLenum int target, @GLsizei int samples,
+	                                      @GLenum int internalformat,
+	                                      @GLsizei int width, @GLsizei int height);
+
+	@StripPostfix("params")
+	void glGetRenderbufferParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @OutParameter IntBuffer params);
+
+	boolean glIsFramebuffer(@GLuint int framebuffer);
+
+	void glBindFramebuffer(@GLenum int target, @GLuint int framebuffer);
+
+	void glDeleteFramebuffers(@AutoSize("framebuffers") @GLsizei int n, @Const @GLuint IntBuffer framebuffers);
+
+	void glGenFramebuffers(@AutoSize("framebuffers") @GLsizei int n, @OutParameter @GLuint IntBuffer framebuffers);
+
+	@GLenum
+	int glCheckFramebufferStatus(@GLenum int target);
+
+	void glFramebufferTexture1D(@GLenum int target, @GLenum int attachment,
+	                            @GLenum int textarget, @GLuint int texture, int level);
+
+	void glFramebufferTexture2D(@GLenum int target, @GLenum int attachment,
+	                            @GLenum int textarget, @GLuint int texture, int level);
+
+	void glFramebufferTexture3D(@GLenum int target, @GLenum int attachment,
+	                            @GLenum int textarget, @GLuint int texture,
+	                            int level, int layer);
+
+	void glFramebufferTextureLayer(@GLenum int target, @GLenum int attachment,
+	                               @GLuint int texture, int level, int layer);
+
+	void glFramebufferRenderbuffer(@GLenum int target, @GLenum int attachment,
+	                               @GLenum int renderbuffertarget, @GLuint int renderbuffer);
+
+	@StripPostfix("params")
+	void glGetFramebufferAttachmentParameteriv(@GLenum int target, @GLenum int attachment,
+	                                           @GLenum int pname, @Check("4") @OutParameter IntBuffer params);
+
+	void glBlitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1,
+	                       int dstX0, int dstY0, int dstX1, int dstY1,
+	                       @GLbitfield int mask, @GLenum int filter);
+
+	void glGenerateMipmap(@GLenum int target);
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	2009-03-25 17:43:56 UTC (rev 3190)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	2009-03-26 11:08:43 UTC (rev 3191)
@@ -126,6 +126,7 @@
 
 	void glBindBufferBase(@GLenum int target, @GLuint int index, @GLuint int buffer);
 
+	@StripPostfix(value = "data", extension = "")
 	void glGetIntegeri_v(@GLenum int value, @GLuint int index, @OutParameter @Check("4")IntBuffer data);
 
 	void glUniformBlockBindingARB(@GLuint int program, @GLuint int uniformBlockIndex, @GLuint int uniformBlockBinding);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java	2009-03-25 17:43:56 UTC (rev 3190)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java	2009-03-26 11:08:43 UTC (rev 3191)
@@ -33,7 +33,9 @@
 
 import org.lwjgl.util.generator.*;
 
-import java.nio.*;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 
 public interface NV_explicit_multisample {
 
@@ -73,8 +75,10 @@
 	int GL_INT_SAMPLER_RENDERBUFFER_NV = 0x8E57;
 	int GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV = 0x8E58;
 
+	@StripPostfix(value = "data", extension = "EXT")
 	void glGetBooleanIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") @GLboolean ByteBuffer data);
 
+	@StripPostfix(value = "data", extension = "EXT")
 	void glGetIntegerIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") IntBuffer data);
 
 	@StripPostfix("val")


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

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

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

Revision: 3190
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3190&view=rev
Author:   spasi
Date:     2009-03-25 17:43:56 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
Added support for OpenGL 3.1
Added support for a bunch of new OpenGL extensions.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_cg_shader.java

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_texture_texture4.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_compatibility.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_meminfo.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_provoking_vertex.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_swizzle.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_array_bgra.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback2.java

Property Changed:
----------------
    trunk/LWJGL/src/


Property changes on: trunk/LWJGL/src
___________________________________________________________________
Added: svn:ignore
   + generated


Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2009-03-21 08:14:23 UTC (rev 3189)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -200,6 +200,8 @@
 		}
 
 		// ----------------------[ 3.X ]----------------------
+		if ( 3 < majorVersion || (3 == majorVersion && 1 <= minorVersion) )
+			supported_extensions.add("OpenGL31");
 		if ( 3 <= majorVersion )
 			supported_extensions.add("OpenGL30");
 

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2002-2008 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.ByteBuffer;
+import java.nio.IntBuffer;
+
+public interface AMD_performance_monitor {
+
+	/** Accepted by the &lt;pame&gt; parameter of GetPerfMonitorCounterInfoAMD */
+	int GL_COUNTER_TYPE_AMD = 0x8BC0;
+	int GL_COUNTER_RANGE_AMD = 0x8BC1;
+
+	/**
+	 * Returned as a valid value in &lt;data&gt; parameter of
+	 * GetPerfMonitorCounterInfoAMD if &lt;pname&gt; = COUNTER_TYPE_AMD
+	 */
+	int GL_UNSIGNED_INT = 0x1405;
+	int GL_FLOAT = 0x1406;
+	int GL_UNSIGNED_INT64_AMD = 0x8BC2;
+	int GL_PERCENTAGE_AMD = 0x8BC3;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetPerfMonitorCounterDataAMD */
+
+	int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4;
+	int GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5;
+	int GL_PERFMON_RESULT_AMD = 0x8BC6;
+
+	void glGetPerfMonitorGroupsAMD(@OutParameter @Check(value = "1", canBeNull = true) @GLint IntBuffer numGroups,
+	                               @AutoSize("groups") @GLsizei int groupsSize, @GLuint IntBuffer groups);
+
+	void glGetPerfMonitorCountersAMD(@GLuint int group,
+	                                 @OutParameter @Check(value = "1") @GLint IntBuffer numCounters,
+	                                 @OutParameter @Check(value = "1") @GLint IntBuffer maxActiveCounters,
+	                                 @AutoSize("counters") @GLsizei int countersSize,
+	                                 @GLuint IntBuffer counters);
+
+	void glGetPerfMonitorGroupStringAMD(@GLuint int group,
+	                                    @AutoSize("groupString") @GLsizei int bufSize,
+	                                    @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                                    @GLchar ByteBuffer groupString);
+
+	void glGetPerfMonitorCounterStringAMD(@GLuint int group, @GLuint int counter,
+	                                      @AutoSize("counterString") @GLsizei int bufSize,
+	                                      @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                                      @GLchar ByteBuffer counterString);
+
+	void glGetPerfMonitorCounterInfoAMD(@GLuint int group, @GLuint int counter, @GLenum int pname, @Check(value = "16") @GLvoid ByteBuffer data);
+
+	void glGenPerfMonitorsAMD(@AutoSize("monitors") @GLsizei int n, @OutParameter @GLuint IntBuffer monitors);
+
+	void glDeletePerfMonitorsAMD(@AutoSize("monitors") @GLsizei int n, @GLuint IntBuffer monitors);
+
+	void glSelectPerfMonitorCountersAMD(@GLuint int monitor, boolean enable, @GLuint int group, @AutoSize("counterList")int numCounters, @GLuint IntBuffer counterList);
+
+	void glBeginPerfMonitorAMD(@GLuint int monitor);
+
+	void glEndPerfMonitorAMD(@GLuint int monitor);
+
+	void glGetPerfMonitorCounterDataAMD(@GLuint int monitor, @GLenum int pname,
+	                                    @AutoSize("data") @GLsizei int dataSize, @GLuint IntBuffer data,
+	                                    @OutParameter @Check(value = "1", canBeNull = true) @GLint IntBuffer bytesWritten);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_texture_texture4.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_texture_texture4.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_texture_texture4.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2008 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 AMD_texture_texture4 {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2002-2008 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.GLenum;
+
+public interface AMD_vertex_shader_tesselator {
+
+	/** Returned by the &lt;type&gt; parameter of GetActiveUniform: */
+	int GL_SAMPLER_BUFFER_AMD = 0x9001;
+	int GL_INT_SAMPLER_BUFFER_AMD = 0x9002;
+	int GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD = 0x9003;
+
+	/** Accepted by TessellationModeAMD */
+	int GL_DISCRETE_AMD = 0x9006;
+	int GL_CONTINUOUS_AMD = 0x9007;
+
+	/** Accepted by GetIntegerv */
+	int GL_TESSELLATION_MODE_AMD = 0x9004;
+
+	/** Accepted by GetFloatv */
+	int GL_TESSELLATION_FACTOR_AMD = 0x9005;
+
+	void glTessellationFactorAMD(float factor);
+
+	void glTessellationModeAMD(@GLenum int mode);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_compatibility.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_compatibility.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_compatibility.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2008 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 ARB_compatibility {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2002-2008 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.ByteBuffer;
+import java.nio.IntBuffer;
+
+public interface ARB_uniform_buffer_object {
+
+	/**
+	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, and
+	 * GetBufferPointerv:
+	 */
+	int GL_UNIFORM_BUFFER_ARB = 0x8A11;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetIntegeri_v, GetBooleanv,
+	 * GetIntegerv, GetFloatv, and GetDoublev:
+	 */
+	int GL_UNIFORM_BUFFER_BINDING_ARB = 0x8A28;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetIntegeri_v: */
+	int GL_UNIFORM_BUFFER_START_ARB = 0x8A29;
+	int GL_UNIFORM_BUFFER_SIZE_ARB = 0x8A2A;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_MAX_VERTEX_UNIFORM_BLOCKS_ARB = 0x8A2B;
+	int GL_MAX_GEOMETRY_UNIFORM_BLOCKS_ARB = 0x8A2C;
+	int GL_MAX_FRAGMENT_UNIFORM_BLOCKS_ARB = 0x8A2D;
+	int GL_MAX_COMBINED_UNIFORM_BLOCKS_ARB = 0x8A2E;
+	int GL_MAX_UNIFORM_BUFFER_BINDINGS_ARB = 0x8A2F;
+	int GL_MAX_UNIFORM_BLOCK_SIZE_ARB = 0x8A30;
+	int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8A31;
+	int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_ARB = 0x8A32;
+	int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8A33;
+	int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT_ARB = 0x8A34;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetProgramiv: */
+	int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH_ARB = 0x8A35;
+	int GL_ACTIVE_UNIFORM_BLOCKS_ARB = 0x8A36;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetActiveUniformsivARB: */
+	int GL_UNIFORM_TYPE_ARB = 0x8A37;
+	int GL_UNIFORM_SIZE_ARB = 0x8A38;
+	int GL_UNIFORM_NAME_LENGTH_ARB = 0x8A39;
+	int GL_UNIFORM_BLOCK_INDEX_ARB = 0x8A3A;
+	int GL_UNIFORM_OFFSET_ARB = 0x8A3B;
+	int GL_UNIFORM_ARRAY_STRIDE_ARB = 0x8A3C;
+	int GL_UNIFORM_MATRIX_STRIDE_ARB = 0x8A3D;
+	int GL_UNIFORM_IS_ROW_MAJOR_ARB = 0x8A3E;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetActiveUniformBlockivARB: */
+	int GL_UNIFORM_BLOCK_BINDING_ARB = 0x8A3F;
+	int GL_UNIFORM_BLOCK_DATA_SIZE_ARB = 0x8A40;
+	int GL_UNIFORM_BLOCK_NAME_LENGTH_ARB = 0x8A41;
+	int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS_ARB = 0x8A42;
+	int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES_ARB = 0x8A43;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER_ARB = 0x8A44;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER_ARB = 0x8A45;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER_ARB = 0x8A46;
+
+	/** Returned by GetActiveUniformsivARB and GetUniformBlockIndexARB */
+	int GL_INVALID_INDEX_ARB = 0xFFFFFFFF; // TODO: Check if this is correct
+
+	void glGetUniformIndicesARB(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+	                            @Const @NullTerminated @GLchar ByteBuffer uniformNames,
+	                            @OutParameter @GLuint IntBuffer uniformIndices);
+
+	@StripPostfix("params")
+	void glGetActiveUniformsivARB(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+	                              @Const @GLuint IntBuffer uniformIndices,
+	                              @GLenum int pname,
+	                              @Check(value = "1") @GLint IntBuffer params); // TODO: We need to AutoSize "params" using "uniformCount"
+
+	void glGetActiveUniformNameARB(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
+	                               @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                               @GLchar ByteBuffer uniformName);
+
+	@GLuint
+	int glGetUniformBlockIndexARB(@GLuint int program, @Const @NullTerminated @GLchar ByteBuffer uniformBlockName);
+
+	@StripPostfix("params")
+	void glGetActiveUniformBlockivARB(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
+	                                  @OutParameter @Check(value = "16") @GLint IntBuffer params);
+
+	void glGetActiveUniformBlockNameARB(@GLuint int program, @GLuint int uniformBlockIndex, @AutoSize("uniformBlockName") @GLsizei int bufSize,
+	                                    @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                                    @GLchar ByteBuffer uniformBlockName);
+
+	void glBindBufferRange(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset, @GLsizeiptr long size);
+
+	void glBindBufferBase(@GLenum int target, @GLuint int index, @GLuint int buffer);
+
+	void glGetIntegeri_v(@GLenum int value, @GLuint int index, @OutParameter @Check("4")IntBuffer data);
+
+	void glUniformBlockBindingARB(@GLuint int program, @GLuint int uniformBlockIndex, @GLuint int uniformBlockBinding);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_meminfo.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_meminfo.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_meminfo.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2002-2008 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_meminfo {
+
+	/** Accepted by the &lt;value&gt; parameter of GetIntegerv: */
+	int GL_VBO_FREE_MEMORY_ATI = 0x87FB;
+	int GL_TEXTURE_FREE_MEMORY_ATI = 0x87FC;
+	int GL_RENDERBUFFER_FREE_MEMORY_ATI = 0x87FD;
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_cg_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_cg_shader.java	2009-03-21 08:14:23 UTC (rev 3189)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_cg_shader.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -31,7 +31,7 @@
  */
 package org.lwjgl.opengl;
 
-public interface EXT_cg_shader {
+public interface EXT_Cg_shader {
 
 	/**
 	 * You can pass GL_CG_VERTEX_SHADER_EXT to glCreateShaderARB instead of GL_VERTEX_SHADER_ARB to create a vertex shader object

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_provoking_vertex.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_provoking_vertex.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_provoking_vertex.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2002-2008 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.GLenum;
+
+public interface EXT_provoking_vertex {
+
+	/** Accepted by the &lt;mode&gt; parameter of ProvokingVertexEXT: */
+	int GL_FIRST_VERTEX_CONVENTION_EXT = 0x8E4D;
+	int GL_LAST_VERTEX_CONVENTION_EXT = 0x8E4E;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_PROVOKING_VERTEX_EXT = 0x8E4F;
+	int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT = 0x8E4C;
+
+	void glProvokingVertexEXT(@GLenum int mode);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_swizzle.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_swizzle.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_swizzle.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2002-2008 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 EXT_texture_swizzle {
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameters of TexParameteri,
+	 * TexParameterf, TexParameteriv, TexParameterfv,
+	 * GetTexParameterfv, and GetTexParameteriv:
+	 */
+	int GL_TEXTURE_SWIZZLE_R_EXT = 0x8E42;
+	int GL_TEXTURE_SWIZZLE_G_EXT = 0x8E43;
+	int GL_TEXTURE_SWIZZLE_B_EXT = 0x8E44;
+	int GL_TEXTURE_SWIZZLE_A_EXT = 0x8E45;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameters of TexParameteriv,
+	 * TexParameterfv, GetTexParameterfv, and GetTexParameteriv:
+	 */
+	int GL_TEXTURE_SWIZZLE_RGBA_EXT = 0x8E46;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_array_bgra.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_array_bgra.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_array_bgra.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2002-2008 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 EXT_vertex_array_bgra {
+
+	/**
+	 * Accepted by the &lt;size&gt; parameter of ColorPointer,
+	 * SecondaryColorPointer, and VertexAttribPointer:
+	 */
+	int GL_BGRA = 0x80E1;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2002-2008 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.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+public interface GL31 {
+
+	// ----------------------------------------------------------
+	// ----------------------[ OpenGL 3.1 ]----------------------
+	// ----------------------------------------------------------
+
+	int GL_RED_SNORM = 0x8F90;
+	int GL_RG_SNORM = 0x8F91;
+	int GL_RGB_SNORM = 0x8F92;
+	int GL_RGBA_SNORM = 0x8F93;
+	int GL_R8_SNORM = 0x8F94;
+	int GL_RG8_SNORM = 0x8F95;
+	int GL_RGB8_SNORM = 0x8F96;
+	int GL_RGBA8_SNORM = 0x8F97;
+	int GL_R16_SNORM = 0x8F98;
+	int GL_RG16_SNORM = 0x8F99;
+	int GL_RGB16_SNORM = 0x8F9A;
+	int GL_RGBA16_SNORM = 0x8F9B;
+	int GL_SIGNED_NORMALIZED = 0x8F9C;
+
+	// ------------------------------------------------------------------
+	// ----------------------[ ARB_draw_instanced ]----------------------
+	// ------------------------------------------------------------------
+
+	void glDrawArraysInstanced(@GLenum int mode, int first, @GLsizei int count, @GLsizei int primcount);
+
+	void glDrawElementsInstanced(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
+	                                @BufferObject(BufferKind.ElementVBO)
+	                                @Const
+	                                @GLubyte
+	                                @GLushort
+	                                @GLuint Buffer indices, @GLsizei int primcount);
+
+	// ---------------------------------------------------------------
+	// ----------------------[ EXT_copy_buffer ]----------------------
+	// ---------------------------------------------------------------
+
+	int GL_COPY_READ_BUFFER = 0x0; // TODO: Find this value
+	int GL_COPY_WRITE_BUFFER = 0x0; // TODO: Find this value
+
+	void glCopyBufferSubData(@GLenum int readtarget, @GLenum int writetarget, @GLintptr long readoffset, @GLintptr long writeoffset, @GLsizeiptr long size);
+
+	// --------------------------------------------------------------------
+	// ----------------------[ NV_primitive_restart ]----------------------
+	// --------------------------------------------------------------------
+
+	/**
+	 * Accepted by the &lt;cap&gt; parameter of IsEnabled, and by
+	 * the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev:
+	 */
+	int GL_PRIMITIVE_RESTART = 0x8F9D;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_PRIMITIVE_RESTART_INDEX = 0x8F9E;
+
+	void glPrimitiveRestart();
+
+	void glPrimitiveRestartIndex(@GLuint int index);
+
+	// -------------------------------------------------------------------------
+	// ----------------------[ ARB_texture_buffer_object ]----------------------
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Accepted by the &lt;target&gt; parameter of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, MapBufferRange, BindTexture, UnmapBuffer,
+	 * GetBufferSubData, GetBufferParameteriv, GetBufferPointerv, and TexBuffer,
+	 * and the <pname> parameter of GetBooleanv, GetDoublev, GetFloatv, and
+	 * GetIntegerv:
+	 */
+	int GL_TEXTURE_BUFFER = 0x8C2A;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameters of GetBooleanv, GetDoublev,
+	 * GetFloatv, and GetIntegerv:
+	 */
+	int GL_MAX_TEXTURE_BUFFER_SIZE = 0x8C2B;
+	int GL_TEXTURE_BINDING_BUFFER = 0x8C2C;
+	int GL_TEXTURE_BUFFER_DATA_STORE_BINDING = 0x8C2D;
+	int GL_TEXTURE_BUFFER_FORMAT = 0x8C2E;
+
+	void glTexBuffer(@GLenum int target, @GLenum int internalformat, @GLuint int buffer);
+
+	// ---------------------------------------------------------------------
+	// ----------------------[ ARB_texture_rectangle ]----------------------
+	// ---------------------------------------------------------------------
+
+	/**
+	 * Accepted by the &lt;cap&gt; parameter of Enable, Disable and IsEnabled;
+	 * by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv
+	 * and GetDoublev; and by the &lt;target&gt; parameter of BindTexture,
+	 * GetTexParameterfv, GetTexParameteriv, TexParameterf, TexParameteri,
+	 * TexParameterfv and TexParameteriv:
+	 * Accepted by the &lt;target&gt; parameter of GetTexImage,
+	 * GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D,
+	 * CopyTexImage2D, TexSubImage2D and CopySubTexImage2D:
+	 */
+	int GL_TEXTURE_RECTANGLE = 0x84F5;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv and GetDoublev:
+	 */
+	int GL_TEXTURE_BINDING_RECTANGLE = 0x84F6;
+
+	/**
+	 * Accepted by the &lt;target&gt; parameter of GetTexLevelParameteriv,
+	 * GetTexLevelParameterfv, GetTexParameteriv and TexImage2D:
+	 */
+	int GL_PROXY_TEXTURE_RECTANGLE = 0x84F7;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev,
+	 * GetIntegerv and GetFloatv:
+	 */
+	int GL_MAX_RECTANGLE_TEXTURE_SIZE = 0x84F8;
+
+	/**
+	 * Returned by &lt;type&gt; parameter of GetActiveUniform when the location
+	 * &lt;index&gt; for program object &lt;program&gt; is of type sampler2DRect:
+	 */
+	int GL_SAMPLER_2D_RECT = 0x8B63;
+
+	/**
+	 * Returned by &lt;type&gt; parameter of GetActiveUniform when the location
+	 * &lt;index&gt; for program object &lt;program&gt; is of type sampler2DRectShadow:
+	 */
+	int GL_SAMPLER_2D_RECT_SHADOW = 0x8B64;
+
+	// -------------------------------------------------------------------------
+	// ----------------------[ ARB_uniform_buffer_object ]----------------------
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, and
+	 * GetBufferPointerv:
+	 */
+	int GL_UNIFORM_BUFFER = 0x8A11;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetIntegeri_v, GetBooleanv,
+	 * GetIntegerv, GetFloatv, and GetDoublev:
+	 */
+	int GL_UNIFORM_BUFFER_BINDING = 0x8A28;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetIntegeri_v: */
+	int GL_UNIFORM_BUFFER_START = 0x8A29;
+	int GL_UNIFORM_BUFFER_SIZE = 0x8A2A;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_MAX_VERTEX_UNIFORM_BLOCKS = 0x8A2B;
+	int GL_MAX_GEOMETRY_UNIFORM_BLOCKS = 0x8A2C;
+	int GL_MAX_FRAGMENT_UNIFORM_BLOCKS = 0x8A2D;
+	int GL_MAX_COMBINED_UNIFORM_BLOCKS = 0x8A2E;
+	int GL_MAX_UNIFORM_BUFFER_BINDINGS = 0x8A2F;
+	int GL_MAX_UNIFORM_BLOCK_SIZE = 0x8A30;
+	int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS = 0x8A31;
+	int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS = 0x8A32;
+	int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS = 0x8A33;
+	int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT = 0x8A34;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetProgramiv: */
+	int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35;
+	int GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetActiveUniformsiv: */
+	int GL_UNIFORM_TYPE = 0x8A37;
+	int GL_UNIFORM_SIZE = 0x8A38;
+	int GL_UNIFORM_NAME_LENGTH = 0x8A39;
+	int GL_UNIFORM_BLOCK_INDEX = 0x8A3A;
+	int GL_UNIFORM_OFFSET = 0x8A3B;
+	int GL_UNIFORM_ARRAY_STRIDE = 0x8A3C;
+	int GL_UNIFORM_MATRIX_STRIDE = 0x8A3D;
+	int GL_UNIFORM_IS_ROW_MAJOR = 0x8A3E;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetActiveUniformBlockiv: */
+	int GL_UNIFORM_BLOCK_BINDING = 0x8A3F;
+	int GL_UNIFORM_BLOCK_DATA_SIZE = 0x8A40;
+	int GL_UNIFORM_BLOCK_NAME_LENGTH = 0x8A41;
+	int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42;
+	int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER = 0x8A45;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
+
+	/** Returned by GetActiveUniformsiv and GetUniformBlockIndex */
+	int GL_INVALID_INDEX = 0xFFFFFFFF; // TODO: Check if this is correct
+
+	void glGetUniformIndices(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+	                            @Const @NullTerminated @GLchar ByteBuffer uniformNames,
+	                            @OutParameter @GLuint IntBuffer uniformIndices);
+
+	@StripPostfix("params")
+	void glGetActiveUniformsiv(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+	                              @Const @GLuint IntBuffer uniformIndices,
+	                              @GLenum int pname,
+	                              @Check(value = "1") @GLint IntBuffer params); // TODO: We need to AutoSize "params" using "uniformCount"
+
+	void glGetActiveUniformName(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
+	                               @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                               @GLchar ByteBuffer uniformName);
+
+	@GLuint
+	int glGetUniformBlockIndex(@GLuint int program, @Const @NullTerminated @GLchar ByteBuffer uniformBlockName);
+
+	@StripPostfix("params")
+	void glGetActiveUniformBlockiv(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
+	                                  @OutParameter @Check(value = "16") @GLint IntBuffer params);
+
+	void glGetActiveUniformBlockName(@GLuint int program, @GLuint int uniformBlockIndex, @AutoSize("uniformBlockName") @GLsizei int bufSize,
+	                                    @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                                    @GLchar ByteBuffer uniformBlockName);
+
+	void glUniformBlockBinding(@GLuint int program, @GLuint int uniformBlockIndex, @GLuint int uniformBlockBinding);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2002-2008 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 NV_explicit_multisample {
+
+	/** Accepted by the &lt;pname&gt; parameter of GetMultisamplefvNV: */
+	int GL_SAMPLE_POSITION_NV = 0x8E50;
+
+	/**
+	 * 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:
+	 */
+
+	int GL_SAMPLE_MASK_NV = 0x8E51;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanIndexedvEXT and
+	 * GetIntegerIndexedvEXT:
+	 */
+
+	int GL_SAMPLE_MASK_VALUE_NV = 0x8E52;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv,
+	 * and GetFloatv:
+	 */
+
+	int GL_TEXTURE_BINDING_RENDERBUFFER_NV = 0x8E53;
+	int GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV = 0x8E54;
+	int GL_MAX_SAMPLE_MASK_WORDS_NV = 0x8E59;
+
+	/** Accepted by the &lt;target&gt; parameter of BindTexture, and TexRenderbufferNV: */
+
+	int GL_TEXTURE_RENDERBUFFER_NV = 0x8E55;
+
+	/** Returned by the &lt;type&gt; parameter of GetActiveUniform: */
+	int GL_SAMPLER_RENDERBUFFER_NV = 0x8E56;
+	int GL_INT_SAMPLER_RENDERBUFFER_NV = 0x8E57;
+	int GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV = 0x8E58;
+
+	void glGetBooleanIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") @GLboolean ByteBuffer data);
+
+	void glGetIntegerIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") IntBuffer data);
+
+	@StripPostfix("val")
+	void glGetMultisamplefvNV(@GLenum int pname, @GLuint int index, @OutParameter @Check("2") FloatBuffer val);
+
+	void glSampleMaskIndexedNV(@GLuint int index, @GLbitfield int mask);
+
+	void glTexRenderbufferNV(@GLenum int target, @GLuint int renderbuffer);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback2.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback2.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback2.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2002-2008 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.IntBuffer;
+
+public interface NV_transform_feedback2 {
+
+	/** Accepted by the &lt;target&gt; parameter of BindTransformFeedbackNV: */
+
+	int GL_TRANSFORM_FEEDBACK_NV = 0x8E22;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv,
+	 * and GetFloatv:
+	 */
+	int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV = 0x8E23;
+	int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV = 0x8E24;
+	int GL_TRANSFORM_FEEDBACK_BINDING_NV = 0x8E25;
+
+	void glBindTransformFeedbackNV(@GLenum int target, @GLuint int id);
+
+	void glDeleteTransformFeedbacksNV(@AutoSize("ids") @GLsizei int n, @Const @GLuint IntBuffer ids);
+
+	void glGenTransformFeedbacksNV(@AutoSize("ids") @GLsizei int n, @OutParameter @GLuint IntBuffer ids);
+
+	boolean glIsTransformFeedbackNV(@GLuint int id);
+
+	void glPauseTransformFeedbackNV();
+
+	void glResumeTransformFeedbackNV();
+
+	void glDrawTransformFeedbackNV(@GLenum int mode, @GLuint int id);
+
+}
\ No newline at end of file


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3189] tags/lwjgl2.1.0/

[<ma...@us...>]

Revision: 3189
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3189&view=rev
Author:   matzon
Date:     2009-03-21 08:14:23 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
tagging 2.1.0

Added Paths:
-----------
    tags/lwjgl2.1.0/


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

[Java-game-lib-cvs] Absolute dessire

[Liggins M. <di...@bo...>]

Staying tool eaasy as 1,2,3

<http://cid-3acd741e3d3f74db.spaces.live.com/blog/cns!3ACD741E3D3F74DB!104.entry>


On th landing, poirot forestalled them. 'my young brought
it across to the nearer table. He set i sat together in
silence all the evening, he with a red face and a fringe
of reddish hair round | | (elbow to | | | | wrist) |ittaddagara
|zizubah.

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3188] trunk/LWJGL/src/native/linux/ org_lwjgl_opengl_Display.c

[<eli...@us...>]

Revision: 3188
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3188&view=rev
Author:   elias_naur
Date:     2009-03-19 21:50:30 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
Linux: Fixed failure to create window on newer ATI mesa drivers

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c	2009-03-19 19:50:38 UTC (rev 3187)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c	2009-03-19 21:50:30 UTC (rev 3188)
@@ -306,8 +306,9 @@
 		return false;
 	cmap = XCreateColormap(disp, parent, vis_info->visual, AllocNone);
 	attribs.colormap = cmap;
+	attribs.border_pixel = 0;
 	attribs.event_mask = ExposureMask | FocusChangeMask | VisibilityChangeMask | StructureNotifyMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
-	attribmask = CWColormap | CWEventMask;
+	attribmask = CWColormap | CWEventMask | CWBorderPixel;
 	if (isLegacyFullscreen(window_mode)) {
 		attribmask |= CWOverrideRedirect;
 		attribs.override_redirect = True;


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3187] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

[<ka...@us...>]

Revision: 3187
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3187&view=rev
Author:   kappa1
Date:     2009-03-19 19:50:38 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
Bugfix for incorrect speed calculation, thanks to Dashiva for spotting it.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-03-19 19:12:37 UTC (rev 3186)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-03-19 19:50:38 UTC (rev 3187)
@@ -767,7 +767,7 @@
 				// update only if a second or more has passed
 				if (timeLapse >= 1000) {
 					// get kb/s, nice that bytes/millis is same as kilobytes/seconds
-					float downloadSpeed = (float) bufferSize / timeLapse;
+					float downloadSpeed = (float) downloadedAmount / timeLapse;
 					// round to two decimal places
 					downloadSpeed = ((int)(downloadSpeed*100))/100f;
 					// set current speed message


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3186] trunk/LWJGL/platform_build/build-generator .xml

[<ma...@us...>]

Revision: 3186
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3186&view=rev
Author:   matzon
Date:     2009-03-19 19:12:37 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
default to generatechecks for openal. This is needed since initNativeStub expects methods to be indirect (nalEnable instead of alEnable).

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-generator.xml

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2009-03-17 21:50:09 UTC (rev 3185)
+++ trunk/LWJGL/platform_build/build-generator.xml	2009-03-19 19:12:37 UTC (rev 3186)
@@ -31,7 +31,7 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
-			<!-- <arg value="-Ageneratechecks"/> -->
+			<arg value="-Ageneratechecks"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
 		</apply>
 	</target>


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

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

[<ma...@us...>]

Revision: 3185
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3185&view=rev
Author:   matzon
Date:     2009-03-17 21:50:09 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
using windows dir instead of win32/win64

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/build-applet.xml
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/platform_build/build-webstart.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2009-03-17 21:49:28 UTC (rev 3184)
+++ trunk/LWJGL/build.xml	2009-03-17 21:50:09 UTC (rev 3185)
@@ -25,7 +25,7 @@
 		<mkdir dir="${lwjgl.temp}/doc" 						taskname="initialiazing temp/doc folder" />
 		<mkdir dir="${lwjgl.temp}/res" 						taskname="initialiazing temp/res folder" />
 		<mkdir dir="${lwjgl.temp}/native" 				taskname="initialiazing temp/native folder" />
-		<mkdir dir="${lwjgl.temp}/native/win32" 	taskname="initialiazing temp/win32 folder" />
+		<mkdir dir="${lwjgl.temp}/native/windows" 	taskname="initialiazing temp/windows folder" />
 		<mkdir dir="${lwjgl.temp}/native/linux" 	taskname="initialiazing temp/linux folder" />
 		<mkdir dir="${lwjgl.temp}/native/macosx" 	taskname="initialiazing temp/macosx folder" />
 		<mkdir dir="${lwjgl.temp}/native/solaris" taskname="initialiazing temp/solaris folder" />
@@ -41,7 +41,7 @@
 	<!-- Creates a distribution of LWJGL -->
 	<target name="release" description="Creates a distribution of LWJGL using supplied native binaries">
 		<!-- Warn user -->
-		<echo message="Before running the release target, please manually compile all platforms and place required files in ${lwjgl.lib}/win32, ${lwjgl.lib}/linux and ${lwjgl.lib}/macosx${line.separator}Missing files will result in a successfull built, but with incomplete release zips"/>
+		<echo message="Before running the release target, please manually compile all platforms and place required files in ${lwjgl.lib}/windows, ${lwjgl.lib}/linux and ${lwjgl.lib}/macosx${line.separator}Missing files will result in a successfull built, but with incomplete release zips"/>
   	<input 
   		message="All data in the ${lwjgl.dist} folder will be deleted. Continue? "
     	validargs="yes,no"
@@ -132,9 +132,10 @@
 		</delete>	
 
 	    <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
-		<copy todir="${lwjgl.temp}/native/win32">
-			<fileset dir="${lwjgl.lib}/win32">
-				<patternset refid="lwjgl-win32.fileset" />
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
+		<copy todir="${lwjgl.temp}/native/windows">
+			<fileset dir="${lwjgl.lib}/windows">
+				<patternset refid="lwjgl-windows.fileset" />
 			</fileset>
 		</copy>
 		<copy todir="${lwjgl.temp}/native/linux">
@@ -269,7 +270,7 @@
 	<!-- Compiles LWJGL on Win32 platforms  -->
 	<target name="-compile_native_win32" if="lwjgl.platform.windows">
 		<ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/>
-		<copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/win32"/>
+		<copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/windows"/>
 	</target>
 
 	<!-- Compiles LWJGL on Linux platforms -->
@@ -341,7 +342,7 @@
 
 	<target name="runtest" depends="all">
 		<fail message="test.mainclass is not set. Use 'ant -Dtest.mainclass=&lt;main-class&gt; runtest'" unless="test.mainclass"/>
-		<condition property="native_path" value="libs/win32">
+		<condition property="native_path" value="libs/windows">
 			<os family="windows" />
 		</condition>
 
@@ -367,7 +368,7 @@
 		<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
 			<fileset refid="lwjgl.javadoc.fileset" />
 			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
-			<bottom><![CDATA[<i>Copyright &#169; 2002-2008 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+			<bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
 		</javadoc>
 	</target>
 </project>

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2009-03-17 21:49:28 UTC (rev 3184)
+++ trunk/LWJGL/platform_build/build-applet.xml	2009-03-17 21:50:09 UTC (rev 3185)
@@ -30,8 +30,8 @@
 		
 		<!-- create each of the native jars -->
 		<jar destfile="applet/windows_natives.jar" taskname="windows_natives.jar">
-			<fileset dir="${lwjgl.lib}/win32">
-				<patternset refid="lwjgl-win32.fileset"/>
+			<fileset dir="${lwjgl.lib}/windows">
+				<patternset refid="lwjgl-windows.fileset"/>
 			</fileset>
 		</jar>
 		<signjar jar="applet/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
@@ -61,7 +61,8 @@
   		<fileset dir="${lwjgl.res}" includes="applet*"/>
   	</jar>
 
-	  <copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
+	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>
@@ -77,6 +78,11 @@
 			<param name="output" value="applet/lwjgl.jar.lzma"/>
 		</antcall>
 		<antcall target="compress-resource">
+			<param name="input" value="applet/lwjgl-debug.jar"/>
+			<param name="output" value="applet/lwjgl-debug.jar.lzma"/>
+		</antcall>
+		
+		<antcall target="compress-resource">
 			<param name="input" value="applet/lwjgl_util.jar"/>
 			<param name="output" value="applet/lwjgl_util.jar.lzma"/>
 		</antcall>
@@ -98,6 +104,10 @@
 		</antcall>
 		<antcall target="compress-sign-class">
 			<param name="dir" value="applet/"/>
+			<param name="jarfile" value="lwjgl-debug"/>
+		</antcall>
+		<antcall target="compress-sign-class">
+			<param name="dir" value="applet/"/>
 			<param name="jarfile" value="lwjgl_util"/>
 		</antcall>
 		<antcall target="compress-sign-class">

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2009-03-17 21:49:28 UTC (rev 3184)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2009-03-17 21:50:09 UTC (rev 3185)
@@ -85,10 +85,12 @@
 		<include name="3rdparty/*" />
 	</patternset>
 
-	<!-- Files to include in win32 package -->
-	<patternset id="lwjgl-win32.fileset">
+	<!-- Files to include in windows package -->
+	<patternset id="lwjgl-windows.fileset">
 		<include name="lwjgl.dll" />
+		<include name="lwjgl64.dll" />
 		<include name="OpenAL32.dll" />
+		<include name="OpenAL64.dll" />
     	<include name="jinput-dx8.dll" />
     	<include name="jinput-raw.dll" />
 	</patternset>
@@ -149,7 +151,7 @@
 		<exclude name="applet/lwjglkeystore" />
 	</patternset>		
 	
-	<uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/win32/lwjgl.dll" >
+	<uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/windows/lwjgl.dll" >
 	    <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/>
 	    <srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
 	</uptodate>

Modified: trunk/LWJGL/platform_build/build-webstart.xml
===================================================================
--- trunk/LWJGL/platform_build/build-webstart.xml	2009-03-17 21:49:28 UTC (rev 3184)
+++ trunk/LWJGL/platform_build/build-webstart.xml	2009-03-17 21:50:09 UTC (rev 3185)
@@ -41,7 +41,7 @@
 		</move>
 		
 		<!-- create native jars -->
-		<jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/native/win32"/>
+		<jar destfile="${lwjgl.temp}/jnlp/native_windows.jar" basedir="${lwjgl.temp}/jnlp/temp/native/windows"/>
 		<jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/native/linux"/>
 		<jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/native/macosx"/>
 		<jar destfile="${lwjgl.temp}/jnlp/native_solaris.jar" basedir="${lwjgl.temp}/jnlp/temp/native/solaris"/>
@@ -55,7 +55,7 @@
 		<signjar jar="${lwjgl.temp}/jnlp/native_solaris.jar" 	alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 		<signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" 	alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 		<signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" 	alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		<signjar jar="${lwjgl.temp}/jnlp/native_windows.jar" 	alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 		<signjar jar="${lwjgl.temp}/jnlp/jinput.jar" 		alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 	</target>
 </project>
\ No newline at end of file


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3184] trunk/LWJGL/platform_build/build-generator .xml

[<ma...@us...>]

Revision: 3184
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3184&view=rev
Author:   matzon
Date:     2009-03-17 21:49:28 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
default to not generate checks

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-generator.xml

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2009-03-17 21:46:43 UTC (rev 3183)
+++ trunk/LWJGL/platform_build/build-generator.xml	2009-03-17 21:49:28 UTC (rev 3184)
@@ -31,7 +31,7 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
-			<arg value="-Ageneratechecks"/>
+			<!-- <arg value="-Ageneratechecks"/> -->
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
 		</apply>
 	</target>
@@ -48,7 +48,7 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
-			<!--			<arg value="-Ageneratechecks"/>-->
+			<!-- <arg value="-Ageneratechecks"/> -->
 			<arg value="-Acontextspecific"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>


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