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

[Java-game-lib-cvs] T if the collector goes outside the national frontier, he

[Zele <fl...@ga...>]

Ply followed the market and nobody was envious. He lifted his
acquisition off the counter or stall for the best of all
reasons--because he fancied it--nay, because he intended to read it when
he reached home. A plea from the absolute collector's point of view--I
fear, a weak and false one--is occasionally advanced for books which
were formerly in fashion and favour; for example, Sylvester's _Du
Bartas_, the Platonic romances, Townley's French _Hudibras_, and a
hundred--a thousand--ten thousand more. It is thought to be worth while
to have a few of these deposed idols to show to your friends when they
visit you, that they may join in a homily on changes of taste. Perhaps
it would suffice to compare notes through the medium of some _Censura
Literaria_, or Beloe, or Collier. With most people space is a
consideration, with a few, money; and an incidental and passing
reflection need not be so costly in either way. For that reason such
works as I have indicated, and a few others similar to them, are apt to
prove serviceable and economical. The periodical reinfo

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

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

Revision: 3234
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3234&view=rev
Author:   spasi
Date:     2009-08-12 14:48:37 +0000 (Wed, 12 Aug 2009)

Log Message:
-----------
Fixed GLSync build issue.

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-08-12 13:13:17 UTC (rev 3233)
+++ trunk/LWJGL/platform_build/build-generator.xml	2009-08-12 14:48:37 UTC (rev 3234)
@@ -13,6 +13,10 @@
 		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/generator/**.java" source="1.5" target="1.5" taskname="generator">
 			<compilerarg value="-Xlint:all"/>
 		</javac>
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" source="1.4" target="1.4" taskname="generator">
+			<include name="org/lwjgl/opengl/GLSync.java"/>
+			<include name="org/lwjgl/opengl/PointerWrapper.java"/>
+		</javac>
 	</target>
 
 	<!-- Proxy target to generate it all -->


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:[3233] trunk/LWJGL/src/java/org/lwjgl/util/ generator/GLsync.java

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

Revision: 3233
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3233&view=rev
Author:   spasi
Date:     2009-08-12 13:13:17 +0000 (Wed, 12 Aug 2009)

Log Message:
-----------
GLsync annotation not needed anymore.

Removed Paths:
-------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsync.java

Deleted: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsync.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsync.java	2009-08-12 13:06:11 UTC (rev 3232)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsync.java	2009-08-12 13:13:17 UTC (rev 3233)
@@ -1,47 +0,0 @@
-/*
- * 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.generator;
-
-/**
- *
- * @author elias_naur <eli...@us...>
- * @version $Revision: 2983 $
- * $Id: GLhandleARB.java 2983 2008-04-07 18:36:09Z matzon $
- */
-
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@NativeType
-@Target({ElementType.PARAMETER, ElementType.METHOD})
-public @interface GLsync {
-}
\ 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:[3232] trunk/LWJGL

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

Revision: 3232
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3232&view=rev
Author:   spasi
Date:     2009-08-12 13:06:11 +0000 (Wed, 12 Aug 2009)

Log Message:
-----------
Completed GL32 support.
Added Generator support for wrapping GL pointers.
Added support for passing command-line arguments to tests.
Added test for ARB_sync functionality.
Temp fix to NV_shader_buffer_load.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLSync.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/PointerWrapper.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLpointer.java

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/build.xml	2009-08-12 13:06:11 UTC (rev 3232)
@@ -389,6 +389,7 @@
 		<java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
 			<sysproperty key="org.lwjgl.util.Debug" value="true"/>
 			<sysproperty key="java.library.path" value="${native_path_expanded}"/>
+			<arg line="${args}"/>
 		</java>
 	</target>	
 	

Added: trunk/LWJGL/src/java/org/lwjgl/opengl/GLSync.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLSync.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLSync.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+/**
+ * @author spasi <sp...@us...>
+ */
+public final class GLSync implements PointerWrapper {
+
+	private final long sync;
+
+	GLSync(final long sync) {
+		this.sync = sync;
+	}
+
+	public long getPointer() {
+		return sync;
+	}
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/java/org/lwjgl/opengl/PointerWrapper.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/PointerWrapper.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/PointerWrapper.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -0,0 +1,39 @@
+/*
+ * 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;
+
+/** @author spasi <sp...@us...> */
+public interface PointerWrapper {
+
+	long getPointer();
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -0,0 +1,184 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.BufferUtils;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.Sys;
+import org.lwjgl.opengl.*;
+
+import java.nio.IntBuffer;
+import java.util.Random;
+
+/**
+ * @author spasi <sp...@us...>
+ */
+public final class SyncTest {
+
+	private SyncTest() {
+	}
+
+	public static void main(String[] args) {
+		runTest(args);
+		cleanup();
+		System.exit(0);
+	}
+
+	private static void runTest(String[] args) {
+		if ( args.length < 2 )
+			argsError("Insufficient number of arguments.");
+
+		int clears = 1;
+		int timeout = 0;
+
+		try {
+			clears = Integer.parseInt(args[0]);
+			timeout = Integer.parseInt(args[1]);
+		} catch (NumberFormatException e) {
+			argsError("Invalid number format.");
+		}
+
+		ContextAttribs ca = new ContextAttribs();
+
+		try {
+			DisplayMode[] modes = Display.getAvailableDisplayModes();
+
+			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: " + version);
+		System.out.println("ARB_sync: " + GLContext.getCapabilities().GL_ARB_sync);
+
+		if ( !GLContext.getCapabilities().OpenGL32 && !GLContext.getCapabilities().GL_ARB_sync )
+			kill("OpenGL3.2 or ARB_sync support is required for this test.");
+
+		System.out.println("\n---------\n");
+
+		System.out.println("Clearing the framebuffer a gazillion times...");
+
+		Random rand = new Random(System.currentTimeMillis());
+		for ( int i = 0; i < clears; i++ ) {
+			GL11.glClearColor(rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 1.0f);
+			GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
+		}
+
+		GLSync sync = GL32.glFenceSync(GL32.GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+
+		System.out.println("\nWaiting on fence...");
+		long time = Sys.getTime();
+		int status = GL32.glClientWaitSync(sync, 0, timeout < 0 ? GL32.GL_TIMEOUT_IGNORED : timeout * 1000 * 1000);
+		System.out.println("\nFence sync complete after: " + ((Sys.getTime() - time) / (double)Sys.getTimerResolution()) + " seconds.");
+		System.out.print("\nWait Status: ");
+		switch ( status ) {
+			case GL32.GL_ALREADY_SIGNALED:
+				System.out.println("ALREADY_SIGNALED");
+				break;
+			case GL32.GL_CONDITION_SATISFIED:
+				System.out.println("CONDITION_SATISFIED");
+				break;
+			case GL32.GL_TIMEOUT_EXPIRED:
+				System.out.println("TIMEOUT_EXPIRED");
+				break;
+			case GL32.GL_WAIT_FAILED:
+				System.out.println("WAIT_FAILED");
+				break;
+			default:
+				System.out.println("Unexpected wait status: 0x" + Integer.toHexString(status));
+		}
+
+		IntBuffer property = BufferUtils.createIntBuffer(1);
+		GL32.glGetSynciv(sync, GL32.GL_SYNC_STATUS, null, property);
+		System.out.println("Sync Status: " + (property.get(0) == GL32.GL_UNSIGNALED ? "UNSIGNALED" : "SIGNALED"));
+
+		GL32.glDeleteSync(sync);
+
+		int error = GL11.glGetError();
+		if ( error != 0 )
+			System.out.println("\nTest failed with OpenGL error: " + error);
+		else
+			System.out.println("\nTest completed successfully.");
+	}
+
+	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: SyncTest <clears> <timeout>:\n");
+		System.out.println("clears\t- Number of times to clear the framebuffer.");
+		System.out.println("timeout\t- WaitSync timeout in milliseconds.");
+
+		cleanup();
+		System.exit(-1);
+	}
+
+	static void kill(String reason) {
+		System.out.println("The SyncTest 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

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java	2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -79,6 +79,10 @@
 					ca = ca.withDebug(true);
 				else if ( "fc".equalsIgnoreCase(args[i]) )
 					ca = ca.withForwardCompatible(true);
+				else if ( "core".equalsIgnoreCase(args[i]) )
+					ca = ca.withProfileCore(true);
+				else if ( "compatibility".equalsIgnoreCase(args[i]) )
+					ca = ca.withProfileCompatibility(true);
 				else
 					argsError("Unknown argument: \'" + args[i] + "\'");
 			}
@@ -108,8 +112,12 @@
 
 		final String version = GL11.glGetString(GL11.GL_VERSION);
 
-		System.out.println("GL Version requested: " + majorInput + '.' + minorInput);
-		System.out.println("GL Version returned : " + version);
+		System.out.print("GL Version requested: " + majorInput + '.' + minorInput);
+		if ( ca.isProfileCore() )
+			System.out.print(" - Core Profile");
+		else if ( ca.isProfileCompatibility() )
+			System.out.print(" - Compatibility Profile");
+		System.out.println("\nGL Version returned : " + version);
 
 		final StringTokenizer version_tokenizer = new StringTokenizer(version, ". ");
 
@@ -126,6 +134,9 @@
 		} else
 			System.out.println("\tThe requested version was returned. :)");
 
+		if ( ca.isProfileCompatibility() && !GLContext.getCapabilities().GL_ARB_compatibility )
+			System.out.println("\tThe driver does not support the Compatibility Profile.");
+
 		System.out.println("\n---------\n");
 
 		System.out.println("Debug mode: " + ca.isDebug());

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java	2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -41,6 +41,8 @@
  * $Id$
  */
 
+import org.lwjgl.opengl.PointerWrapper;
+
 import java.io.PrintWriter;
 import java.nio.*;
 import java.util.HashMap;
@@ -82,7 +84,6 @@
 		native_types_to_primitive.put(GLuint64EXT.class, PrimitiveType.Kind.LONG);
 		native_types_to_primitive.put(GLint64.class, PrimitiveType.Kind.LONG);
 		native_types_to_primitive.put(GLuint64.class, PrimitiveType.Kind.LONG);
-		native_types_to_primitive.put(GLsync.class, PrimitiveType.Kind.LONG);
 	}
 
 	public PrimitiveType.Kind getPrimitiveTypeFromNativeType(Class native_type) {
@@ -197,14 +198,14 @@
 		else if ( type.equals(DoubleBuffer.class) )
 			return new Class[] { GLclampd.class, GLdouble.class };
 		else if ( type.equals(LongBuffer.class) )
-			return new Class[] { GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class, GLsync.class };
+			return new Class[] { GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class };
 		else
 			return new Class[] { };
 	}
 
 	private static Class[] getValidPrimitiveTypes(Class type) {
 		if ( type.equals(long.class) )
-			return new Class[] { GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class, GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class, GLsync.class };
+			return new Class[] { GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class, GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class };
 		else if ( type.equals(int.class) )
 			return new Class[] { GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLuint.class,
 			                     GLsizei.class };
@@ -240,6 +241,8 @@
 			valid_types = getValidPrimitiveTypes(type);
 		else if ( String.class.equals(type) )
 			valid_types = new Class[] { GLubyte.class };
+		else if ( PointerWrapper.class.isAssignableFrom(type) )
+			valid_types = new Class[] { GLpointer.class };
 		else
 			valid_types = new Class[] { };
 		return valid_types;

Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLpointer.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLpointer.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLpointer.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -0,0 +1,43 @@
+/*
+ * 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.generator;
+
+/**
+ * @author spasi <sp...@us...>
+ */
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+public @interface GLpointer {
+	String value(); // The native pointer type.
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -41,6 +41,8 @@
  * $Id$
  */
 
+import org.lwjgl.opengl.PointerWrapper;
+
 import com.sun.mirror.apt.*;
 import com.sun.mirror.declaration.*;
 import com.sun.mirror.type.*;
@@ -82,7 +84,7 @@
 			Utils.printDocComment(writer, method);
 			writer.print("\tpublic static native ");
 		}
-		printResultType(writer, method);
+		printResultType(writer, method, true);
 		writer.print(" " + Utils.getSimpleNativeMethodName(method, generate_error_checks, context_specific));
 		if (mode == Mode.BUFFEROBJECT)
 			writer.print(Utils.BUFFER_OBJECT_METHOD_POSTFIX);
@@ -131,7 +133,7 @@
 			if (!first_parameter)
 				writer.print(", ");
 			first_parameter = false;
-			printResultType(writer, method);
+			printResultType(writer, method, native_stub);
 			writer.print(" " + Utils.CACHED_BUFFER_NAME);
 		}
 		return first_parameter;
@@ -147,7 +149,10 @@
 				throw new RuntimeException("type of " + param + " is not a nio Buffer parameter but is annotated as buffer object");
 			writer.print("long " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX);
 		} else {
-			writer.print(type_info.getType().getSimpleName());
+			if ( native_stub && param.getAnnotation(GLpointer.class) != null )
+				writer.print("long");
+			else
+				writer.print(type_info.getType().getSimpleName());
 			writer.print(" " + param.getSimpleName());
 			if (buffer_type != null && native_stub)
 				writer.print(", int " + param.getSimpleName() + NativeMethodStubsGenerator.BUFFER_POSITION_POSTFIX);
@@ -179,7 +184,7 @@
 	private static void printMethodWithMultiType(AnnotationProcessorEnvironment env, TypeMap type_map, PrintWriter writer, InterfaceDeclaration interface_decl, MethodDeclaration method, Map<ParameterDeclaration, TypeInfo> typeinfos_instance, Mode mode, boolean generate_error_checks, boolean context_specific) {
 		Utils.printDocComment(writer, method);
 		writer.print("\tpublic static ");
-		printResultType(writer, method);
+		printResultType(writer, method, false);
 		StripPostfix strip_annotation = method.getAnnotation(StripPostfix.class);
 		String method_name = method.getSimpleName();
 		if (strip_annotation != null && mode == Mode.NORMAL)
@@ -204,8 +209,11 @@
 		writer.print("\t\t");
 		boolean has_result = !result_type.equals(env.getTypeUtils().getVoidType());
 		if (has_result) {
-			printResultType(writer, method);
+			printResultType(writer, method, false);
 			writer.print(" " + Utils.RESULT_VAR_NAME + " = ");
+
+			if ( method.getAnnotation(GLpointer.class) != null )
+				writer.print("new " + method.getReturnType() + "(");
 		}
 		writer.print(Utils.getSimpleNativeMethodName(method, generate_error_checks, context_specific));
 		if (mode == Mode.BUFFEROBJECT)
@@ -217,6 +225,8 @@
 				writer.print(", ");
 			writer.print(Utils.FUNCTION_POINTER_VAR_NAME);
 		}
+		if ( has_result && method.getAnnotation(GLpointer.class) != null )
+			writer.print(")");
 		writer.println(");");
 		if (generate_error_checks && method.getAnnotation(NoErrorCheck.class) == null)
 			writer.println("\t\t" + type_map.getErrorCheckMethodName() + ";");
@@ -373,6 +383,8 @@
 							writer.print(" : 0");
 					} else
 						writer.print("0");
+				} else if ( param.getAnnotation(GLpointer.class) != null ) {
+					writer.print(".getPointer()");
 				}
 			}
 		}
@@ -492,7 +504,10 @@
 			writer.println("\t\tBufferChecks.checkNullTerminated(" + name + ");");
 	}
 
-	private static void printResultType(PrintWriter writer, MethodDeclaration method) {
-		writer.print(Utils.getMethodReturnType(method).toString());
+	private static void printResultType(PrintWriter writer, MethodDeclaration method, boolean native_stub) {
+		if ( native_stub && method.getAnnotation(GLpointer.class) != null )
+			writer.print("long");
+		else
+			writer.print(Utils.getMethodReturnType(method).toString());
 	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java	2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -71,6 +71,8 @@
 		writer.print(", ");
 		if (mode == Mode.BUFFEROBJECT && param.getAnnotation(BufferObject.class) != null) {
 			writer.print("jlong " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX);
+		} else if ( param.getAnnotation(GLpointer.class) != null ) {
+			writer.print("jlong " + param.getSimpleName());
 		} else {
 			JNITypeTranslator translator = new JNITypeTranslator();
 			param.getType().accept(translator);
@@ -81,14 +83,22 @@
 	}
 
 	private static void generateMethodStub(AnnotationProcessorEnvironment env, TypeMap type_map, PrintWriter writer, String interface_name, MethodDeclaration method, Mode mode, boolean generate_error_checks, boolean context_specific) {
-		TypeMirror result_type = Utils.getMethodReturnType(method);
-		JNITypeTranslator translator = new JNITypeTranslator();
-		result_type.accept(translator);
-		if (!context_specific)
+		if ( !context_specific )
 			writer.print("static ");
 		else
 			writer.print("JNIEXPORT ");
-		writer.print(translator.getSignature() + " JNICALL ");
+
+		TypeMirror result_type = Utils.getMethodReturnType(method);
+
+		if ( method.getAnnotation(GLpointer.class) != null ) {
+			writer.print("jlong");
+		} else {
+			JNITypeTranslator translator = new JNITypeTranslator();
+			result_type.accept(translator);
+			writer.print(translator.getSignature());
+		}
+		writer.print(" JNICALL ");
+
 		writer.print(Utils.getQualifiedNativeMethodName(interface_name, method, generate_error_checks, context_specific));
 		if (mode == Mode.BUFFEROBJECT)
 			writer.print(Utils.BUFFER_OBJECT_METHOD_POSTFIX);
@@ -140,8 +150,11 @@
 					writer.print("safeNewBufferCached(env, ");
 				else
 					writer.print("safeNewBuffer(env, ");
-			} else if (String.class.equals(java_result_type))
+			} else if (String.class.equals(java_result_type)) {
 				writer.print("NewStringNativeUnsigned(env, ");
+			} else if ( method.getAnnotation(GLpointer.class) != null ) {
+				writer.print("(jlong)");
+			}
 			writer.print(Utils.RESULT_VAR_NAME);
 			if (Buffer.class.isAssignableFrom(java_result_type)) {
 				writer.print(", ");
@@ -176,6 +189,8 @@
 			writer.print(translator.getSignature());
 			writer.print("*)");
 		}
+		if ( param.getAnnotation(GLpointer.class) != null )
+			writer.print("(" + param.getAnnotation(GLpointer.class).value() + ")");
 		if (param.getAnnotation(Result.class) != null || is_indirect)
 			writer.print("&");
 		if (param.getAnnotation(Result.class) != null) {

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java	2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -42,6 +42,8 @@
  * $Id$
  */
 
+import org.lwjgl.opengl.PointerWrapper;
+
 import com.sun.mirror.declaration.*;
 import com.sun.mirror.type.*;
 import com.sun.mirror.util.*;
@@ -77,8 +79,14 @@
 		StringBuilder signature = new StringBuilder();
 		if (declaration.getAnnotation(Const.class) != null)
 			signature.append("const ");
-		// Use the name of the native type annotation as the C type name
-		signature.append(getAnnotationType().getSimpleName());
+
+		if ( declaration.getAnnotation(GLpointer.class) != null ) {
+			signature.append(declaration.getAnnotation(GLpointer.class).value());
+		} else {
+			// Use the name of the native type annotation as the C type name
+			signature.append(getAnnotationType().getSimpleName());
+		}
+
 		if (is_indirect)
 			signature.append(" *");
 		return signature.toString();
@@ -131,6 +139,8 @@
 	}
 
 	public void visitClassType(ClassType t) {
+		is_indirect = true;
+
 		Class<?> c = getClassFromType(t);
 		if (String.class.equals(c)) {
 			native_types = new ArrayList<Class>();
@@ -141,9 +151,13 @@
 		} else if (Buffer.class.isAssignableFrom(c)) {
 			PrimitiveType.Kind kind = getPrimitiveKindFromBufferClass(c);
 			getNativeTypeFromAnnotatedPrimitiveType(kind);
+		} else if ( PointerWrapper.class.isAssignableFrom(c) ) {
+			native_types = new ArrayList<Class>();
+			native_types.add(GLpointer.class);
+
+			is_indirect = false;
 		} else
 			throw new RuntimeException(t + " is not allowed");
-		is_indirect = true;
 	}
 
 	public void visitPrimitiveType(PrimitiveType t) {

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -70,22 +70,22 @@
 	int GL_CONDITION_SATISFIED = 0x911C;
 	int GL_WAIT_FAILED = 0x911D;
 
-	@GLsync
-	long glFenceSync(@GLenum int condition, @GLbitfield int flags);
+	@GLpointer("GLsync")
+	GLSync glFenceSync(@GLenum int condition, @GLbitfield int flags);
 
-	boolean glIsSync(@GLsync long sync);
+	boolean glIsSync(@GLpointer("GLsync") GLSync sync);
 
-	void glDeleteSync(@GLsync long sync);
+	void glDeleteSync(@GLpointer("GLsync") GLSync sync);
 
 	@GLenum
-	int glClientWaitSync(@GLsync long sync, @GLbitfield int flags, @GLuint64 long timeout);
+	int glClientWaitSync(@GLpointer("GLsync") GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
 
-	void glWaitSync(@GLsync long sync, @GLbitfield int flags, @GLuint64 long timeout);
+	void glWaitSync(@GLpointer("GLsync") GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
 
 	@StripPostfix("params")
 	void glGetInteger64v(@GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer params);
 
-	void glGetSynciv(@GLsync long sync, @GLenum int pname,
+	void glGetSynciv(@GLpointer("GLsync") GLSync sync, @GLenum int pname,
 	                 @AutoSize("values") @GLsizei int bufSize,
 	                 @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
 	                 @OutParameter IntBuffer values);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -35,8 +35,8 @@
 
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 import java.nio.LongBuffer;
-import java.nio.IntBuffer;
 
 public interface GL32 {
 
@@ -296,23 +296,24 @@
 	int GL_CONDITION_SATISFIED = 0x911C;
 	int GL_WAIT_FAILED = 0x911D;
 
-	/*
-	@GLsync long glFenceSync(@GLenum int condition, @GLbitfield int flags);
+	@GLpointer("GLsync")
+	GLSync glFenceSync(@GLenum int condition, @GLbitfield int flags);
 
-	boolean glIsSync(@GLsync long sync);
+	boolean glIsSync(@GLpointer("GLsync") GLSync sync);
 
-	void glDeleteSync(@GLsync long sync);
+	void glDeleteSync(@GLpointer("GLsync") GLSync sync);
 
-	@GLenum int glClientWaitSync(@GLsync long sync, @GLbitfield int flags, @GLuint64 long timeout);
+	@GLenum
+	int glClientWaitSync(@GLpointer("GLsync") GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
 
-	void glWaitSync(@GLsync long sync, @GLbitfield int flags, @GLuint64 long timeout);
+	void glWaitSync(@GLpointer("GLsync") GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
 
 	@StripPostfix("params")
 	void glGetInteger64v(@GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer params);
 
-	void glGetSynciv(@GLsync long sync, @GLenum int pname,
+	void glGetSynciv(@GLpointer("GLsync") GLSync sync, @GLenum int pname,
 	                 @AutoSize("values") @GLsizei int bufSize,
 	                 @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
 	                 @OutParameter IntBuffer values);
-	*/
+
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java	2009-08-05 18:54:47 UTC (rev 3231)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java	2009-08-12 13:06:11 UTC (rev 3232)
@@ -55,10 +55,10 @@
 
 	boolean glIsBufferResidentNV(@GLenum int target);
 
-	void glNamedMakeBufferResidentNV(@GLuint int buffer, @GLenum int access);
+	// TODO: These two are currently missing from the latest NV drivers, check again sometime.
+	//void glNamedMakeBufferResidentNV(@GLuint int buffer, @GLenum int access);
+	//void glNamedMakeBufferNonResidentNV(@GLuint int buffer);
 
-	void glNamedMakeBufferNonResidentNV(@GLuint int buffer);
-
 	boolean glIsNamedBufferResidentNV(@GLuint int buffer);
 
 	@StripPostfix("params")


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:[3231] trunk/LWJGL/src/java/org/lwjgl/openal/ ALC11.java

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

Revision: 3231
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3231&view=rev
Author:   matzon
Date:     2009-08-05 18:54:47 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
missing initialization of AL11 functions

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/openal/ALC11.java

Modified: trunk/LWJGL/src/java/org/lwjgl/openal/ALC11.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/ALC11.java	2009-08-05 07:09:36 UTC (rev 3230)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/ALC11.java	2009-08-05 18:54:47 UTC (rev 3231)
@@ -184,7 +184,8 @@
 				
 				// checking for version 1.1+
 				if(major > 1 || minor >= 1) {
-					initNativeStubs();
+					ALC11.initNativeStubs();
+                                        AL11.initNativeStubs();
 				}		
 			}
 		} catch (LWJGLException le) {


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:[3230] trunk/LWJGL/src/java/org/lwjgl/util/ generator

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

Revision: 3230
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3230&view=rev
Author:   spasi
Date:     2009-08-05 07:09:36 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Added missing annotations.

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsync.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64.java

Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLint64.java	2009-08-05 07:09:36 UTC (rev 3230)
@@ -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.util.generator;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@NativeType
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+public @interface GLint64 {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsync.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsync.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLsync.java	2009-08-05 07:09:36 UTC (rev 3230)
@@ -0,0 +1,47 @@
+/*
+ * 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.generator;
+
+/**
+ *
+ * @author elias_naur <eli...@us...>
+ * @version $Revision: 2983 $
+ * $Id: GLhandleARB.java 2983 2008-04-07 18:36:09Z matzon $
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@NativeType
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+public @interface GLsync {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLuint64.java	2009-08-05 07:09:36 UTC (rev 3230)
@@ -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.util.generator;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@NativeType
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+public @interface GLuint64 {
+}
\ 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:[3229] trunk/LWJGL/src

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

Revision: 3229
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3229&view=rev
Author:   spasi
Date:     2009-08-04 18:21:41 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Added support for OpenGL 3.2 and the following extensions: AMD_draw_buffers_blend, ARB_depth_clamp, ARB_draw_buffers_blend, ARB_draw_elements_base_vertex, ARB_fragment_coord_conventions, ARB_provoking_vertex, ARB_sample_shading, ARB_seamless_cube_map, ARB_shader_texture_lod, ARB_texture_cube_map_array, ARB_texture_gather, ARB_texture_multisample, ARB_texture_query_lod, ARB_vertex_array_bgra, EXT_separate_shader_objects, EXT_texture_snorm, NV_copy_image, NV_parameter_buffer_object2.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribsImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/FieldsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
    trunk/LWJGL/src/native/common/extgl.h

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_draw_buffers_blend.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_clamp.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_buffers_blend.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_elements_base_vertex.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_fragment_coord_conventions.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_provoking_vertex.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sample_shading.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_seamless_cube_map.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_texture_lod.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_cube_map_array.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_gather.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_multisample.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_query_lod.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_array_bgra.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_separate_shader_objects.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_snorm.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_copy_image.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_parameter_buffer_object2.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2009-07-23 20:56:59 UTC (rev 3228)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -48,7 +48,7 @@
  * implementation. Developers may encounter debug contexts being the same as non-debug contexts or forward compatible
  * contexts having support for deprecated functionality.
  * <p/>
- * Warning: This functionality is currently available on the Windows platform only. However, if the forwardCompatible
+ * If the forwardCompatible
  * attribute is used, LWJGL will not load the deprecated functionality (as defined in the OpenGL 3.0 specification). This
  * means that developers can start working on cleaning up their applications without an OpenGL 3.0 complaint driver.
  *
@@ -64,6 +64,9 @@
 	private boolean debug;
 	private boolean forwardCompatible;
 
+	private boolean profileCore;
+	private boolean profileCompatibility;
+
 	public ContextAttribs() {
 		this(1, 0);
 	}
@@ -72,7 +75,7 @@
 		if ( majorVersion < 0 ||
 		     3 < majorVersion ||
 		     minorVersion < 0 ||
-		     (majorVersion == 3 && 1 < minorVersion) ||
+		     (majorVersion == 3 && 2 < minorVersion) ||
 		     (majorVersion == 2 && 1 < minorVersion) ||
 		     (majorVersion == 1 && 5 < minorVersion) )
 			throw new IllegalArgumentException("Invalid OpenGL version specified: " + majorVersion + '.' + minorVersion);
@@ -84,6 +87,9 @@
 
 		this.debug = false;
 		this.forwardCompatible = false;
+
+		this.profileCore = 3 < majorVersion || (majorVersion == 3 && 2 <= minorVersion) ? true : false;
+		this.profileCompatibility = false;
 	}
 
 	private ContextAttribs(final ContextAttribs attribs) {
@@ -94,6 +100,9 @@
 
 		this.debug = attribs.debug;
 		this.forwardCompatible = attribs.forwardCompatible;
+
+		this.profileCore = attribs.profileCore;
+		this.profileCompatibility = attribs.profileCompatibility;
 	}
 
 	public int getMajorVersion() {
@@ -116,27 +125,74 @@
 		return forwardCompatible;
 	}
 
+	public boolean isProfileCore() {
+		return profileCore;
+	}
+
+	public boolean isProfileCompatibility() {
+		return profileCompatibility;
+	}
+
 	public ContextAttribs withLayer(final int layerPlane) {
 		if ( layerPlane < 0 )
 			throw new IllegalArgumentException("Invalid layer plane specified: " + layerPlane);
 
+		if ( layerPlane == this.layerPlane )
+			return this;
+
 		final ContextAttribs attribs = new ContextAttribs(this);
 		attribs.layerPlane = layerPlane;
 		return attribs;
 	}
 
 	public ContextAttribs withDebug(final boolean debug) {
+		if ( debug == this.debug )
+			return this;
+
 		final ContextAttribs attribs = new ContextAttribs(this);
 		attribs.debug = debug;
 		return attribs;
 	}
 
 	public ContextAttribs withForwardCompatible(final boolean forwardCompatible) {
+		if ( forwardCompatible == this.forwardCompatible )
+			return this;
+
 		final ContextAttribs attribs = new ContextAttribs(this);
 		attribs.forwardCompatible = forwardCompatible;
 		return attribs;
 	}
 
+	public ContextAttribs withProfileCore(final boolean profileCore) {
+		if ( majorVersion < 3 || (majorVersion == 3 && minorVersion < 2) )
+			throw new IllegalArgumentException("Profiles are only supported on OpenGL version 3.2 or higher.");
+
+		if ( profileCore == this.profileCore )
+			return this;
+
+		final ContextAttribs attribs = new ContextAttribs(this);
+		attribs.profileCore = profileCore;
+		if ( profileCore )
+			attribs.profileCompatibility = false;
+
+		return attribs;
+	}
+
+	public ContextAttribs withProfileCompatibility(final boolean profileCompatibility) {
+		if ( majorVersion < 3 || (majorVersion == 3 && minorVersion < 2) )
+			throw new IllegalArgumentException("Profiles are only supported on OpenGL version 3.2 or higher.");
+
+		if ( profileCompatibility == this.profileCompatibility )
+			return this;
+
+		final ContextAttribs attribs = new ContextAttribs(this);
+		attribs.profileCompatibility = profileCompatibility;
+		if ( profileCompatibility )
+			attribs.profileCore = false;
+
+		return attribs;
+	}
+
 	private static ContextAttribsImplementation getImplementation() {
 		switch ( LWJGLUtil.getPlatform() ) {
 			case LWJGLUtil.PLATFORM_LINUX:
@@ -168,6 +224,14 @@
 		if ( 0 < flags )
 			attribCount++;
 
+		int profileMask = 0;
+		if ( profileCore )
+			profileMask |= implementation.getProfileCoreBit();
+		else if ( profileCompatibility )
+			profileMask |= implementation.getProfileCompatibilityBit();
+		if ( 0 < profileMask )
+			attribCount++;
+
 		if ( attribCount == 0 )
 			return null;
 
@@ -181,6 +245,8 @@
 			attribs.put(implementation.getLayerPlaneAttrib()).put(layerPlane);
 		if ( 0 < flags )
 			attribs.put(implementation.getFlagsAttrib()).put(flags);
+		if ( 0 < profileMask )
+			attribs.put(implementation.getProfileMaskAttrib()).put(profileMask);
 
 		attribs.put(0);
 		attribs.rewind();
@@ -195,6 +261,13 @@
 		sb.append(" - Layer=").append(layerPlane);
 		sb.append(" - Debug=").append(debug);
 		sb.append(" - ForwardCompatible=").append(forwardCompatible);
+		sb.append(" - Profile=");
+		if ( profileCore )
+			sb.append("Core");
+		else if ( profileCompatibility )
+			sb.append("Compatibility");
+		else
+			sb.append("None");
 
 		return sb.toString();
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribsImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribsImplementation.java	2009-07-23 20:56:59 UTC (rev 3228)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribsImplementation.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -47,4 +47,10 @@
 
 	int getForwardCompatibleBit();
 
+	int getProfileMaskAttrib();
+
+	int getProfileCoreBit();
+
+	int getProfileCompatibilityBit();
+
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2009-07-23 20:56:59 UTC (rev 3228)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -200,6 +200,8 @@
 		}
 
 		// ----------------------[ 3.X ]----------------------
+		if ( 3 < majorVersion || (3 == majorVersion && 2 <= minorVersion) )
+			supported_extensions.add("OpenGL32");
 		if ( 3 < majorVersion || (3 == majorVersion && 1 <= minorVersion) )
 			supported_extensions.add("OpenGL31");
 		if ( 3 <= majorVersion )

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java	2009-07-23 20:56:59 UTC (rev 3228)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -44,10 +44,14 @@
 	private static final int GLX_CONTEXT_MINOR_VERSION_ARB = 0x2092;
 	private static final int GLX_CONTEXT_LAYER_PLANE_ARB = 0x2093;
 	private static final int GLX_CONTEXT_FLAGS_ARB = 0x2094;
+	private static final int GLX_CONTEXT_PROFILE_MASK_ARB = 0x9126;
 
 	private static final int GLX_CONTEXT_DEBUG_BIT_ARB = 0x0001;
 	private static final int GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB = 0x0002;
 
+	private static final int GLX_CONTEXT_CORE_PROFILE_BIT_ARB = 0x00000001;
+	private static final int GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB = 0x00000002;
+
 	LinuxContextAttribs() {
 	}
 
@@ -75,4 +79,16 @@
 		return GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
 	}
 
+	public int getProfileMaskAttrib() {
+		return GLX_CONTEXT_PROFILE_MASK_ARB;
+	}
+
+	public int getProfileCoreBit() {
+		return GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
+	}
+
+	public int getProfileCompatibilityBit() {
+		return GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
+	}
+
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java	2009-07-23 20:56:59 UTC (rev 3228)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -44,10 +44,14 @@
 	private static final int XGL_CONTEXT_MINOR_VERSION_ARB = 0x2092;
 	private static final int XGL_CONTEXT_LAYER_PLANE_ARB = 0x2093;
 	private static final int XGL_CONTEXT_FLAGS_ARB = 0x2094;
+	private static final int XGL_CONTEXT_PROFILE_MASK_ARB = 0x9126;
 
 	private static final int XGL_CONTEXT_DEBUG_BIT_ARB = 0x0001;
 	private static final int XGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB = 0x0002;
 
+	private static final int XGL_CONTEXT_CORE_PROFILE_BIT_ARB = 0x00000001;
+	private static final int XGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB = 0x00000002;
+
 	MacOSXContextAttribs() {
 	}
 
@@ -75,4 +79,16 @@
 		return XGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
 	}
 
+	public int getProfileMaskAttrib() {
+		return XGL_CONTEXT_PROFILE_MASK_ARB;
+	}
+
+	public int getProfileCoreBit() {
+		return XGL_CONTEXT_CORE_PROFILE_BIT_ARB;
+	}
+
+	public int getProfileCompatibilityBit() {
+		return XGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
+	}
+
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java	2009-07-23 20:56:59 UTC (rev 3228)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -42,10 +42,14 @@
 	private static final int WGL_CONTEXT_MINOR_VERSION_ARB = 0x2092;
 	private static final int WGL_CONTEXT_LAYER_PLANE_ARB = 0x2093;
 	private static final int WGL_CONTEXT_FLAGS_ARB = 0x2094;
+	private static final int WGL_CONTEXT_PROFILE_MASK_ARB = 0x9126;
 
 	private static final int WGL_CONTEXT_DEBUG_BIT_ARB = 0x0001;
 	private static final int WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB = 0x0002;
 
+	private static final int WGL_CONTEXT_CORE_PROFILE_BIT_ARB = 0x00000001;
+	private static final int WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB = 0x00000002;
+
 	WindowsContextAttribs() {
 	}
 
@@ -73,4 +77,16 @@
 		return WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
 	}
 
+	public int getProfileMaskAttrib() {
+		return WGL_CONTEXT_PROFILE_MASK_ARB;
+	}
+
+	public int getProfileCoreBit() {
+		return WGL_CONTEXT_CORE_PROFILE_BIT_ARB;
+	}
+
+	public int getProfileCompatibilityBit() {
+		return WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
+	}
+
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/FieldsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/FieldsGenerator.java	2009-07-23 20:56:59 UTC (rev 3228)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/FieldsGenerator.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -48,17 +48,23 @@
 		if (!(field_type instanceof PrimitiveType))
 			throw new RuntimeException("Field " + field.getSimpleName() + " is not a primitive type");
 		PrimitiveType field_type_prim = (PrimitiveType)field_type;
-		if (field_type_prim.getKind() != PrimitiveType.Kind.INT)
-			throw new RuntimeException("Field " + field.getSimpleName() + " is not of type 'int'");
-		Integer field_value = (Integer)field.getConstantValue();
+		if (field_type_prim.getKind() != PrimitiveType.Kind.INT && field_type_prim.getKind() != PrimitiveType.Kind.LONG)
+			throw new RuntimeException("Field " + field.getSimpleName() + " is not of type 'int' or 'long'");
+		Object field_value = field.getConstantValue();
 		if (field_value == null)
 			throw new RuntimeException("Field " + field.getSimpleName() + " has no initial value");
 	}
 
 	private static void generateField(PrintWriter writer, FieldDeclaration field) {
-		Integer field_value = (Integer)field.getConstantValue();
 		validateField(field);
-		String field_value_string = Integer.toHexString(field_value);
+
+		Object value = field.getConstantValue();
+		String field_value_string;
+		if ( value.getClass().equals(Integer.class) )
+			field_value_string = Integer.toHexString((Integer)field.getConstantValue());
+		else
+			field_value_string = Long.toHexString((Long)field.getConstantValue()) + 'l';
+
 		Utils.printDocComment(writer, field);
 		// Print field declaration
 		writer.println("\tpublic static final " + field.getType().toString() + " " + field.getSimpleName() + " = 0x" + field_value_string + ";");

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java	2009-07-23 20:56:59 UTC (rev 3228)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -41,14 +41,16 @@
  * $Id$
  */
 
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.PrintWriter;
 import java.nio.*;
+import java.util.HashMap;
+import java.util.Map;
 
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.type.PrimitiveType;
+
 public class GLTypeMap implements TypeMap {
+
 	private static final Map<Class, PrimitiveType.Kind> native_types_to_primitive;
 
 	static {
@@ -78,11 +80,14 @@
 		native_types_to_primitive.put(GLvoid.class, PrimitiveType.Kind.BYTE);
 		native_types_to_primitive.put(GLint64EXT.class, PrimitiveType.Kind.LONG);
 		native_types_to_primitive.put(GLuint64EXT.class, PrimitiveType.Kind.LONG);
+		native_types_to_primitive.put(GLint64.class, PrimitiveType.Kind.LONG);
+		native_types_to_primitive.put(GLuint64.class, PrimitiveType.Kind.LONG);
+		native_types_to_primitive.put(GLsync.class, PrimitiveType.Kind.LONG);
 	}
 
 	public PrimitiveType.Kind getPrimitiveTypeFromNativeType(Class native_type) {
 		PrimitiveType.Kind kind = native_types_to_primitive.get(native_type);
-		if (kind == null)
+		if ( kind == null )
 			throw new RuntimeException("Unsupported type " + native_type);
 		return kind;
 	}
@@ -96,50 +101,46 @@
 	}
 
 	public Signedness getSignednessFromType(Class type) {
-		if (GLuint.class.equals(type))
+		if ( GLuint.class.equals(type) )
 			return Signedness.UNSIGNED;
-		else if (GLint.class.equals(type))
+		else if ( GLint.class.equals(type) )
 			return Signedness.SIGNED;
-		else if (GLushort.class.equals(type))
+		else if ( GLushort.class.equals(type) )
 			return Signedness.UNSIGNED;
-		else if (GLshort.class.equals(type))
+		else if ( GLshort.class.equals(type) )
 			return Signedness.SIGNED;
-		else if (GLubyte.class.equals(type))
+		else if ( GLubyte.class.equals(type) )
 			return Signedness.UNSIGNED;
-		else if (GLbyte.class.equals(type))
+		else if ( GLbyte.class.equals(type) )
 			return Signedness.SIGNED;
-		else if (GLuint64EXT.class.equals(type))
+		else if ( GLuint64EXT.class.equals(type) )
 			return Signedness.UNSIGNED;
-		else if (GLint64EXT.class.equals(type))
+		else if ( GLint64EXT.class.equals(type) )
 			return Signedness.SIGNED;
+		else if ( GLuint64.class.equals(type) )
+			return Signedness.UNSIGNED;
+		else if ( GLint64.class.equals(type) )
+			return Signedness.SIGNED;
 		else
 			return Signedness.NONE;
 	}
 
 	public String translateAnnotation(Class annotation_type) {
-		if (annotation_type.equals(GLuint.class))
+		if ( annotation_type.equals(GLuint.class) || annotation_type.equals(GLint.class) )
 			return "i";
-		else if (annotation_type.equals(GLint.class))
-			return "i";
-		else if (annotation_type.equals(GLushort.class))
-			return"s";
-		else if (annotation_type.equals(GLshort.class))
+		else if ( annotation_type.equals(GLushort.class) || annotation_type.equals(GLshort.class) )
 			return "s";
-		else if (annotation_type.equals(GLubyte.class))
+		else if ( annotation_type.equals(GLubyte.class) || annotation_type.equals(GLbyte.class) )
 			return "b";
-		else if (annotation_type.equals(GLbyte.class))
-			return "b";
-		else if (annotation_type.equals(GLfloat.class))
+		else if ( annotation_type.equals(GLfloat.class) )
 			return "f";
-		else if (annotation_type.equals(GLdouble.class))
+		else if ( annotation_type.equals(GLdouble.class) )
 			return "d";
-		else if (annotation_type.equals(GLhalf.class))
+		else if ( annotation_type.equals(GLhalf.class) )
 			return "h";
-		else if (annotation_type.equals(GLuint64EXT.class))
+		else if ( annotation_type.equals(GLuint64EXT.class) || annotation_type.equals(GLint64EXT.class) || annotation_type.equals(GLuint64.class) || annotation_type.equals(GLint64.class) )
 			return "i64";
-		else if (annotation_type.equals(GLint64EXT.class))
-			return "i64";
-		else if (annotation_type.equals(GLboolean.class) || annotation_type.equals(GLvoid.class))
+		else if ( annotation_type.equals(GLboolean.class) || annotation_type.equals(GLvoid.class) )
 			return "";
 		else
 			throw new RuntimeException(annotation_type + " is not allowed");
@@ -147,7 +148,7 @@
 
 	public Class getNativeTypeFromPrimitiveType(PrimitiveType.Kind kind) {
 		Class type;
-		switch (kind) {
+		switch ( kind ) {
 			case INT:
 				type = GLint.class;
 				break;
@@ -184,43 +185,43 @@
 	}
 
 	private static Class[] getValidBufferTypes(Class type) {
-		if (type.equals(IntBuffer.class))
-			return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class,
-							GLsizei.class, GLuint.class};
-		else if (type.equals(FloatBuffer.class))
-			return new Class[]{GLclampf.class, GLfloat.class};
-		else if (type.equals(ByteBuffer.class))
-			return new Class[]{GLboolean.class, GLbyte.class, GLcharARB.class, GLchar.class, GLubyte.class, GLvoid.class};
-		else if (type.equals(ShortBuffer.class))
-			return new Class[]{GLhalf.class, GLshort.class, GLushort.class};
-		else if (type.equals(DoubleBuffer.class))
-			return new Class[]{GLclampd.class, GLdouble.class};
-		else if (type.equals(LongBuffer.class))
-			return new Class[]{GLint64EXT.class, GLuint64EXT.class};
+		if ( type.equals(IntBuffer.class) )
+			return new Class[] { GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class,
+			                     GLsizei.class, GLuint.class };
+		else if ( type.equals(FloatBuffer.class) )
+			return new Class[] { GLclampf.class, GLfloat.class };
+		else if ( type.equals(ByteBuffer.class) )
+			return new Class[] { GLboolean.class, GLbyte.class, GLcharARB.class, GLchar.class, GLubyte.class, GLvoid.class };
+		else if ( type.equals(ShortBuffer.class) )
+			return new Class[] { GLhalf.class, GLshort.class, GLushort.class };
+		else if ( type.equals(DoubleBuffer.class) )
+			return new Class[] { GLclampd.class, GLdouble.class };
+		else if ( type.equals(LongBuffer.class) )
+			return new Class[] { GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class, GLsync.class };
 		else
-			return new Class[]{};
+			return new Class[] { };
 	}
 
 	private static Class[] getValidPrimitiveTypes(Class type) {
-		if (type.equals(long.class))
-			return new Class[]{GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class, GLint64EXT.class, GLuint64EXT.class};
-		else if (type.equals(int.class))
-			return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLuint.class,
-							GLsizei.class};
-		else if (type.equals(double.class))
-			return new Class[]{GLclampd.class, GLdouble.class};
-		else if (type.equals(float.class))
-			return new Class[]{GLclampf.class, GLfloat.class};
-		else if (type.equals(short.class))
-			return new Class[]{GLhalf.class, GLshort.class, GLushort.class};
-		else if (type.equals(byte.class))
-			return new Class[]{GLbyte.class, GLcharARB.class, GLchar.class, GLubyte.class};
-		else if (type.equals(boolean.class))
-			return new Class[]{GLboolean.class};
-		else if (type.equals(void.class))
-			return new Class[]{GLvoid.class};
+		if ( type.equals(long.class) )
+			return new Class[] { GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class, GLint64EXT.class, GLuint64EXT.class, GLint64.class, GLuint64.class, GLsync.class };
+		else if ( type.equals(int.class) )
+			return new Class[] { GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLuint.class,
+			                     GLsizei.class };
+		else if ( type.equals(double.class) )
+			return new Class[] { GLclampd.class, GLdouble.class };
+		else if ( type.equals(float.class) )
+			return new Class[] { GLclampf.class, GLfloat.class };
+		else if ( type.equals(short.class) )
+			return new Class[] { GLhalf.class, GLshort.class, GLushort.class };
+		else if ( type.equals(byte.class) )
+			return new Class[] { GLbyte.class, GLcharARB.class, GLchar.class, GLubyte.class };
+		else if ( type.equals(boolean.class) )
+			return new Class[] { GLboolean.class };
+		else if ( type.equals(void.class) )
+			return new Class[] { GLvoid.class };
 		else
-			return new Class[]{};
+			return new Class[] { };
 	}
 
 	public String getTypedefPrefix() {
@@ -233,55 +234,59 @@
 
 	public Class[] getValidAnnotationTypes(Class type) {
 		Class[] valid_types;
-		if (Buffer.class.isAssignableFrom(type))
+		if ( Buffer.class.isAssignableFrom(type) )
 			valid_types = getValidBufferTypes(type);
-		else if (type.isPrimitive())
+		else if ( type.isPrimitive() )
 			valid_types = getValidPrimitiveTypes(type);
-		else if (String.class.equals(type))
-			valid_types = new Class[]{GLubyte.class};
+		else if ( String.class.equals(type) )
+			valid_types = new Class[] { GLubyte.class };
 		else
-			valid_types = new Class[]{};
+			valid_types = new Class[] { };
 		return valid_types;
 	}
 
 	public Class getInverseType(Class type) {
-		if (GLuint.class.equals(type))
+		if ( GLuint.class.equals(type) )
 			return GLint.class;
-		else if (GLint.class.equals(type))
+		else if ( GLint.class.equals(type) )
 			return GLuint.class;
-		else if (GLushort.class.equals(type))
+		else if ( GLushort.class.equals(type) )
 			return GLshort.class;
-		else if (GLshort.class.equals(type))
+		else if ( GLshort.class.equals(type) )
 			return GLushort.class;
-		else if (GLubyte.class.equals(type))
+		else if ( GLubyte.class.equals(type) )
 			return GLbyte.class;
-		else if (GLbyte.class.equals(type))
+		else if ( GLbyte.class.equals(type) )
 			return GLubyte.class;
-		else if (GLuint64EXT.class.equals(type))
+		else if ( GLuint64EXT.class.equals(type) )
 			return GLint64EXT.class;
-		else if (GLint64EXT.class.equals(type))
+		else if ( GLint64EXT.class.equals(type) )
 			return GLuint64EXT.class;
+		else if ( GLuint64.class.equals(type) )
+			return GLint64.class;
+		else if ( GLint64.class.equals(type) )
+			return GLuint64.class;
 		else
 			return null;
 	}
 
 	public String getAutoTypeFromAnnotation(AnnotationMirror annotation) {
 		Class annotation_class = NativeTypeTranslator.getClassFromType(annotation.getAnnotationType());
-		if (annotation_class.equals(GLint.class))
+		if ( annotation_class.equals(GLint.class) )
 			return "GL11.GL_INT";
-		else if (annotation_class.equals(GLbyte.class))
+		else if ( annotation_class.equals(GLbyte.class) )
 			return "GL11.GL_BYTE";
-		else if (annotation_class.equals(GLshort.class))
+		else if ( annotation_class.equals(GLshort.class) )
 			return "GL11.GL_SHORT";
-		if (annotation_class.equals(GLuint.class))
+		if ( annotation_class.equals(GLuint.class) )
 			return "GL11.GL_UNSIGNED_INT";
-		else if (annotation_class.equals(GLubyte.class))
+		else if ( annotation_class.equals(GLubyte.class) )
 			return "GL11.GL_UNSIGNED_BYTE";
-		else if (annotation_class.equals(GLushort.class))
+		else if ( annotation_class.equals(GLushort.class) )
 			return "GL11.GL_UNSIGNED_SHORT";
-		else if (annotation_class.equals(GLfloat.class))
+		else if ( annotation_class.equals(GLfloat.class) )
 			return "GL11.GL_FLOAT";
-		else if (annotation_class.equals(GLdouble.class))
+		else if ( annotation_class.equals(GLdouble.class) )
 			return "GL11.GL_DOUBLE";
 		else
 			return null;

Modified: trunk/LWJGL/src/native/common/extgl.h
===================================================================
--- trunk/LWJGL/src/native/common/extgl.h	2009-07-23 20:56:59 UTC (rev 3228)
+++ trunk/LWJGL/src/native/common/extgl.h	2009-08-04 18:21:41 UTC (rev 3229)
@@ -129,6 +129,9 @@
 typedef unsigned short GLhalf;
 typedef int64_t GLint64EXT;
 typedef uint64_t GLuint64EXT;
+typedef int64_t GLint64;
+typedef uint64_t GLuint64;
+typedef struct __GLsync *GLsync;
 
 /* helper stuff */
 

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_draw_buffers_blend.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_draw_buffers_blend.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_draw_buffers_blend.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,49 @@
+/*
+ * 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.GLuint;
+
+public interface AMD_draw_buffers_blend {
+
+	void glBlendFuncIndexedAMD(@GLuint int buf, @GLenum int src, @GLenum int dst);
+
+	void glBlendFuncSeparateIndexedAMD(@GLuint int buf, @GLenum int srcRGB, @GLenum int dstRGB,
+	                                   @GLenum int srcAlpha, @GLenum int dstAlpha);
+
+	void glBlendEquationIndexedAMD(@GLuint int buf, @GLenum int mode);
+
+	void glBlendEquationSeparateIndexedAMD(@GLuint int buf, @GLenum int modeRGB,
+	                                       @GLenum int modeAlpha);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_clamp.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_clamp.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_clamp.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,43 @@
+/*
+ * 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_depth_clamp {
+
+	/**
+	 * 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_DEPTH_CLAMP = 0x864F;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_buffers_blend.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_buffers_blend.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_buffers_blend.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,47 @@
+/*
+ * 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.GLuint;
+
+public interface ARB_draw_buffers_blend {
+
+	void glBlendEquationiARB(@GLuint int buf, @GLenum int mode);
+
+	void glBlendEquationSeparateiARB(@GLuint int buf, @GLenum int modeRGB, @GLenum int modeAlpha);
+
+	void glBlendFunciARB(@GLuint int buf, @GLenum int src, @GLenum int dst);
+
+	void glBlendFuncSeparateiARB(@GLuint int buf, @GLenum int srcRGB, @GLenum int dstRGB, @GLenum int srcAlpha, @GLenum int dstAlpha);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_elements_base_vertex.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_elements_base_vertex.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_elements_base_vertex.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,63 @@
+/*
+ * 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;
+
+public interface ARB_draw_elements_base_vertex {
+
+	void glDrawElementsBaseVertex(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
+	                              @BufferObject(BufferKind.ElementVBO)
+	                              @Const
+	                              @GLubyte
+	                              @GLushort
+	                              @GLuint Buffer indices, int basevertex);
+
+	void glDrawRangeElementsBaseVertex(@GLenum int mode, @GLuint int start, @GLuint int end, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
+	                                   @BufferObject(BufferKind.ElementVBO)
+	                                   @Const
+	                                   @GLubyte
+	                                   @GLushort
+	                                   @GLuint Buffer indices, int basevertex);
+
+	void glDrawElementsInstancedBaseVertex(@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, int basevertex);
+
+	//void glMultiDrawElementsBaseVertex(@GLenum int mode, @GLsizei*count, @GLenum int type, void**indices, @GLsizei int primcount, int*basevertex)
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_fragment_coord_conventions.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_fragment_coord_conventions.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_fragment_coord_conventions.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -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_fragment_coord_conventions {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_provoking_vertex.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_provoking_vertex.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_provoking_vertex.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -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 ARB_provoking_vertex {
+
+	/** Accepted by the &lt;mode&gt; parameter of ProvokingVertex: */
+	int GL_FIRST_VERTEX_CONVENTION = 0x8E4D;
+	int GL_LAST_VERTEX_CONVENTION = 0x8E4E;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_PROVOKING_VERTEX = 0x8E4F;
+	int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION = 0x8E4C;
+
+	void glProvokingVertex(@GLenum int mode);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sample_shading.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sample_shading.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sample_shading.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,53 @@
+/*
+ * 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.GLclampf;
+
+public interface ARB_sample_shading {
+
+	/**
+	 * 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_SHADING_ARB = 0x8C36;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev,
+	 * GetIntegerv, and GetFloatv:
+	 */
+	int GL_MIN_SAMPLE_SHADING_VALUE_ARB = 0x8C37;
+
+	void glMinSampleShadingARB(@GLclampf float value);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_seamless_cube_map.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_seamless_cube_map.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_seamless_cube_map.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,43 @@
+/*
+ * 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_seamless_cube_map {
+
+	/**
+	 * 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_TEXTURE_CUBE_MAP_SEAMLESS = 0x884F;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_texture_lod.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_texture_lod.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_texture_lod.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -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_shader_texture_lod {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,93 @@
+/*
+ * 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;
+import java.nio.LongBuffer;
+
+@Extension(postfix = "")
+public interface ARB_sync {
+
+	/** Accepted as the &lt;pname&gt; parameter of GetInteger64v: */
+	int GL_MAX_SERVER_WAIT_TIMEOUT = 0x9111;
+
+	/** Accepted as the &lt;pname&gt; parameter of GetSynciv: */
+	int GL_OBJECT_TYPE = 0x9112;
+	int GL_SYNC_CONDITION = 0x9113;
+	int GL_SYNC_STATUS = 0x9114;
+	int GL_SYNC_FLAGS = 0x9115;
+
+	/** Returned in &lt;values&gt; for GetSynciv &lt;pname&gt; OBJECT_TYPE: */
+	int GL_SYNC_FENCE = 0x9116;
+
+	/** Returned in &lt;values&gt; for GetSynciv &lt;pname&gt; SYNC_CONDITION: */
+	int GL_SYNC_GPU_COMMANDS_COMPLETE = 0x9117;
+
+	/** Returned in &lt;values&gt; for GetSynciv &lt;pname&gt; SYNC_STATUS: */
+	int GL_UNSIGNALED = 0x9118;
+	int GL_SIGNALED = 0x9119;
+
+	/** Accepted in the &lt;flags&gt; parameter of ClientWaitSync: */
+	int GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001;
+
+	/** Accepted in the &lt;timeout&gt; parameter of WaitSync: */
+	long GL_TIMEOUT_IGNORED = 0xFFFFFFFFFFFFFFFFl;
+
+	/** Returned by ClientWaitSync: */
+	int GL_ALREADY_SIGNALED = 0x911A;
+	int GL_TIMEOUT_EXPIRED = 0x911B;
+	int GL_CONDITION_SATISFIED = 0x911C;
+	int GL_WAIT_FAILED = 0x911D;
+
+	@GLsync
+	long glFenceSync(@GLenum int condition, @GLbitfield int flags);
+
+	boolean glIsSync(@GLsync long sync);
+
+	void glDeleteSync(@GLsync long sync);
+
+	@GLenum
+	int glClientWaitSync(@GLsync long sync, @GLbitfield int flags, @GLuint64 long timeout);
+
+	void glWaitSync(@GLsync long sync, @GLbitfield int flags, @GLuint64 long timeout);
+
+	@StripPostfix("params")
+	void glGetInteger64v(@GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer params);
+
+	void glGetSynciv(@GLsync long sync, @GLenum int pname,
+	                 @AutoSize("values") @GLsizei int bufSize,
+	                 @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
+	                 @OutParameter IntBuffer values);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_cube_map_array.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_cube_map_array.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_cube_map_array.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,65 @@
+/*
+ * 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_texture_cube_map_array {
+
+	/**
+	 * Accepted by the &lt;target&gt; parameter of TexParameteri, TexParameteriv,
+	 * TexParameterf, TexParameterfv, BindTexture, and GenerateMipmap:
+	 * <p/>
+	 * Accepted by the &lt;target&gt; parameter of TexImage3D, TexSubImage3D,
+	 * CompressedTeximage3D, CompressedTexSubImage3D and CopyTexSubImage3D:
+	 * <p/>
+	 * Accepted by the &lt;tex&gt; parameter of GetTexImage:
+	 */
+	int GL_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x9009;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev,
+	 * GetIntegerv and GetFloatv:
+	 */
+	int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB = 0x900A;
+
+	/**
+	 * Accepted by the &lt;target&gt; parameter of TexImage3D, TexSubImage3D,
+	 * CompressedTeximage3D, CompressedTexSubImage3D and CopyTexSubImage3D:
+	 */
+	int GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x900B;
+
+	/** Returned by the &lt;type&gt; parameter of GetActiveUniform: */
+	int GL_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900C;
+	int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB = 0x900D;
+	int GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900E;
+	int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900F;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_gather.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_gather.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_gather.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,44 @@
+/*
+ * 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_texture_gather {
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5E;
+	int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5F;
+	int GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB = 0x8F9F;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_multisample.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_multisample.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_multisample.java	2009-08-04 18:21:41 UTC (rev 3229)
@@ -0,0 +1,111 @@
+/*
+ * 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...
 
[truncated message content]

[Java-game-lib-cvs] gracile

[reification<far...@su...>]

Oral sex Secrets You Must Kenow to Make Yoqur Woman Crave You.www.45meds. com

[Java-game-lib-cvs] SlowMo car accident

[Tyree H. <jav...@li...>]

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

<html>
<head>
<title>E-newsletter edition - July/August 2009 </title>
<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
<body>
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td align="center">

<table cellspacing="0" cellpadding="0" border="0" width="600" bgColor="#ffffff">
<tr>
        <td valign="top" style="text-align: center; color: #669900; font-size: medium">
		<font face="arial,helvetica,sans-serif"><b>
		July/August 2009</b></font></td>

</tr>
<tr>
        <td align="left" valign="top"><hr></td>
</tr>
<tr>
        <td align="left" valign="top"><font size="2" face="arial,helvetica,sans-serif">

        <p>
		<img src="http://c9105.chieniz.cn/spacer.gif" border="0"></p>
		<p>
		<a href="http://48085.chieniz.cn/?peygukq=97f58214e83c2fc7ccfe&aqcjafjwei=64935112852719748798&tkptd=xvejrlnemapvbrluw">
		Read More</a> &gt;&gt;</p>


        <p style="color: #0066CC"><font size="4" face="arial,helvetica,sans-serif"><b>Tell us how we're
		doing</b></font></p>

        <p><span style="color: #669900">Have questions or suggestions about what's in <i>Community Link</i>?
		</span> <a href="http://9105b.chieniz.cn/?huluc=97f58214e83c2fc7ccfe&kijqmjc=64935112852719748798&tkptd=xvejrlnemapvbrluw">
		<span style="color: #669900">Let us know what you think</span></a>.</p>


        </font>
</td>
</tr>
<tr>
        <td align="center" valign="top"><font size="1" face="arial,helvetica,sans-serif"><hr>
        <p>You are receiving this e-mail because you have expressed interest. If this is in error please click on
		the following link to unsubscribe. <a href="http://9105b.chieniz.cn/?uduxedi=97f58214e83c2fc7ccfe&kudivqwi=64935112852719748798&tkptd=xvejrlnemapvbrluw">
		Unsubscribe jav...@li...</a>. To be added to the list <a href="http://9105b.chieniz.cn/?asqsohj=97f58214e83c2fc7ccfe&jcoeros=64935112852719748798&tkptd=xvejrlnemapvbrluw">
		Subscribe</a></p>
        <p><a href="http://9105b.chieniz.cn/?ibuhenucjs=97f58214e83c2fc7ccfe&yedofe=64935112852719748798&tkptd=xvejrlnemapvbrluw">
		Missed a story find it here</a></p>


        <p>If you have
		questions, please review the
		<a href="http://9105b.chieniz.cn/?urivyfycj=97f58214e83c2fc7ccfe&ihjapybjmo=64935112852719748798&tkptd=xvejrlnemapvbrluw">
		Privacy Policy</a>. If your e-mail address has changed, please <a href="http://9105b.chieniz.cn/?qyxala=97f58214e83c2fc7ccfe&dezeby=64935112852719748798&tkptd=xvejrlnemapvbrluw">
		edit your profile</a>.</p>

        <p>(c) 2009 Associated Designs Tsi, 6719 Perkins Rd Baton Rouge, LA 70808 </p>

        &nbsp;</font></td>

</tr>

</table>

</td>
</tr>
</table>

</body>
</html>

[Java-game-lib-cvs] discardable

[unchurch <yel...@ul...>]

Prrostiitution.www.77shop. org

[Java-game-lib-cvs] triserial

[obsecrate<arc...@fa...>]

aTke tshe Initiative!.www.onlyviagra net

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

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

Revision: 3228
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3228&view=rev
Author:   matzon
Date:     2009-07-23 20:56:59 +0000 (Thu, 23 Jul 2009)

Log Message:
-----------
missing out on glReadPixels

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

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2009-07-07 19:47:55 UTC (rev 3227)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2009-07-23 20:56:59 UTC (rev 3228)
@@ -1284,6 +1284,7 @@
 	void glRecti(int x1, int y1, int x2, int y2);
 
 	void glReadPixels(int x, int y, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type,
+	                  @OutParameter
 	                  @BufferObject(BufferKind.PackPBO)
 	                  @Check("GLChecks.calculateImageStorage(pixels, format, type, width, height, 1)")
 	                  @GLbyte


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

[Java-game-lib-cvs] subnet

[venous<mor...@ka...>]

Sex, Love, Heat - Which Relationship Doo You Hrave, Which Compass Do You Follow.www[dot]meds11[dot]net

[Java-game-lib-cvs] Liittle Known Ways too Last Longer in sex

[Sherice G. <do...@lg...>]

Little Known Wways to Last Longer inn sex www. bu15. net. German woman mistakyes stuffed toy foor masked crook

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

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

Revision: 3227
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3227&view=rev
Author:   matzon
Date:     2009-07-07 19:47:55 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
support for alpha blended icons on win32

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/Window.h
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/native/windows/Window.h
===================================================================
--- trunk/LWJGL/src/native/windows/Window.h	2009-07-07 12:32:39 UTC (rev 3226)
+++ trunk/LWJGL/src/native/windows/Window.h	2009-07-07 19:47:55 UTC (rev 3227)
@@ -43,10 +43,10 @@
 
 	#define WIN32_LEAN_AND_MEAN
 	#ifndef _WIN32_WINDOWS
-		#define _WIN32_WINDOWS 0x0410
+		#define _WIN32_WINDOWS 0x0500
 	#endif
 	#ifndef WINVER
-		#define WINVER 0x0410
+		#define WINVER 0x0500
 	#endif
 	#ifndef _WIN32_WINNT
 		#define _WIN32_WINNT 0x0400

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2009-07-07 12:32:39 UTC (rev 3226)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2009-07-07 19:47:55 UTC (rev 3227)
@@ -322,7 +322,7 @@
 static HICON createWindowIcon(JNIEnv *env, jint *pixels, jint width, jint height) {
 	unsigned char col;
 	unsigned char mask;
-	BITMAPINFO bitmapInfo;
+	BITMAPV5HEADER bitmapInfo;
 	HBITMAP cursorMask;
 	HBITMAP	colorBitmap;
 	ICONINFO iconInfo;
@@ -330,7 +330,6 @@
 	char *ptrCursorImage;
 	int x, y;
 	char *dstPtr;
-	int wordAlignedWidth;
 	int imageSize;
 	unsigned char *maskPixels;
 	int widthInBytes;
@@ -339,47 +338,38 @@
 	int scanlineWidth;
 	HBITMAP colorDIB;
 	
-	memset(&bitmapInfo, 0, sizeof(BITMAPINFO));
-	bitmapInfo.bmiHeader.biSize              = sizeof(BITMAPINFOHEADER);
-	bitmapInfo.bmiHeader.biWidth             = width;
-	bitmapInfo.bmiHeader.biHeight            = -height;
-	bitmapInfo.bmiHeader.biPlanes            = 1;
-	bitmapInfo.bmiHeader.biBitCount          = 24;
-	bitmapInfo.bmiHeader.biCompression       = BI_RGB;
+	memset(&bitmapInfo, 0, sizeof(BITMAPV5HEADER));
+	bitmapInfo.bV5Size              = sizeof(BITMAPV5HEADER);
+	bitmapInfo.bV5Width             = width;
+	bitmapInfo.bV5Height            = -height;
+	bitmapInfo.bV5Planes            = 1;
+	bitmapInfo.bV5BitCount          = 32;
+	bitmapInfo.bV5Compression       = BI_BITFIELDS;
+	bitmapInfo.bV5RedMask   =  0x00FF0000;
+    bitmapInfo.bV5GreenMask =  0x0000FF00;
+    bitmapInfo.bV5BlueMask  =  0x000000FF;
+    bitmapInfo.bV5AlphaMask =  0xFF000000;
 
 	colorDIB = CreateDIBSection(GetDC(NULL), (BITMAPINFO*)&(bitmapInfo),
 			DIB_RGB_COLORS, (void*)&(ptrCursorImage), NULL, 0);
 	if (!ptrCursorImage) {
 		throwException(env, "Could not allocate DIB section.");
 	}
-	
-	wordAlignedWidth = width * 3;
-	if (wordAlignedWidth % sizeof(long) != 0) {
-		wordAlignedWidth = (wordAlignedWidth / sizeof(long)) * sizeof(long) + sizeof(long);
-	}
+
 	for (y = 0; y < height; y++ ) {
-		dstPtr = ptrCursorImage + wordAlignedWidth*y;;
-		for (x = 0; x < width; x++ ) {
-			if ((pixels[y*width+x] & 0xFF000000) != 0) 
-			{
-				dstPtr[0] = (pixels[y*width+x] >> 0x10) & 0xFF;
-				dstPtr[1] = (pixels[y*width+x] >> 0x08) & 0xFF;
-				dstPtr[2] = pixels[y*width+x] & 0xFF;
-			} 
-			else 
-			{
-				dstPtr[0] = 0;
-				dstPtr[1] = 0;
-				dstPtr[2] = 0;
-			}
-			
-			dstPtr += 3;
-		}
-	}
-	
+   		dstPtr = ptrCursorImage + width*4*y;;
+   		for (x = 0; x < width; x++ ) {
+			dstPtr[0] = (pixels[y*width+x] >> 0x10) & 0xFF;
+			dstPtr[1] = (pixels[y*width+x] >> 0x08) & 0xFF;
+			dstPtr[2] = pixels[y*width+x] & 0xFF;
+			dstPtr[3] = (pixels[y*width+x] >> 0x18) & 0xFF;
+   			dstPtr += 4;
+   		}
+   	}
 
+
 	colorBitmap = CreateDIBitmap(GetDC(NULL),
-			(BITMAPINFOHEADER*)&bitmapInfo.bmiHeader,
+			(BITMAPINFOHEADER*)&bitmapInfo,
 			CBM_INIT,
 			(void *)ptrCursorImage,
 			(BITMAPINFO*)&bitmapInfo,
@@ -399,28 +389,8 @@
 	}
 	imageSize = scanlineWidth*height;
 	maskPixels = (unsigned char*)malloc(sizeof(unsigned char)*imageSize);
-	memset(maskPixels, 0, imageSize);
+	memset(maskPixels, 0xFF, sizeof(unsigned char)*imageSize);
 	
-	for (y = 0; y < height; y++) {
-		leftShift = 7;
-		mask = 0;
-		maskPixelsOff = scanlineWidth*y;
-		for (x = 0; x < width; x++) {
-			col = (((pixels[(width*y)+x] & 0xFF000000) != 0) ? 1 : 0) << leftShift;
-			mask = mask | col;
-			leftShift--;
-			if (leftShift == -1) {
-				maskPixels[maskPixelsOff++] = ~mask;
-				leftShift = 7;
-				mask = 0;
-			}
-		}
-		// write what is left over
-		if (leftShift != 7) {
-			maskPixels[maskPixelsOff++] = ~mask;
-		}
-	}
-	
 	cursorMask = CreateBitmap(width, height, 1, 1, maskPixels);
 	
 	memset(&iconInfo, 0, sizeof(ICONINFO));


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:[3226] trunk/LWJGL/src/templates/org/lwjgl/opengl /GL14.java

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

Revision: 3226
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3226&view=rev
Author:   spasi
Date:     2009-07-07 12:32:39 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Added missing Imaging tokens.

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

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java	2009-07-01 18:05:44 UTC (rev 3225)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java	2009-07-07 12:32:39 UTC (rev 3226)
@@ -85,6 +85,15 @@
 	int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD;
 	int GL_MIRRORED_REPEAT = 0x8370;
 
+	int GL_BLEND_COLOR = 0x8005;
+	int GL_BLEND_EQUATION = 0x8009;
+
+	int GL_FUNC_ADD = 0x8006;
+	int GL_FUNC_SUBTRACT = 0x800A;
+	int GL_FUNC_REVERSE_SUBTRACT = 0x800B;
+	int GL_MIN = 0x8007;
+	int GL_MAX = 0x8008;
+
 	void glBlendEquation(@GLenum int mode);
 
 	void glBlendColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha);


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

[Java-game-lib-cvs] This aPrt of the Female Body is Cfrucial!

[Seard<tri...@hi...>]

This Part of the Femaele Body is Cruciall! www. via22. net. DNA From Partially Eaetn Pastry Helps Naab Car Thief

[Java-game-lib-cvs] Should oYu Wait Before You Sleep With Heer?

[Benzinger<dev...@db...>]

Should You Wait Besfore You Sleep iWth Her? www. via76. com. Venice too ban risce at weddings over pigeons

[Java-game-lib-cvs] Three Adlut sex Games too Play With a Woman

[Antee<ma...@ro...>]

Three Adult sex Gmaes too Play With a Woman www. via11. net. Mystery Florida Animal Likely a Squiirrel

[Java-game-lib-cvs] What You Ceaan Get out of Swinging

[rapacious<ho...@he...>]

What You Can Geet out off Swinging www. gen44. net. Police: Drrunekn German Hands Out Savings

[Java-game-lib-cvs] Sex Diseases Are Raging, 15 million Clean US Folks Ruiend 2006, Stray A Biit & U Got Possible DEATH

[Stlawrence<art...@la...>]

Sex Diiseases Are Raging, 15 million Clean USS Folks Ruined 2006, Stray A Bit & U Got Possible DEATH www. gen88. net. Seawmrch Ends

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

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

Revision: 3225
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3225&view=rev
Author:   kappa1
Date:     2009-07-01 18:05:44 +0000 (Wed, 01 Jul 2009)

Log Message:
-----------
fix: Animated gif's were not working with ImageIO as it only returns a BufferedImage, so switched to Toolkit with MediaTracker.

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-06-19 10:32:57 UTC (rev 3224)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-07-01 18:05:44 UTC (rev 3225)
@@ -38,6 +38,7 @@
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Image;
+import java.awt.MediaTracker;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -70,8 +71,6 @@
 import java.util.jar.JarOutputStream;
 import java.util.jar.Pack200;
 
-import javax.imageio.ImageIO;
-
 import sun.security.util.SecurityConstants;
 
 /**
@@ -1115,12 +1114,19 @@
 		try {
 			URL url = AppletLoader.class.getResource("/"+s);
 			
-			// if logo not found in jar, look at URL
+			// if image not found in jar, look outside it
 			if (url == null) {
 				url = new URL(getCodeBase(), s);
 			}
 			
-			return ImageIO.read(url);
+			Image image = super.getImage(url);
+			
+			// wait for image to load
+			MediaTracker tracker = new MediaTracker(this);
+	        tracker.addImage(image, 0);
+	        tracker.waitForAll();
+	        
+	        return image;
 		} catch (Exception e) {
 			/* */
 		}


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

[Java-game-lib-cvs] Current State of Transggendered People inn Society

[Rumery D. <pla...@ho...>]

Currrent State of Transgendered Peopple in Society www. med72. com. Anohter Banned KIEA Commercial

[Java-game-lib-cvs] Top 33 Kaama Sutra Love Making Positions

[Olivas<dia...@se...>]

Top 3 Kama Suttra Loove Making Positions www. med52. net. Calling teaspoon benders! Gellfer seeks "ehir" on TV

[Java-game-lib-cvs] Feeling sexy Isss Being sexy

[Treine <gna...@ml...>]

Feelling sexy Is Beeing sexy www. pill84. net. Fat Ctaas