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

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

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

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

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

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java	2009-03-27 12:56:14 UTC (rev 3193)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+import org.lwjgl.util.generator.GLintptr;
+import org.lwjgl.util.generator.GLsizeiptr;
+
+public interface ARB_copy_buffer {
+
+	/**
+	 * Accepted by the target parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+	 * GetBufferPointerv, MapBufferRange, FlushMappedBufferRange,
+	 * GetBufferParameteriv, BindBufferRange, BindBufferBase,
+	 * and CopyBufferSubData:
+	 */
+	int GL_COPY_READ_BUFFER = 0x8F36;
+	int GL_COPY_WRITE_BUFFER = 0x8F37;
+
+	void glCopyBufferSubData(@GLenum int readTarget, @GLenum int writeTarget,
+	                         @GLintptr long readOffset, @GLintptr long writeOffset,
+	                         @GLsizeiptr long size);
+
+}
\ No newline at end of file

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


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

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

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

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

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


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

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

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

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

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

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

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

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

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

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


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


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

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

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java	2009-03-26 11:08:43 UTC (rev 3191)
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.IntBuffer;
+
+@Extension(postfix = "")
+public interface ARB_framebuffer_object {
+
+	/**
+	 * Accepted by the <target> parameter of BindFramebuffer,
+	 * CheckFramebufferStatus, FramebufferTexture{1D|2D|3D},
+	 * FramebufferRenderbuffer, and
+	 * GetFramebufferAttachmentParameteriv:
+	 */
+	int GL_FRAMEBUFFER = 0x8D40;
+	int GL_READ_FRAMEBUFFER = 0x8CA8;
+	int GL_DRAW_FRAMEBUFFER = 0x8CA9;
+
+	/**
+	 * Accepted by the <target> parameter of BindRenderbuffer,
+	 * RenderbufferStorage, and GetRenderbufferParameteriv, and
+	 * returned by GetFramebufferAttachmentParameteriv:
+	 */
+	int GL_RENDERBUFFER = 0x8D41;
+
+	/**
+	 * Accepted by the <internalformat> parameter of
+	 * RenderbufferStorage:
+	 */
+	int GL_STENCIL_INDEX1 = 0x8D46;
+	int GL_STENCIL_INDEX4 = 0x8D47;
+	int GL_STENCIL_INDEX8 = 0x8D48;
+	int GL_STENCIL_INDEX16 = 0x8D49;
+
+	/** Accepted by the <pname> parameter of GetRenderbufferParameteriv: */
+	int GL_RENDERBUFFER_WIDTH = 0x8D42;
+	int GL_RENDERBUFFER_HEIGHT = 0x8D43;
+	int GL_RENDERBUFFER_INTERNAL_FORMAT = 0x8D44;
+	int GL_RENDERBUFFER_RED_SIZE = 0x8D50;
+	int GL_RENDERBUFFER_GREEN_SIZE = 0x8D51;
+	int GL_RENDERBUFFER_BLUE_SIZE = 0x8D52;
+	int GL_RENDERBUFFER_ALPHA_SIZE = 0x8D53;
+	int GL_RENDERBUFFER_DEPTH_SIZE = 0x8D54;
+	int GL_RENDERBUFFER_STENCIL_SIZE = 0x8D55;
+	int GL_RENDERBUFFER_SAMPLES = 0x8CAB;
+
+	/**
+	 * Accepted by the <pname> parameter of
+	 * GetFramebufferAttachmentParameteriv:
+	 */
+	int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = 0x8CD0;
+	int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 0x8CD1;
+	int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 0x8CD2;
+	int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
+	int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER = 0x8CD4;
+	int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING = 0x8210;
+	int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE = 0x8211;
+	int GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE = 0x8212;
+	int GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE = 0x8213;
+	int GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE = 0x8214;
+	int GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE = 0x8215;
+	int GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE = 0x8216;
+	int GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE = 0x8217;
+
+	/** Returned in <params> by GetFramebufferAttachmentParameteriv: */
+	int GL_SRGB = 0x8C40;
+	int GL_UNSIGNED_NORMALIZED = 0x8C17;
+	int GL_FRAMEBUFFER_DEFAULT = 0x8218;
+	int GL_INDEX = 0x8222;
+
+	/**
+	 * Accepted by the <attachment> parameter of
+	 * FramebufferTexture{1D|2D|3D}, FramebufferRenderbuffer, and
+	 * GetFramebufferAttachmentParameteriv
+	 */
+	int GL_COLOR_ATTACHMENT0 = 0x8CE0;
+	int GL_COLOR_ATTACHMENT1 = 0x8CE1;
+	int GL_COLOR_ATTACHMENT2 = 0x8CE2;
+	int GL_COLOR_ATTACHMENT3 = 0x8CE3;
+	int GL_COLOR_ATTACHMENT4 = 0x8CE4;
+	int GL_COLOR_ATTACHMENT5 = 0x8CE5;
+	int GL_COLOR_ATTACHMENT6 = 0x8CE6;
+	int GL_COLOR_ATTACHMENT7 = 0x8CE7;
+	int GL_COLOR_ATTACHMENT8 = 0x8CE8;
+	int GL_COLOR_ATTACHMENT9 = 0x8CE9;
+	int GL_COLOR_ATTACHMENT10 = 0x8CEA;
+	int GL_COLOR_ATTACHMENT11 = 0x8CEB;
+	int GL_COLOR_ATTACHMENT12 = 0x8CEC;
+	int GL_COLOR_ATTACHMENT13 = 0x8CED;
+	int GL_COLOR_ATTACHMENT14 = 0x8CEE;
+	int GL_COLOR_ATTACHMENT15 = 0x8CEF;
+	int GL_DEPTH_ATTACHMENT = 0x8D00;
+	int GL_STENCIL_ATTACHMENT = 0x8D20;
+	int GL_DEPTH_STENCIL_ATTACHMENT = 0x821A;
+
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_MAX_SAMPLES = 0x8D57;
+
+	/** Returned by CheckFramebufferStatus(): */
+	int GL_FRAMEBUFFER_COMPLETE = 0x8CD5;
+	int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 0x8CD6;
+	int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
+	int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = 0x8CDB;
+	int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER = 0x8CDC;
+	int GL_FRAMEBUFFER_UNSUPPORTED = 0x8CDD;
+	int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 0x8D56;
+	int GL_FRAMEBUFFER_UNDEFINED = 0x8219;
+
+	/**
+	 * Accepted by the <pname> parameters of GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
+	int GL_FRAMEBUFFER_BINDING = 0x8CA6; // alias DRAW_FRAMEBUFFER_BINDING
+	int GL_DRAW_FRAMEBUFFER_BINDING = 0x8CA6;
+	int GL_READ_FRAMEBUFFER_BINDING = 0x8CAA;
+	int GL_RENDERBUFFER_BINDING = 0x8CA7;
+	int GL_MAX_COLOR_ATTACHMENTS = 0x8CDF;
+	int GL_MAX_RENDERBUFFER_SIZE = 0x84E8;
+
+	/** Returned by GetError(): */
+	int GL_INVALID_FRAMEBUFFER_OPERATION = 0x0506;
+
+	/**
+	 * Accepted by the <format> parameter of DrawPixels, ReadPixels,
+	 * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D,
+	 * TexSubImage3D, and GetTexImage, by the <type> parameter of
+	 * CopyPixels, by the <internalformat> parameter of TexImage1D,
+	 * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and
+	 * RenderbufferStorage, and returned in the <data> parameter of
+	 * GetTexLevelParameter and GetRenderbufferParameteriv:
+	 */
+	int GL_DEPTH_STENCIL = 0x84F9;
+
+	/**
+	 * Accepted by the <type> parameter of DrawPixels, ReadPixels,
+	 * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D,
+	 * TexSubImage3D, and GetTexImage:
+	 */
+	int GL_UNSIGNED_INT_24_8 = 0x84FA;
+
+	/**
+	 * Accepted by the <internalformat> parameter of TexImage1D,
+	 * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and
+	 * RenderbufferStorage, and returned in the <data> parameter of
+	 * GetTexLevelParameter and GetRenderbufferParameteriv:
+	 */
+	int GL_DEPTH24_STENCIL8 = 0x88F0;
+
+	/** Accepted by the <value> parameter of GetTexLevelParameter: */
+	int GL_TEXTURE_STENCIL_SIZE = 0x88F1;
+
+	boolean glIsRenderbuffer(@GLuint int renderbuffer);
+
+	void glBindRenderbuffer(@GLenum int target, @GLuint int renderbuffer);
+
+	void glDeleteRenderbuffers(@AutoSize("renderbuffers") @GLsizei int n, @Const @GLuint IntBuffer renderbuffers);
+
+	void glGenRenderbuffers(@AutoSize("renderbuffers") @GLsizei int n, @OutParameter @GLuint IntBuffer renderbuffers);
+
+	void glRenderbufferStorage(@GLenum int target, @GLenum int internalformat,
+	                           @GLsizei int width, @GLsizei int height);
+
+	void glRenderbufferStorageMultisample(@GLenum int target, @GLsizei int samples,
+	                                      @GLenum int internalformat,
+	                                      @GLsizei int width, @GLsizei int height);
+
+	@StripPostfix("params")
+	void glGetRenderbufferParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @OutParameter IntBuffer params);
+
+	boolean glIsFramebuffer(@GLuint int framebuffer);
+
+	void glBindFramebuffer(@GLenum int target, @GLuint int framebuffer);
+
+	void glDeleteFramebuffers(@AutoSize("framebuffers") @GLsizei int n, @Const @GLuint IntBuffer framebuffers);
+
+	void glGenFramebuffers(@AutoSize("framebuffers") @GLsizei int n, @OutParameter @GLuint IntBuffer framebuffers);
+
+	@GLenum
+	int glCheckFramebufferStatus(@GLenum int target);
+
+	void glFramebufferTexture1D(@GLenum int target, @GLenum int attachment,
+	                            @GLenum int textarget, @GLuint int texture, int level);
+
+	void glFramebufferTexture2D(@GLenum int target, @GLenum int attachment,
+	                            @GLenum int textarget, @GLuint int texture, int level);
+
+	void glFramebufferTexture3D(@GLenum int target, @GLenum int attachment,
+	                            @GLenum int textarget, @GLuint int texture,
+	                            int level, int layer);
+
+	void glFramebufferTextureLayer(@GLenum int target, @GLenum int attachment,
+	                               @GLuint int texture, int level, int layer);
+
+	void glFramebufferRenderbuffer(@GLenum int target, @GLenum int attachment,
+	                               @GLenum int renderbuffertarget, @GLuint int renderbuffer);
+
+	@StripPostfix("params")
+	void glGetFramebufferAttachmentParameteriv(@GLenum int target, @GLenum int attachment,
+	                                           @GLenum int pname, @Check("4") @OutParameter IntBuffer params);
+
+	void glBlitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1,
+	                       int dstX0, int dstY0, int dstX1, int dstY1,
+	                       @GLbitfield int mask, @GLenum int filter);
+
+	void glGenerateMipmap(@GLenum int target);
+
+}
\ No newline at end of file

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

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


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

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

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

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

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

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


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


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

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+public interface AMD_performance_monitor {
+
+	/** Accepted by the &lt;pame&gt; parameter of GetPerfMonitorCounterInfoAMD */
+	int GL_COUNTER_TYPE_AMD = 0x8BC0;
+	int GL_COUNTER_RANGE_AMD = 0x8BC1;
+
+	/**
+	 * Returned as a valid value in &lt;data&gt; parameter of
+	 * GetPerfMonitorCounterInfoAMD if &lt;pname&gt; = COUNTER_TYPE_AMD
+	 */
+	int GL_UNSIGNED_INT = 0x1405;
+	int GL_FLOAT = 0x1406;
+	int GL_UNSIGNED_INT64_AMD = 0x8BC2;
+	int GL_PERCENTAGE_AMD = 0x8BC3;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetPerfMonitorCounterDataAMD */
+
+	int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4;
+	int GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5;
+	int GL_PERFMON_RESULT_AMD = 0x8BC6;
+
+	void glGetPerfMonitorGroupsAMD(@OutParameter @Check(value = "1", canBeNull = true) @GLint IntBuffer numGroups,
+	                               @AutoSize("groups") @GLsizei int groupsSize, @GLuint IntBuffer groups);
+
+	void glGetPerfMonitorCountersAMD(@GLuint int group,
+	                                 @OutParameter @Check(value = "1") @GLint IntBuffer numCounters,
+	                                 @OutParameter @Check(value = "1") @GLint IntBuffer maxActiveCounters,
+	                                 @AutoSize("counters") @GLsizei int countersSize,
+	                                 @GLuint IntBuffer counters);
+
+	void glGetPerfMonitorGroupStringAMD(@GLuint int group,
+	                                    @AutoSize("groupString") @GLsizei int bufSize,
+	                                    @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                                    @GLchar ByteBuffer groupString);
+
+	void glGetPerfMonitorCounterStringAMD(@GLuint int group, @GLuint int counter,
+	                                      @AutoSize("counterString") @GLsizei int bufSize,
+	                                      @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                                      @GLchar ByteBuffer counterString);
+
+	void glGetPerfMonitorCounterInfoAMD(@GLuint int group, @GLuint int counter, @GLenum int pname, @Check(value = "16") @GLvoid ByteBuffer data);
+
+	void glGenPerfMonitorsAMD(@AutoSize("monitors") @GLsizei int n, @OutParameter @GLuint IntBuffer monitors);
+
+	void glDeletePerfMonitorsAMD(@AutoSize("monitors") @GLsizei int n, @GLuint IntBuffer monitors);
+
+	void glSelectPerfMonitorCountersAMD(@GLuint int monitor, boolean enable, @GLuint int group, @AutoSize("counterList")int numCounters, @GLuint IntBuffer counterList);
+
+	void glBeginPerfMonitorAMD(@GLuint int monitor);
+
+	void glEndPerfMonitorAMD(@GLuint int monitor);
+
+	void glGetPerfMonitorCounterDataAMD(@GLuint int monitor, @GLenum int pname,
+	                                    @AutoSize("data") @GLsizei int dataSize, @GLuint IntBuffer data,
+	                                    @OutParameter @Check(value = "1", canBeNull = true) @GLint IntBuffer bytesWritten);
+
+}
\ No newline at end of file

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

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_tesselator.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+
+public interface AMD_vertex_shader_tesselator {
+
+	/** Returned by the &lt;type&gt; parameter of GetActiveUniform: */
+	int GL_SAMPLER_BUFFER_AMD = 0x9001;
+	int GL_INT_SAMPLER_BUFFER_AMD = 0x9002;
+	int GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD = 0x9003;
+
+	/** Accepted by TessellationModeAMD */
+	int GL_DISCRETE_AMD = 0x9006;
+	int GL_CONTINUOUS_AMD = 0x9007;
+
+	/** Accepted by GetIntegerv */
+	int GL_TESSELLATION_MODE_AMD = 0x9004;
+
+	/** Accepted by GetFloatv */
+	int GL_TESSELLATION_FACTOR_AMD = 0x9005;
+
+	void glTessellationFactorAMD(float factor);
+
+	void glTessellationModeAMD(@GLenum int mode);
+
+}
\ No newline at end of file

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

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+public interface ARB_uniform_buffer_object {
+
+	/**
+	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, and
+	 * GetBufferPointerv:
+	 */
+	int GL_UNIFORM_BUFFER_ARB = 0x8A11;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetIntegeri_v, GetBooleanv,
+	 * GetIntegerv, GetFloatv, and GetDoublev:
+	 */
+	int GL_UNIFORM_BUFFER_BINDING_ARB = 0x8A28;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetIntegeri_v: */
+	int GL_UNIFORM_BUFFER_START_ARB = 0x8A29;
+	int GL_UNIFORM_BUFFER_SIZE_ARB = 0x8A2A;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_MAX_VERTEX_UNIFORM_BLOCKS_ARB = 0x8A2B;
+	int GL_MAX_GEOMETRY_UNIFORM_BLOCKS_ARB = 0x8A2C;
+	int GL_MAX_FRAGMENT_UNIFORM_BLOCKS_ARB = 0x8A2D;
+	int GL_MAX_COMBINED_UNIFORM_BLOCKS_ARB = 0x8A2E;
+	int GL_MAX_UNIFORM_BUFFER_BINDINGS_ARB = 0x8A2F;
+	int GL_MAX_UNIFORM_BLOCK_SIZE_ARB = 0x8A30;
+	int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8A31;
+	int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_ARB = 0x8A32;
+	int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8A33;
+	int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT_ARB = 0x8A34;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetProgramiv: */
+	int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH_ARB = 0x8A35;
+	int GL_ACTIVE_UNIFORM_BLOCKS_ARB = 0x8A36;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetActiveUniformsivARB: */
+	int GL_UNIFORM_TYPE_ARB = 0x8A37;
+	int GL_UNIFORM_SIZE_ARB = 0x8A38;
+	int GL_UNIFORM_NAME_LENGTH_ARB = 0x8A39;
+	int GL_UNIFORM_BLOCK_INDEX_ARB = 0x8A3A;
+	int GL_UNIFORM_OFFSET_ARB = 0x8A3B;
+	int GL_UNIFORM_ARRAY_STRIDE_ARB = 0x8A3C;
+	int GL_UNIFORM_MATRIX_STRIDE_ARB = 0x8A3D;
+	int GL_UNIFORM_IS_ROW_MAJOR_ARB = 0x8A3E;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetActiveUniformBlockivARB: */
+	int GL_UNIFORM_BLOCK_BINDING_ARB = 0x8A3F;
+	int GL_UNIFORM_BLOCK_DATA_SIZE_ARB = 0x8A40;
+	int GL_UNIFORM_BLOCK_NAME_LENGTH_ARB = 0x8A41;
+	int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS_ARB = 0x8A42;
+	int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES_ARB = 0x8A43;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER_ARB = 0x8A44;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER_ARB = 0x8A45;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER_ARB = 0x8A46;
+
+	/** Returned by GetActiveUniformsivARB and GetUniformBlockIndexARB */
+	int GL_INVALID_INDEX_ARB = 0xFFFFFFFF; // TODO: Check if this is correct
+
+	void glGetUniformIndicesARB(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+	                            @Const @NullTerminated @GLchar ByteBuffer uniformNames,
+	                            @OutParameter @GLuint IntBuffer uniformIndices);
+
+	@StripPostfix("params")
+	void glGetActiveUniformsivARB(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+	                              @Const @GLuint IntBuffer uniformIndices,
+	                              @GLenum int pname,
+	                              @Check(value = "1") @GLint IntBuffer params); // TODO: We need to AutoSize "params" using "uniformCount"
+
+	void glGetActiveUniformNameARB(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
+	                               @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                               @GLchar ByteBuffer uniformName);
+
+	@GLuint
+	int glGetUniformBlockIndexARB(@GLuint int program, @Const @NullTerminated @GLchar ByteBuffer uniformBlockName);
+
+	@StripPostfix("params")
+	void glGetActiveUniformBlockivARB(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
+	                                  @OutParameter @Check(value = "16") @GLint IntBuffer params);
+
+	void glGetActiveUniformBlockNameARB(@GLuint int program, @GLuint int uniformBlockIndex, @AutoSize("uniformBlockName") @GLsizei int bufSize,
+	                                    @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                                    @GLchar ByteBuffer uniformBlockName);
+
+	void glBindBufferRange(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset, @GLsizeiptr long size);
+
+	void glBindBufferBase(@GLenum int target, @GLuint int index, @GLuint int buffer);
+
+	void glGetIntegeri_v(@GLenum int value, @GLuint int index, @OutParameter @Check("4")IntBuffer data);
+
+	void glUniformBlockBindingARB(@GLuint int program, @GLuint int uniformBlockIndex, @GLuint int uniformBlockBinding);
+
+}
\ No newline at end of file

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

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

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_provoking_vertex.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_provoking_vertex.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_provoking_vertex.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+
+public interface EXT_provoking_vertex {
+
+	/** Accepted by the &lt;mode&gt; parameter of ProvokingVertexEXT: */
+	int GL_FIRST_VERTEX_CONVENTION_EXT = 0x8E4D;
+	int GL_LAST_VERTEX_CONVENTION_EXT = 0x8E4E;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_PROVOKING_VERTEX_EXT = 0x8E4F;
+	int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT = 0x8E4C;
+
+	void glProvokingVertexEXT(@GLenum int mode);
+
+}
\ No newline at end of file

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

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

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+public interface GL31 {
+
+	// ----------------------------------------------------------
+	// ----------------------[ OpenGL 3.1 ]----------------------
+	// ----------------------------------------------------------
+
+	int GL_RED_SNORM = 0x8F90;
+	int GL_RG_SNORM = 0x8F91;
+	int GL_RGB_SNORM = 0x8F92;
+	int GL_RGBA_SNORM = 0x8F93;
+	int GL_R8_SNORM = 0x8F94;
+	int GL_RG8_SNORM = 0x8F95;
+	int GL_RGB8_SNORM = 0x8F96;
+	int GL_RGBA8_SNORM = 0x8F97;
+	int GL_R16_SNORM = 0x8F98;
+	int GL_RG16_SNORM = 0x8F99;
+	int GL_RGB16_SNORM = 0x8F9A;
+	int GL_RGBA16_SNORM = 0x8F9B;
+	int GL_SIGNED_NORMALIZED = 0x8F9C;
+
+	// ------------------------------------------------------------------
+	// ----------------------[ ARB_draw_instanced ]----------------------
+	// ------------------------------------------------------------------
+
+	void glDrawArraysInstanced(@GLenum int mode, int first, @GLsizei int count, @GLsizei int primcount);
+
+	void glDrawElementsInstanced(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
+	                                @BufferObject(BufferKind.ElementVBO)
+	                                @Const
+	                                @GLubyte
+	                                @GLushort
+	                                @GLuint Buffer indices, @GLsizei int primcount);
+
+	// ---------------------------------------------------------------
+	// ----------------------[ EXT_copy_buffer ]----------------------
+	// ---------------------------------------------------------------
+
+	int GL_COPY_READ_BUFFER = 0x0; // TODO: Find this value
+	int GL_COPY_WRITE_BUFFER = 0x0; // TODO: Find this value
+
+	void glCopyBufferSubData(@GLenum int readtarget, @GLenum int writetarget, @GLintptr long readoffset, @GLintptr long writeoffset, @GLsizeiptr long size);
+
+	// --------------------------------------------------------------------
+	// ----------------------[ NV_primitive_restart ]----------------------
+	// --------------------------------------------------------------------
+
+	/**
+	 * Accepted by the &lt;cap&gt; parameter of IsEnabled, and by
+	 * the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev:
+	 */
+	int GL_PRIMITIVE_RESTART = 0x8F9D;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_PRIMITIVE_RESTART_INDEX = 0x8F9E;
+
+	void glPrimitiveRestart();
+
+	void glPrimitiveRestartIndex(@GLuint int index);
+
+	// -------------------------------------------------------------------------
+	// ----------------------[ ARB_texture_buffer_object ]----------------------
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Accepted by the &lt;target&gt; parameter of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, MapBufferRange, BindTexture, UnmapBuffer,
+	 * GetBufferSubData, GetBufferParameteriv, GetBufferPointerv, and TexBuffer,
+	 * and the <pname> parameter of GetBooleanv, GetDoublev, GetFloatv, and
+	 * GetIntegerv:
+	 */
+	int GL_TEXTURE_BUFFER = 0x8C2A;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameters of GetBooleanv, GetDoublev,
+	 * GetFloatv, and GetIntegerv:
+	 */
+	int GL_MAX_TEXTURE_BUFFER_SIZE = 0x8C2B;
+	int GL_TEXTURE_BINDING_BUFFER = 0x8C2C;
+	int GL_TEXTURE_BUFFER_DATA_STORE_BINDING = 0x8C2D;
+	int GL_TEXTURE_BUFFER_FORMAT = 0x8C2E;
+
+	void glTexBuffer(@GLenum int target, @GLenum int internalformat, @GLuint int buffer);
+
+	// ---------------------------------------------------------------------
+	// ----------------------[ ARB_texture_rectangle ]----------------------
+	// ---------------------------------------------------------------------
+
+	/**
+	 * Accepted by the &lt;cap&gt; parameter of Enable, Disable and IsEnabled;
+	 * by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv
+	 * and GetDoublev; and by the &lt;target&gt; parameter of BindTexture,
+	 * GetTexParameterfv, GetTexParameteriv, TexParameterf, TexParameteri,
+	 * TexParameterfv and TexParameteriv:
+	 * Accepted by the &lt;target&gt; parameter of GetTexImage,
+	 * GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D,
+	 * CopyTexImage2D, TexSubImage2D and CopySubTexImage2D:
+	 */
+	int GL_TEXTURE_RECTANGLE = 0x84F5;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv and GetDoublev:
+	 */
+	int GL_TEXTURE_BINDING_RECTANGLE = 0x84F6;
+
+	/**
+	 * Accepted by the &lt;target&gt; parameter of GetTexLevelParameteriv,
+	 * GetTexLevelParameterfv, GetTexParameteriv and TexImage2D:
+	 */
+	int GL_PROXY_TEXTURE_RECTANGLE = 0x84F7;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev,
+	 * GetIntegerv and GetFloatv:
+	 */
+	int GL_MAX_RECTANGLE_TEXTURE_SIZE = 0x84F8;
+
+	/**
+	 * Returned by &lt;type&gt; parameter of GetActiveUniform when the location
+	 * &lt;index&gt; for program object &lt;program&gt; is of type sampler2DRect:
+	 */
+	int GL_SAMPLER_2D_RECT = 0x8B63;
+
+	/**
+	 * Returned by &lt;type&gt; parameter of GetActiveUniform when the location
+	 * &lt;index&gt; for program object &lt;program&gt; is of type sampler2DRectShadow:
+	 */
+	int GL_SAMPLER_2D_RECT_SHADOW = 0x8B64;
+
+	// -------------------------------------------------------------------------
+	// ----------------------[ ARB_uniform_buffer_object ]----------------------
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, and
+	 * GetBufferPointerv:
+	 */
+	int GL_UNIFORM_BUFFER = 0x8A11;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetIntegeri_v, GetBooleanv,
+	 * GetIntegerv, GetFloatv, and GetDoublev:
+	 */
+	int GL_UNIFORM_BUFFER_BINDING = 0x8A28;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetIntegeri_v: */
+	int GL_UNIFORM_BUFFER_START = 0x8A29;
+	int GL_UNIFORM_BUFFER_SIZE = 0x8A2A;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
+	int GL_MAX_VERTEX_UNIFORM_BLOCKS = 0x8A2B;
+	int GL_MAX_GEOMETRY_UNIFORM_BLOCKS = 0x8A2C;
+	int GL_MAX_FRAGMENT_UNIFORM_BLOCKS = 0x8A2D;
+	int GL_MAX_COMBINED_UNIFORM_BLOCKS = 0x8A2E;
+	int GL_MAX_UNIFORM_BUFFER_BINDINGS = 0x8A2F;
+	int GL_MAX_UNIFORM_BLOCK_SIZE = 0x8A30;
+	int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS = 0x8A31;
+	int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS = 0x8A32;
+	int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS = 0x8A33;
+	int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT = 0x8A34;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetProgramiv: */
+	int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35;
+	int GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetActiveUniformsiv: */
+	int GL_UNIFORM_TYPE = 0x8A37;
+	int GL_UNIFORM_SIZE = 0x8A38;
+	int GL_UNIFORM_NAME_LENGTH = 0x8A39;
+	int GL_UNIFORM_BLOCK_INDEX = 0x8A3A;
+	int GL_UNIFORM_OFFSET = 0x8A3B;
+	int GL_UNIFORM_ARRAY_STRIDE = 0x8A3C;
+	int GL_UNIFORM_MATRIX_STRIDE = 0x8A3D;
+	int GL_UNIFORM_IS_ROW_MAJOR = 0x8A3E;
+
+	/** Accepted by the &lt;pname&gt; parameter of GetActiveUniformBlockiv: */
+	int GL_UNIFORM_BLOCK_BINDING = 0x8A3F;
+	int GL_UNIFORM_BLOCK_DATA_SIZE = 0x8A40;
+	int GL_UNIFORM_BLOCK_NAME_LENGTH = 0x8A41;
+	int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42;
+	int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER = 0x8A45;
+	int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
+
+	/** Returned by GetActiveUniformsiv and GetUniformBlockIndex */
+	int GL_INVALID_INDEX = 0xFFFFFFFF; // TODO: Check if this is correct
+
+	void glGetUniformIndices(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+	                            @Const @NullTerminated @GLchar ByteBuffer uniformNames,
+	                            @OutParameter @GLuint IntBuffer uniformIndices);
+
+	@StripPostfix("params")
+	void glGetActiveUniformsiv(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+	                              @Const @GLuint IntBuffer uniformIndices,
+	                              @GLenum int pname,
+	                              @Check(value = "1") @GLint IntBuffer params); // TODO: We need to AutoSize "params" using "uniformCount"
+
+	void glGetActiveUniformName(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
+	                               @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                               @GLchar ByteBuffer uniformName);
+
+	@GLuint
+	int glGetUniformBlockIndex(@GLuint int program, @Const @NullTerminated @GLchar ByteBuffer uniformBlockName);
+
+	@StripPostfix("params")
+	void glGetActiveUniformBlockiv(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
+	                                  @OutParameter @Check(value = "16") @GLint IntBuffer params);
+
+	void glGetActiveUniformBlockName(@GLuint int program, @GLuint int uniformBlockIndex, @AutoSize("uniformBlockName") @GLsizei int bufSize,
+	                                    @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+	                                    @GLchar ByteBuffer uniformBlockName);
+
+	void glUniformBlockBinding(@GLuint int program, @GLuint int uniformBlockIndex, @GLuint int uniformBlockBinding);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_explicit_multisample.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.*;
+
+public interface NV_explicit_multisample {
+
+	/** Accepted by the &lt;pname&gt; parameter of GetMultisamplefvNV: */
+	int GL_SAMPLE_POSITION_NV = 0x8E50;
+
+	/**
+	 * Accepted by the &lt;cap&gt; parameter of Enable, Disable, and IsEnabled, and by
+	 * the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev:
+	 */
+
+	int GL_SAMPLE_MASK_NV = 0x8E51;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanIndexedvEXT and
+	 * GetIntegerIndexedvEXT:
+	 */
+
+	int GL_SAMPLE_MASK_VALUE_NV = 0x8E52;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv,
+	 * and GetFloatv:
+	 */
+
+	int GL_TEXTURE_BINDING_RENDERBUFFER_NV = 0x8E53;
+	int GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV = 0x8E54;
+	int GL_MAX_SAMPLE_MASK_WORDS_NV = 0x8E59;
+
+	/** Accepted by the &lt;target&gt; parameter of BindTexture, and TexRenderbufferNV: */
+
+	int GL_TEXTURE_RENDERBUFFER_NV = 0x8E55;
+
+	/** Returned by the &lt;type&gt; parameter of GetActiveUniform: */
+	int GL_SAMPLER_RENDERBUFFER_NV = 0x8E56;
+	int GL_INT_SAMPLER_RENDERBUFFER_NV = 0x8E57;
+	int GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV = 0x8E58;
+
+	void glGetBooleanIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") @GLboolean ByteBuffer data);
+
+	void glGetIntegerIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") IntBuffer data);
+
+	@StripPostfix("val")
+	void glGetMultisamplefvNV(@GLenum int pname, @GLuint int index, @OutParameter @Check("2") FloatBuffer val);
+
+	void glSampleMaskIndexedNV(@GLuint int index, @GLbitfield int mask);
+
+	void glTexRenderbufferNV(@GLenum int target, @GLuint int renderbuffer);
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback2.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback2.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback2.java	2009-03-25 17:43:56 UTC (rev 3190)
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.IntBuffer;
+
+public interface NV_transform_feedback2 {
+
+	/** Accepted by the &lt;target&gt; parameter of BindTransformFeedbackNV: */
+
+	int GL_TRANSFORM_FEEDBACK_NV = 0x8E22;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv,
+	 * and GetFloatv:
+	 */
+	int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV = 0x8E23;
+	int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV = 0x8E24;
+	int GL_TRANSFORM_FEEDBACK_BINDING_NV = 0x8E25;
+
+	void glBindTransformFeedbackNV(@GLenum int target, @GLuint int id);
+
+	void glDeleteTransformFeedbacksNV(@AutoSize("ids") @GLsizei int n, @Const @GLuint IntBuffer ids);
+
+	void glGenTransformFeedbacksNV(@AutoSize("ids") @GLsizei int n, @OutParameter @GLuint IntBuffer ids);
+
+	boolean glIsTransformFeedbackNV(@GLuint int id);
+
+	void glPauseTransformFeedbackNV();
+
+	void glResumeTransformFeedbackNV();
+
+	void glDrawTransformFeedbackNV(@GLenum int mode, @GLuint int id);
+
+}
\ No newline at end of file


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

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

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

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


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

Staying tool eaasy as 1,2,3

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


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

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

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

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

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


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

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

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

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

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


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

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

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

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

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


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

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

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

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

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

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

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

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


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

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

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

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

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


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

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

Log Message:
-----------
moving win32 to generic windows dir

Added Paths:
-----------
    trunk/LWJGL/libs/windows/

Removed Paths:
-------------
    trunk/LWJGL/libs/win32/


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

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

Log Message:
-----------
support for OpenAL 64bit on windows

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

Modified: trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/AL.java	2009-03-15 21:44:27 UTC (rev 3181)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/AL.java	2009-03-17 21:36:18 UTC (rev 3182)
@@ -118,7 +118,7 @@
 		switch (LWJGLUtil.getPlatform()) {
 			case LWJGLUtil.PLATFORM_WINDOWS:
 				libname = "OpenAL32";
-				library_names = new String[]{"OpenAL32.dll"};
+				library_names = new String[]{"OpenAL64.dll", "OpenAL32.dll"};
 				break;
 			case LWJGLUtil.PLATFORM_LINUX:
 				libname = "openal";


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

Revision: 3181
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3181&view=rev
Author:   matzon
Date:     2009-03-15 21:44:27 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
oal-soft 1.7.411

Modified Paths:
--------------
    trunk/LWJGL/libs/win32/OpenAL32.dll

Added Paths:
-----------
    trunk/LWJGL/libs/win32/OpenAL64.dll

Modified: trunk/LWJGL/libs/win32/OpenAL32.dll
===================================================================
(Binary files differ)

Added: trunk/LWJGL/libs/win32/OpenAL64.dll
===================================================================
(Binary files differ)


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


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

Revision: 3180
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3180&view=rev
Author:   matzon
Date:     2009-03-15 19:43:24 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
oal-soft 1.7.411

Modified Paths:
--------------
    trunk/LWJGL/libs/linux/libopenal64.so

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


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

Revision: 3179
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3179&view=rev
Author:   matzon
Date:     2009-03-15 19:36:20 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
oal-soft 1.7.411

Modified Paths:
--------------
    trunk/LWJGL/libs/linux/libopenal.so

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


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

Revision: 3178
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3178&view=rev
Author:   matzon
Date:     2009-03-15 18:32:57 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
oal-soft 1.7.411

Modified Paths:
--------------
    trunk/LWJGL/libs/solaris/libopenal.so

Modified: trunk/LWJGL/libs/solaris/libopenal.so
===================================================================
(Binary files differ)


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

Revision: 3177
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3177&view=rev
Author:   kappa1
Date:     2009-03-11 21:05:05 +0000 (Wed, 11 Mar 2009)

Log Message:
-----------
Improved focus handling for Display.setParent() on linux. Focus is now released from Display when X fires a focus change event.

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2009-03-10 15:34:38 UTC (rev 3176)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2009-03-11 21:05:05 UTC (rev 3177)
@@ -125,8 +125,6 @@
 	private long current_cursor;
 	private long blank_cursor;
 	private Canvas parent;
-	private long parent_focus_window;
-	private boolean parent_focus_window_valid;
 	private long parent_window;
 	private boolean xembedded;
 	private boolean parent_focused;
@@ -432,7 +430,6 @@
 					mapRaised(getDisplay(), current_window);
 					xembedded = parent != null && isAncestorXEmbedded(parent_window);
 					blank_cursor = createBlankCursor();
-					parent_focus_window_valid = false;
 					current_cursor = None;
 					focused = false;
 					input_released = false;
@@ -858,22 +855,14 @@
 	private void checkInput() {
 		if (parent == null || !parent_focus_changed)
 			return;
-		if (focused) {
-			if (xembedded && !parent_focused && parent_focus_window_valid) {
-				if (nGetInputFocus(getDisplay()) != current_window) {
-					setInputFocusUnsafe(parent_focus_window);
-					parent_focus_changed = false;
-				}
+		
+		if (!focused && parent_focused) {
+			if (xembedded) {
+				// disable parent from taking focus back from Display when it is clicked
+				parent.setFocusable(false);
 			}
-		} else {
-			if (parent_focused) {
-				if (xembedded) {
-					parent_focus_window = nGetInputFocus(getDisplay());
-					parent_focus_window_valid = true;
-				}
-				setInputFocusUnsafe(getWindow());
-				parent_focus_changed = false;
-			}
+			setInputFocusUnsafe(getWindow());
+			parent_focus_changed = false;
 		}
 	}
 
@@ -881,10 +870,21 @@
 		if (focused == got_focus || focus_detail == NotifyDetailNone || focus_detail == NotifyPointer || focus_detail == NotifyPointerRoot)
 			return;
 		focused = got_focus;
+		
+		if (parent != null && xembedded && focused != parent.hasFocus()) {
+			return;
+		}
+		
 		if (focused) {
 			acquireInput();
 		} else {
 			releaseInput();
+			
+			if (parent != null && xembedded) {
+				setInputFocusUnsafe(0);
+				// re-enable parent focus to detect click on window
+				parent.setFocusable(true);
+			}
 		}
 	}
 	static native long nGetInputFocus(long display);


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

Revision: 3176
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3176&view=rev
Author:   kappa1
Date:     2009-03-10 15:34:38 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
When an applet is run in debug mode, output in console that a cached version of the applet is being loaded. 

A number of people were having problems with applets not updating, this was due to them leaving the cache tag on by mistake, hopefully this should alert them earlier and avoid time being wasted in tracking the issue.

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

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-03-09 21:53:11 UTC (rev 3175)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-03-10 15:34:38 UTC (rev 3176)
@@ -581,6 +581,10 @@
 					if (latestVersion <= readVersionFile(dir)) {
 						cacheAvailable = true;
 						percentage = 90;
+						
+						if(debugMode) {
+							System.out.println("Loading Cached Applet Version " + latestVersion);
+						}
 						debug_sleep(2000);
 					}
 				}


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

Revision: 3175
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3175&view=rev
Author:   kappa1
Date:     2009-03-09 21:53:11 +0000 (Mon, 09 Mar 2009)

Log Message:
-----------
fixed focus loop when using Display.setParent() on linux, this caused input keys to be missed as the focus shifted from parent to Display and back again.

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2009-03-09 21:07:38 UTC (rev 3174)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2009-03-09 21:53:11 UTC (rev 3175)
@@ -860,7 +860,7 @@
 			return;
 		if (focused) {
 			if (xembedded && !parent_focused && parent_focus_window_valid) {
-				if (nGetInputFocus(getDisplay()) == current_window) {
+				if (nGetInputFocus(getDisplay()) != current_window) {
 					setInputFocusUnsafe(parent_focus_window);
 					parent_focus_changed = false;
 				}


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

Revision: 3174
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3174&view=rev
Author:   matzon
Date:     2009-03-09 21:07:38 +0000 (Mon, 09 Mar 2009)

Log Message:
-----------
updating version to 2.1.0

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2009-02-05 16:18:42 UTC (rev 3173)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2009-03-09 21:07:38 UTC (rev 3174)
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 					location="doc" />
 	<property name="lwjgl.temp" 					location="temp" />
 	<property name="lwjgl.res" 						location="res" />
-	<property name="lwjgl.version" 				value="2.0.1" />
+	<property name="lwjgl.version" 				value="2.1.0" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
 	<!-- ================================================================== -->

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2009-02-05 16:18:42 UTC (rev 3173)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2009-03-09 21:07:38 UTC (rev 3174)
@@ -54,7 +54,7 @@
 	private static final String JNI_LIBRARY_NAME = "lwjgl";
 
 	/** Current version of library */
-	private static final String VERSION = "2.0.1";
+	private static final String VERSION = "2.1.0";
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;


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