java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 3)

Brought to you by: kappa1, matzon, spasi

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

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (134)	Sep (52)	Oct (13)	Nov (342)	Dec (163)
2003	Jan (44)	Feb (62)	Mar (158)	Apr (38)	May (70)	Jun (58)	Jul (104)	Aug (207)	Sep (83)	Oct (122)	Nov (23)	Dec (49)
2004	Jan (119)	Feb (132)	Mar (192)	Apr (140)	May (77)	Jun (74)	Jul (201)	Aug (63)	Sep (102)	Oct (70)	Nov (173)	Dec (78)
2005	Jan (174)	Feb (197)	Mar (105)	Apr (59)	May (77)	Jun (43)	Jul (21)	Aug (18)	Sep (47)	Oct (37)	Nov (74)	Dec (50)
2006	Jan (44)	Feb (19)	Mar (32)	Apr (24)	May (31)	Jun (55)	Jul (138)	Aug (28)	Sep (12)	Oct (41)	Nov (58)	Dec (24)
2007	Jan (28)	Feb (14)	Mar (10)	Apr (68)	May (30)	Jun (26)	Jul (18)	Aug (63)	Sep (19)	Oct (29)	Nov (20)	Dec (10)
2008	Jan (38)	Feb (7)	Mar (37)	Apr (120)	May (41)	Jun (36)	Jul (39)	Aug (24)	Sep (28)	Oct (30)	Nov (36)	Dec (75)
2009	Jan (46)	Feb (22)	Mar (50)	Apr (70)	May (134)	Jun (105)	Jul (75)	Aug (34)	Sep (38)	Oct (34)	Nov (19)	Dec (20)
2010	Jan (11)	Feb (20)	Mar (65)	Apr (83)	May (104)	Jun (73)	Jul (78)	Aug (57)	Sep (43)	Oct (35)	Nov (9)	Dec (4)
2011	Jan (21)	Feb (11)	Mar (18)	Apr (10)	May (18)	Jun (15)	Jul (48)	Aug (25)	Sep (17)	Oct (45)	Nov (15)	Dec (12)
2012	Jan (21)	Feb (9)	Mar (12)	Apr (9)	May (9)	Jun (5)	Jul (1)	Aug (10)	Sep (12)	Oct (1)	Nov (28)	Dec (5)
2013	Jan (4)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb (1)	Mar (1)	Apr	May (2)	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2015	Jan (1)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov	Dec
2016	Jan (2)	Feb (1)	Mar (1)	Apr (1)	May (2)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 2 3 4 5 .. 238 > >> (Page 3 of 238)

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

From: <sp...@us...> - 2012-08-23 14:21:05

Revision: 3791
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3791&view=rev
Author:   spasi
Date:     2012-08-23 14:20:58 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
Let repeat events pass the same-state filter.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
    trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2012-08-23 12:38:45 UTC (rev 3790)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2012-08-23 14:20:58 UTC (rev 3791)
@@ -155,7 +155,7 @@
 	}
 
 	public void handleKey(int virt_key, int scan_code, boolean extended, byte event_state, long millis, boolean repeat) {
-		if ( isKeyPressed(event_state) == isKeyPressed(virt_key_down_buffer[virt_key]) )
+		if ( !repeat && isKeyPressed(event_state) == isKeyPressed(virt_key_down_buffer[virt_key]) )
 			return;
 
 		virt_key = translateExtended(virt_key, scan_code, event_state, extended);

Modified: trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java	2012-08-23 12:38:45 UTC (rev 3790)
+++ trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java	2012-08-23 14:20:58 UTC (rev 3791)
@@ -202,10 +202,7 @@
 
       render();
 
-      try {
-        Thread.sleep(0);
-      } catch (Exception e) {
-      }
+      Display.sync(60);
     }
   }
 

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

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

From: <sp...@us...> - 2012-08-23 12:38:51

Revision: 3790
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3790&view=rev
Author:   spasi
Date:     2012-08-23 12:38:45 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
Filter TAB key up event when we alt-tab focus the Display.

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2012-08-23 10:36:12 UTC (rev 3789)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2012-08-23 12:38:45 UTC (rev 3790)
@@ -150,7 +150,14 @@
 		}
 	}
 
+	private static boolean isKeyPressed(int state) {
+		return (state & 1) == 1;
+	}
+
 	public void handleKey(int virt_key, int scan_code, boolean extended, byte event_state, long millis, boolean repeat) {
+		if ( isKeyPressed(event_state) == isKeyPressed(virt_key_down_buffer[virt_key]) )
+			return;
+
 		virt_key = translateExtended(virt_key, scan_code, event_state, extended);
 		flushRetained();
 		has_retained_event = true;
@@ -169,7 +176,7 @@
 
 	public void fireLostKeyEvents() {
 		for ( int i = 0; i < virt_key_down_buffer.length; i++ ) {
-			if ( (virt_key_down_buffer[i] & 1) == 1 && (GetAsyncKeyState(i) & 1) == 0 )
+			if ( isKeyPressed(virt_key_down_buffer[i]) && !isKeyPressed(GetAsyncKeyState(i)) )
 				handleKey(i, 0, false, (byte)0, System.currentTimeMillis(), false);
 		}
 	}

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

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

From: <sp...@us...> - 2012-08-23 10:36:23

Revision: 3789
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3789&view=rev
Author:   spasi
Date:     2012-08-23 10:36:12 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
Attempt to fix lost key up events when Display is out of focus. (Windows)

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-08-19 06:56:25 UTC (rev 3788)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-08-23 10:36:12 UTC (rev 3789)
@@ -345,6 +345,9 @@
 			redoMakeContextCurrent = true;
 			if (Display.isFullscreen())
 				updateClipping();
+
+			if ( keyboard != null )
+				keyboard.fireLostKeyEvents();
 		} else if (Display.isFullscreen()) {
 			showWindow(getHwnd(), SW_SHOWMINNOACTIVE);
 			resetDisplayMode();
@@ -1045,15 +1048,6 @@
 		return height;
 	}
 
-	private int firstMouseButtonDown() {
-		for(int i=0; i<Mouse.getButtonCount(); i++) {
-			if(Mouse.isButtonDown(i)) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
 	private native boolean nTrackMouseEvent(long hwnd);
 
 	public boolean isInsideWindow() {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2012-08-19 06:56:25 UTC (rev 3788)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2012-08-23 10:36:12 UTC (rev 3789)
@@ -49,8 +49,8 @@
 	private static final int BUFFER_SIZE = 50;
 
 	private final long hwnd;
-	private final ByteBuffer keyboard_state;
 	private final byte[] key_down_buffer = new byte[Keyboard.KEYBOARD_SIZE];
+	private final byte[] virt_key_down_buffer = new byte[Keyboard.KEYBOARD_SIZE];
 	private final EventQueue event_queue = new EventQueue(Keyboard.EVENT_SIZE);
 	private final ByteBuffer tmp_event = ByteBuffer.allocate(Keyboard.EVENT_SIZE);
 
@@ -65,7 +65,6 @@
 
 	WindowsKeyboard(long hwnd) throws LWJGLException {
 		this.hwnd = hwnd;
-		keyboard_state = BufferUtils.createByteBuffer(256);
 	}
 	private static native boolean isWindowsNT();
 
@@ -99,6 +98,7 @@
 	private static native int ToAscii(int wVirtKey, int wScanCode, ByteBuffer lpKeyState, ByteBuffer lpChar, int flags);
 	private static native int GetKeyboardState(ByteBuffer lpKeyState);
 	private static native int GetKeyState(int virt_key);
+	private static native int GetAsyncKeyState(int virt_key);
 
 	private void putEvent(int keycode, byte state, int ch, long millis, boolean repeat) {
 		tmp_event.clear();
@@ -155,8 +155,10 @@
 		flushRetained();
 		has_retained_event = true;
 		int keycode = WindowsKeycodes.mapVirtualKeyToLWJGLCode(virt_key);
-		if (keycode < key_down_buffer.length)
+		if (keycode < key_down_buffer.length) {
 			key_down_buffer[keycode] = event_state;
+			virt_key_down_buffer[virt_key] = event_state;
+		}
 		retained_key_code = keycode;
 		retained_state = event_state;
 		retained_millis = millis;
@@ -164,6 +166,14 @@
 		retained_repeat = repeat;
 	}
 
+
+	public void fireLostKeyEvents() {
+		for ( int i = 0; i < virt_key_down_buffer.length; i++ ) {
+			if ( (virt_key_down_buffer[i] & 1) == 1 && (GetAsyncKeyState(i) & 1) == 0 )
+				handleKey(i, 0, false, (byte)0, System.currentTimeMillis(), false);
+		}
+	}
+
 	public void handleChar(int event_char, long millis, boolean repeat) {
 		if (has_retained_event && retained_char != 0)
 			flushRetained();

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c	2012-08-19 06:56:25 UTC (rev 3788)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c	2012-08-23 10:36:12 UTC (rev 3789)
@@ -45,6 +45,10 @@
 	return GetKeyState(virt_key);
 }
 
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsKeyboard_GetAsyncKeyState(JNIEnv *env, jclass unused, jint virt_key) {
+	return GetAsyncKeyState(virt_key);
+}
+
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsKeyboard_MapVirtualKey(JNIEnv *env, jclass unused, jint uCode, jint uMapType) {
 	return MapVirtualKey(uCode, uMapType);
 }

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

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

From: <sp...@us...> - 2012-08-19 06:56:33

Revision: 3788
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3788&view=rev
Author:   spasi
Date:     2012-08-19 06:56:25 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Restored (most of) the removed methods from the previous commit and added deprecation warnings.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/Reuse.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -258,7 +258,7 @@
 			if ( has_result || method.getAnnotation(GLreturn.class) != null )
 				writer.print("return ");
 
-			writer.print(reuse_annotation.value() + "." + method_name + "(");
+			writer.print(reuse_annotation.value() + "." + (reuse_annotation.method().length() > 0 ? reuse_annotation.method() : method_name) + "(");
 			generateParametersJava(writer, method, typeinfos_instance, false, false, mode);
 			writer.println(");\n\t}");
 			return;

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/Reuse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/Reuse.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/Reuse.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -45,5 +45,5 @@
 public @interface Reuse {
 	/** The extension Class that defines the method. */
 	String value();
-
+	String method() default "";
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -142,11 +142,19 @@
 	@StripPostfix("params")
 	void glGetBufferParameterivARB(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetBufferParameteriARB} instead. */
 	@Alternate("glGetBufferParameterivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "ARBBufferObject", method = "glGetBufferParameteriARB")
+	@Deprecated
 	void glGetBufferParameterivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetBufferParameterivARB")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetBufferParameterivARB3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	@StripPostfix("pointer")
 	@AutoSize("GLChecks.getBufferObjectSizeARB(caps, target)")
 	void glGetBufferPointervARB(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -220,11 +220,19 @@
 	@StripPostfix("params")
 	void glGetRenderbufferParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @OutParameter IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteri} instead. */
+	@Alternate("glGetRenderbufferParameteriv")
+	@GLreturn("params")
+	@StripPostfix("params")
+	@Reuse(value = "ARBFramebufferObject", method = "glGetRenderbufferParameteri")
+	@Deprecated
+	void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	@Reuse("GL30")
 	@Alternate("glGetRenderbufferParameteriv")
 	@GLreturn("params")
 	@StripPostfix(value = "params", postfix = "v")
-	void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+	void glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Reuse("GL30")
 	boolean glIsFramebuffer(@GLuint int framebuffer);
@@ -277,11 +285,20 @@
 	void glGetFramebufferAttachmentParameteriv(@GLenum int target, @GLenum int attachment,
 	                                           @GLenum int pname, @Check("4") @OutParameter IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteri} instead. */
+	@Alternate("glGetFramebufferAttachmentParameteriv")
+	@GLreturn("params")
+	@StripPostfix("params")
+	@Reuse(value = "GL30", method = "glGetFramebufferAttachmentParameteri")
+	@Deprecated
+	void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment,
+	                                            @GLenum int pname, @OutParameter IntBuffer params);
+
 	@Reuse("GL30")
 	@Alternate("glGetFramebufferAttachmentParameteriv")
 	@GLreturn("params")
 	@StripPostfix(value = "params", postfix = "v")
-	void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment,
+	void glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment,
 	                                            @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Reuse("GL30")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -79,11 +79,19 @@
 	@StripPostfix("params")
 	void glGetQueryivARB(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryiARB} instead. */
 	@Alternate("glGetQueryivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "ARBOcclusionQuery", method = "glGetQueryiARB")
+	@Deprecated
 	void glGetQueryivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetQueryivARB")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetQueryivARB3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	@StripPostfix("params")
 	void glGetQueryObjectivARB(@GLuint int id, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -171,11 +171,19 @@
 	@StripPostfix("params")
 	void glGetProgramivARB(@GLenum int target, @GLenum int parameterName, @OutParameter @Check("4") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetProgramiARB} instead. */
 	@Alternate("glGetProgramivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "ARBProgram", method = "glGetProgramiARB")
+	@Deprecated
 	void glGetProgramivARB2(@GLenum int target, @GLenum int parameterName, @OutParameter IntBuffer params);
 
+	@Alternate("glGetProgramivARB")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetProgramivARB3(@GLenum int target, @GLenum int parameterName, @OutParameter IntBuffer params);
+
 	void glGetProgramStringARB(@GLenum int target, @GLenum int parameterName, @OutParameter @Check @GLbyte Buffer paramString);
 
 	@Alternate("glGetProgramStringARB")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -106,11 +106,21 @@
 	                 @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
 	                 @OutParameter IntBuffer values);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetSynci} instead. */
+	@Alternate("glGetSynciv")
+	@GLreturn("values")
+	@StripPostfix("values")
+	@Reuse(value = "GL32", method = "glGetSynci")
+	@Deprecated
+	void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
+	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
+	                  @OutParameter IntBuffer values);
+
 	@Reuse("GL32")
 	@Alternate("glGetSynciv")
 	@GLreturn("values")
 	@StripPostfix(value = "values", postfix = "v")
-	void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
+	void glGetSynciv3(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
 	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
 	                  @OutParameter IntBuffer values);
 }
\ 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	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -118,16 +118,27 @@
 	                           @GLenum int pname,
 	                           @OutParameter @Check("uniformIndices.remaining()") @GLint IntBuffer params);
 
-	@Reuse("GL31")
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveUniformsi} instead. */
 	@Alternate("glGetActiveUniformsiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL31", method = "glGetActiveUniformsi")
+	@Deprecated
 	void glGetActiveUniformsiv(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
 	                           @Constant(value = "params.put(1, uniformIndex), 1", keepParam = true) int uniformIndex, // Reuse params buffer
 	                           @GLenum int pname,
 	                           @OutParameter @GLint IntBuffer params);
 
 	@Reuse("GL31")
+	@Alternate("glGetActiveUniformsiv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetActiveUniformsiv2(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
+	                            @Constant(value = "params.put(1, uniformIndex), 1", keepParam = true) int uniformIndex, // Reuse params buffer
+	                            @GLenum int pname,
+	                            @OutParameter @GLint IntBuffer params);
+
+	@Reuse("GL31")
 	void glGetActiveUniformName(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
 	                            @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
 	                            @OutParameter @GLchar ByteBuffer uniformName);
@@ -153,11 +164,20 @@
 	void glGetActiveUniformBlockiv(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                               @OutParameter @Check(value = "16") @GLint IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveUniformBlocki} instead. */
+	@Alternate("glGetActiveUniformBlockiv")
+	@GLreturn("params")
+	@StripPostfix("params")
+	@Reuse(value = "GL31", method = "glGetActiveUniformBlocki")
+	@Deprecated
+	void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
+	                                @OutParameter @GLint IntBuffer params);
+
 	@Reuse("GL31")
 	@Alternate("glGetActiveUniformBlockiv")
 	@GLreturn("params")
 	@StripPostfix(value = "params", postfix = "v")
-	void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
+	void glGetActiveUniformBlockiv3(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                                @OutParameter @GLint IntBuffer params);
 
 	@Reuse("GL31")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -149,11 +149,19 @@
 	@StripPostfix("params")
 	void glGetRenderbufferParameterivEXT(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteriEXT} instead. */
 	@Alternate("glGetRenderbufferParameterivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "EXTFramebufferObject", method = "glGetRenderbufferParameteriEXT")
+	@Deprecated
 	void glGetRenderbufferParameterivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetRenderbufferParameterivEXT")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetRenderbufferParameterivEXT3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	boolean glIsFramebufferEXT(@GLuint int framebuffer);
 
 	void glBindFramebufferEXT(@GLenum int target, @GLuint int framebuffer);
@@ -183,10 +191,18 @@
 	@StripPostfix("params")
 	void glGetFramebufferAttachmentParameterivEXT(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteriEXT} instead. */
 	@Alternate("glGetFramebufferAttachmentParameterivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "EXTFramebufferObject", method = "glGetFramebufferAttachmentParameteriEXT")
+	@Deprecated
 	void glGetFramebufferAttachmentParameterivEXT2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetFramebufferAttachmentParameterivEXT")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetFramebufferAttachmentParameterivEXT3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
+
 	void glGenerateMipmapEXT(@GLenum int target);
 }

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -32,7 +32,6 @@
 package org.lwjgl.opengl;
 
 import org.lwjgl.util.generator.*;
-import org.lwjgl.util.generator.Alternate;
 import org.lwjgl.util.generator.opengl.*;
 
 import java.nio.Buffer;
@@ -167,11 +166,19 @@
 	@StripPostfix("params")
 	void glGetBufferParameteriv(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetBufferParameteri} instead. */
 	@Alternate("glGetBufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL15", method = "glGetBufferParameteri")
+	@Deprecated
 	void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetBufferParameteriv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	@StripPostfix("pointer")
 	@AutoSize("GLChecks.getBufferObjectSize(caps, target)")
 	void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer pointer);
@@ -217,11 +224,19 @@
 	@StripPostfix("params")
 	void glGetQueryiv(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryi} instead. */
 	@Alternate("glGetQueryiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL15", method = "glGetQueryi")
+	@Deprecated
 	void glGetQueryiv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetQueryiv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetQueryiv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	@StripPostfix("params")
 	void glGetQueryObjectiv(@GLenum int id, @GLenum int pname, @OutParameter @Check("1") @GLint IntBuffer params);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -189,19 +189,35 @@
 	@StripPostfix("params")
 	void glGetShaderiv(@GLuint int shader, @GLenum int pname, @OutParameter @Check IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetShaderi} instead. */
 	@Alternate("glGetShaderiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL20", method = "glGetShaderi")
+	@Deprecated
 	void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetShaderiv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetShaderiv3(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
+
 	@StripPostfix("params")
 	void glGetProgramiv(@GLuint int program, @GLenum int pname, @OutParameter @Check IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetProgrami} instead. */
 	@Alternate("glGetProgramiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL20", method = "glGetProgrami")
+	@Deprecated
 	void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetProgramiv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetProgramiv3(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
+
 	void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int maxLength,
 	                        @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
 	                        @OutParameter @GLchar ByteBuffer infoLog);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -541,11 +541,19 @@
 	@StripPostfix("params")
 	void glGetRenderbufferParameteriv(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteri} instead. */
 	@Alternate("glGetRenderbufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL30", method = "glGetRenderbufferParameteri")
+	@Deprecated
 	void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetRenderbufferParameteriv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	boolean glIsFramebuffer(@GLuint int framebuffer);
 
 	void glBindFramebuffer(@GLenum int target, @GLuint int framebuffer);
@@ -575,11 +583,19 @@
 	@StripPostfix("params")
 	void glGetFramebufferAttachmentParameteriv(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteri} instead. */
 	@Alternate("glGetFramebufferAttachmentParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL30", method = "glGetFramebufferAttachmentParameteri")
+	@Deprecated
 	void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetFramebufferAttachmentParameteriv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
+
 	void glGenerateMipmap(@GLenum int target);
 
 	// --------------------------------------------------------------------------------------------

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -251,14 +251,25 @@
 	                           @GLenum int pname,
 	                           @OutParameter @Check("uniformIndices.remaining()") @GLint IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveUniformsi} instead. */
 	@Alternate("glGetActiveUniformsiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL31", method = "glGetActiveUniformsi")
+	@Deprecated
 	void glGetActiveUniformsiv(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
 	                           @Constant(value = "MemoryUtil.getAddress(params.put(1, uniformIndex), 1)", keepParam = true) int uniformIndex, // Reuse params buffer
 	                           @GLenum int pname,
 	                           @OutParameter @GLint IntBuffer params);
 
+	@Alternate("glGetActiveUniformsiv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetActiveUniformsiv2(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
+	                            @Constant(value = "MemoryUtil.getAddress(params.put(1, uniformIndex), 1)", keepParam = true) int uniformIndex, // Reuse params buffer
+	                            @GLenum int pname,
+	                            @OutParameter @GLint IntBuffer params);
+
 	void glGetActiveUniformName(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
 	                            @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
 	                            @OutParameter @GLchar ByteBuffer uniformName);
@@ -280,12 +291,21 @@
 	void glGetActiveUniformBlockiv(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                               @OutParameter @Check(value = "16") @GLint IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveUniformBlocki} instead. */
 	@Alternate("glGetActiveUniformBlockiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL31", method = "glGetActiveUniformBlocki")
+	@Deprecated
 	void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                                @OutParameter @GLint IntBuffer params);
 
+	@Alternate("glGetActiveUniformBlockiv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetActiveUniformBlockiv3(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
+	                                @OutParameter @GLint IntBuffer params);
+
 	void glGetActiveUniformBlockName(@GLuint int program, @GLuint int uniformBlockIndex, @AutoSize("uniformBlockName") @GLsizei int bufSize,
 	                                 @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
 	                                 @OutParameter @GLchar ByteBuffer uniformBlockName);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -57,11 +57,19 @@
 	@StripPostfix("params")
 	void glGetBufferParameteri64v(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") LongBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetBufferParameteri64} instead. */
 	@Alternate("glGetBufferParameteri64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL32", method = "glGetBufferParameteri64")
+	@Deprecated
 	void glGetBufferParameteri64v2(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
 
+	@Alternate("glGetBufferParameteri64v")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetBufferParameteri64v3(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
+
 	// ---------------------------------------------------------------------
 	// ----------------------[ ARB_vertex_array_bgra ]----------------------
 	// ---------------------------------------------------------------------
@@ -336,10 +344,20 @@
 	                 @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
 	                 @OutParameter IntBuffer values);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetSynci} instead. */
 	@Alternate("glGetSynciv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix("values")
+	@Reuse(value = "GL32", method = "glGetSynci")
+	@Deprecated
 	void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
 	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
 	                  @OutParameter IntBuffer values);
+
+	@Alternate("glGetSynciv")
+	@GLreturn("values")
+	@StripPostfix(value = "values", postfix = "v")
+	void glGetSynciv3(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
+	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
+	                  @OutParameter IntBuffer values);
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -209,19 +209,35 @@
 	@StripPostfix("params")
 	void glGetQueryObjecti64v(@GLuint int id, @GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryObjecti64} instead. */
 	@Alternate("glGetQueryObjecti64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL33", method = "glGetQueryObjecti64")
+	@Deprecated
 	void glGetQueryObjecti64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params);
 
+	@Alternate("glGetQueryObjecti64v")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetQueryObjecti64v3(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params);
+
 	@StripPostfix("params")
 	void glGetQueryObjectui64v(@GLuint int id, @GLenum int pname, @OutParameter @Check("1") @GLuint64 LongBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryObjectui64} instead. */
 	@Alternate("glGetQueryObjectui64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL33", method = "glGetQueryObjectui64")
+	@Deprecated
 	void glGetQueryObjectui64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params);
 
+	@Alternate("glGetQueryObjectui64v")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetQueryObjectui64v3(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params);
+
 	// --------------------------------------------------------------------
 	// ----------------------[ ARB_instanced_arrays ]----------------------
 	// --------------------------------------------------------------------

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -225,12 +225,21 @@
 	void glGetActiveSubroutineUniformiv(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
 	                                    @OutParameter @Check("1") IntBuffer values);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveSubroutineUniformi} instead. */
 	@Alternate("glGetActiveSubroutineUniformiv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix("values")
+	@Reuse(value = "GL40", method = "glGetActiveSubroutineUniformi")
+	@Deprecated
 	void glGetActiveSubroutineUniformiv2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
 	                                     @OutParameter IntBuffer values);
 
+	@Alternate("glGetActiveSubroutineUniformiv")
+	@GLreturn("values")
+	@StripPostfix(value = "values", postfix = "v")
+	void glGetActiveSubroutineUniformiv3(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
+	                                     @OutParameter IntBuffer values);
+
 	void glGetActiveSubroutineUniformName(@GLuint int program, @GLenum int shadertype, @GLuint int index, @AutoSize("name") @GLsizei int bufsize,
 	                                      @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
 	                                      @OutParameter @GLchar ByteBuffer name);
@@ -257,19 +266,35 @@
 	@StripPostfix("params")
 	void glGetUniformSubroutineuiv(@GLenum int shadertype, int location, @Check("1") @OutParameter @GLuint IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetUniformSubroutineui} instead. */
 	@Alternate("glGetUniformSubroutineuiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL40", method = "glGetUniformSubroutineui")
+	@Deprecated
 	void glGetUniformSubroutineuiv2(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params);
 
+	@Alternate("glGetUniformSubroutineuiv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetUniformSubroutineuiv3(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params);
+
 	@StripPostfix("values")
 	void glGetProgramStageiv(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @Check("1") @OutParameter IntBuffer values);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetProgramStagei} instead. */
 	@Alternate("glGetProgramStageiv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix("values")
+	@Reuse(value = "GL40", method = "glGetProgramStagei")
+	@Deprecated
 	void glGetProgramStageiv2(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
 
+	@Alternate("glGetProgramStageiv")
+	@GLreturn("values")
+	@StripPostfix(value = "values", postfix = "v")
+	void glGetProgramStageiv3(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
+
 	// -----------------------------------------------------------------------
 	// ----------------------[ ARB_tessellation_shader ]----------------------
 	// -----------------------------------------------------------------------
@@ -446,9 +471,17 @@
 	@StripPostfix("params")
 	void glGetQueryIndexediv(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryIndexedi} instead. */
 	@Alternate("glGetQueryIndexediv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GL40", method = "glGetQueryIndexedi")
+	@Deprecated
 	void glGetQueryIndexediv2(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetQueryIndexediv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetQueryIndexediv3(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params);
+
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -80,11 +80,19 @@
 	@StripPostfix("params")
 	void glGetProgramivNV(@GLuint int programID, @GLenum int parameterName, @OutParameter @Check @GLint IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetProgramiNV} instead. */
 	@Alternate("glGetProgramivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "NVProgram", method = "glGetProgramiNV")
+	@Deprecated
 	void glGetProgramivNV2(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLint IntBuffer params);
 
+	@Alternate("glGetProgramivNV")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetProgramivNV3(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLint IntBuffer params);
+
 	void glGetProgramStringNV(@GLuint int programID, @GLenum int parameterName, @OutParameter @Check @GLubyte Buffer paramString);
 
 	@Alternate("glGetProgramStringNV")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -699,11 +699,19 @@
 	@StripPostfix("params")
 	void glGetBufferParameteriv(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetBufferParameteri} instead. */
 	@Alternate("glGetBufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GLES20", method = "glGetBufferParameteri")
+	@Deprecated
 	void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetBufferParameteriv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	@NoErrorCheck
 	@GLenum
 	int glGetError();
@@ -719,11 +727,19 @@
 	@StripPostfix("params")
 	void glGetFramebufferAttachmentParameteriv(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteri} instead. */
 	@Alternate("glGetFramebufferAttachmentParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GLES20", method = "glGetFramebufferAttachmentParameteri")
+	@Deprecated
 	void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetFramebufferAttachmentParameteriv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
+
 	@StripPostfix("params")
 	void glGetIntegerv(@GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
@@ -735,11 +751,19 @@
 	@StripPostfix("params")
 	void glGetProgramiv(@GLuint int program, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetProgrami} instead. */
 	@Alternate("glGetProgramiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GLES20", method = "glGetProgrami")
+	@Deprecated
 	void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetProgramiv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetProgramiv3(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
+
 	void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int bufsize,
 	                         @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
 	                         @OutParameter @GLchar ByteBuffer infoLog);
@@ -753,19 +777,35 @@
 	@StripPostfix("params")
 	void glGetRenderbufferParameteriv(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteri} instead. */
 	@Alternate("glGetRenderbufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GLES20", method = "glGetRenderbufferParameteri")
+	@Deprecated
 	void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetRenderbufferParameteriv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	@StripPostfix("params")
 	void glGetShaderiv(@GLuint int shader, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetShaderi} instead. */
 	@Alternate("glGetShaderiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "GLES20", method = "glGetShaderi")
+	@Deprecated
 	void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetShaderiv")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetShaderiv3(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
+
 	void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int bufsize,
 	                        @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
 	                        @OutParameter @GLchar ByteBuffer infoLog);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java	2012-08-18 14:00:45 UTC (rev 3787)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java	2012-08-19 06:56:25 UTC (rev 3788)
@@ -142,11 +142,19 @@
 	@StripPostfix("params")
 	void glGetRenderbufferParameterivOES(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteriOES} instead. */
 	@Alternate("glGetRenderbufferParameterivOES")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "OESFramebufferObject", method = "glGetRenderbufferParameteriOES")
+	@Deprecated
 	void glGetRenderbufferParameterivOES2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetRenderbufferParameterivOES")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetRenderbufferParameterivOES3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
 	boolean glIsFramebufferOES(@GLuint int framebuffer);
 
 	void glBindFramebufferOES(@GLenum int target, @GLuint int framebuffer);
@@ -172,11 +180,19 @@
 	@StripPostfix("params")
 	void glGetFramebufferAttachmentParameterivOES(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
+	/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteriOES} instead. */
 	@Alternate("glGetFramebufferAttachmentParameterivOES")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix("params")
+	@Reuse(value = "OESFramebufferObject", method = "glGetFramebufferAttachmentParameteriOES")
+	@Deprecated
 	void glGetFramebufferAttachmentParameterivOES2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
+	@Alternate("glGetFramebufferAttachmentParameterivOES")
+	@GLreturn("params")
+	@StripPostfix(value = "params", postfix = "v")
+	void glGetFramebufferAttachmentParameterivOES3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
+
 	void glGenerateMipmapOES(@GLenum int target);
 
 }
\ No newline at end of file

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

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

From: <sp...@us...> - 2012-08-18 14:00:52

Revision: 3787
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3787&view=rev
Author:   spasi
Date:     2012-08-18 14:00:45 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
Fixes related to the new alternate signatures.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -66,15 +66,15 @@
 	}
 
 	static int getBufferObjectSize(ContextCapabilities caps, int buffer_enum) {
-		return glGetBufferParameter(buffer_enum, GL_BUFFER_SIZE);
+		return glGetBufferParameteri(buffer_enum, GL_BUFFER_SIZE);
 	}
 
 	static int getBufferObjectSizeARB(ContextCapabilities caps, int buffer_enum) {
-		return glGetBufferParameterARB(buffer_enum, GL_BUFFER_SIZE_ARB);
+		return glGetBufferParameteriARB(buffer_enum, GL_BUFFER_SIZE_ARB);
 	}
 
 	static int getBufferObjectSizeATI(ContextCapabilities caps, int buffer) {
-		return glGetObjectBufferATI(buffer, GL_OBJECT_BUFFER_SIZE_ATI);
+		return glGetObjectBufferiATI(buffer, GL_OBJECT_BUFFER_SIZE_ATI);
 	}
 
 	static int getNamedBufferObjectSize(ContextCapabilities caps, int buffer) {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -59,7 +59,7 @@
 	}
 
 	static int getBufferObjectSize(int buffer_enum) {
-		return glGetBufferParameter(buffer_enum, GLES20.GL_BUFFER_SIZE);
+		return glGetBufferParameteri(buffer_enum, GLES20.GL_BUFFER_SIZE);
 	}
 
 	/** Helper method to ensure that array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -130,7 +130,7 @@
 				System.out.println("Unexpected wait status: 0x" + Integer.toHexString(status));
 		}
 
-		System.out.println("Sync Status: " + (glGetSync(sync, GL_SYNC_STATUS) == GL_UNSIGNALED ? "UNSIGNALED" : "SIGNALED"));
+		System.out.println("Sync Status: " + (glGetSynci(sync, GL_SYNC_STATUS) == GL_UNSIGNALED ? "UNSIGNALED" : "SIGNALED"));
 
 		glDeleteSync(sync);
 

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -75,7 +75,7 @@
 
 		printShaderObjectInfoLog(file, shaderID);
 
-		if ( glGetShader(shaderID, GL_COMPILE_STATUS) == GL_FALSE )
+		if ( glGetShaderi(shaderID, GL_COMPILE_STATUS) == GL_FALSE )
 			ShadersTest.kill("A compilation error occured in a vertex shader.");
 
 		programID = glCreateProgram();
@@ -85,14 +85,14 @@
 
 		printShaderProgramInfoLog(programID);
 
-		if ( glGetProgram(programID, GL_LINK_STATUS) == GL_FALSE )
+		if ( glGetProgrami(programID, GL_LINK_STATUS) == GL_FALSE )
 			ShadersTest.kill("A linking error occured in a shader program.");
 
 		final String[] uniformNames = { "uniformA", "uniformB" };
 
 		// Get uniform block index and data size
 		final int blockIndex = glGetUniformBlockIndex(programID, "test");
-		final int blockSize = glGetActiveUniformBlock(programID, blockIndex, GL_UNIFORM_BLOCK_DATA_SIZE);
+		final int blockSize = glGetActiveUniformBlocki(programID, blockIndex, GL_UNIFORM_BLOCK_DATA_SIZE);
 
 		System.out.println("blockSize = " + blockSize);
 

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -394,8 +394,8 @@
 			                      "     gl_FragColor = texture2D(COLOR_MAP, gl_PointCoord);\n" +
 			                      "}");
 			glCompileShader(fshID);
-			if ( glGetShader(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(fshID, glGetShader(fshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(fshID, glGetShaderi(fshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile fragment shader.");
 			}
 
@@ -403,8 +403,8 @@
 			glAttachShader(progID, vshID);
 			glAttachShader(progID, fshID);
 			glLinkProgram(progID);
-			if ( glGetProgram(progID, GL_LINK_STATUS) == GL_FALSE ) {
-				System.out.println(glGetProgramInfoLog(progID, glGetProgram(progID, GL_INFO_LOG_LENGTH)));
+			if ( glGetProgrami(progID, GL_LINK_STATUS) == GL_FALSE ) {
+				System.out.println(glGetProgramInfoLog(progID, glGetProgrami(progID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to link shader program.");
 			}
 
@@ -491,8 +491,8 @@
 			                      "     gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
 			                      "}");
 			glCompileShader(vshID);
-			if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile vertex shader.");
 			}
 
@@ -635,8 +635,8 @@
 			                      "     gl_Position = vec4(animC, anim.zw);\n" +
 			                      "}");
 			glCompileShader(vshID);
-			if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile vertex shader.");
 			}
 
@@ -644,8 +644,8 @@
 			glAttachShader(progIDTF, vshID);
 			glTransformFeedbackVaryings(progIDTF, new CharSequence[] { "gl_Position" }, GL_SEPARATE_ATTRIBS);
 			glLinkProgram(progIDTF);
-			if ( glGetProgram(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
-				System.out.println(glGetProgramInfoLog(progIDTF, glGetProgram(progIDTF, GL_INFO_LOG_LENGTH)));
+			if ( glGetProgrami(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
+				System.out.println(glGetProgramInfoLog(progIDTF, glGetProgrami(progIDTF, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to link shader program.");
 			}
 
@@ -663,8 +663,8 @@
 			                           "     gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
 			                           "}");
 			glCompileShader(this.vshID);
-			if ( glGetShader(this.vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(this.vshID, glGetShader(this.vshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(this.vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(this.vshID, glGetShaderi(this.vshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile vertex shader.");
 			}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -392,8 +392,8 @@
 			                      "     gl_FragColor = texture2D(COLOR_MAP, gl_PointCoord);\n" +
 			                      "}");
 			glCompileShader(fshID);
-			if ( glGetShader(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(fshID, glGetShader(fshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(fshID, glGetShaderi(fshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile fragment shader.");
 			}
 
@@ -401,8 +401,8 @@
 			glAttachShader(progID, vshID);
 			glAttachShader(progID, fshID);
 			glLinkProgram(progID);
-			if ( glGetProgram(progID, GL_LINK_STATUS) == GL_FALSE ) {
-				System.out.println(glGetProgramInfoLog(progID, glGetProgram(progID, GL_INFO_LOG_LENGTH)));
+			if ( glGetProgrami(progID, GL_LINK_STATUS) == GL_FALSE ) {
+				System.out.println(glGetProgramInfoLog(progID, glGetProgrami(progID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to link shader program.");
 			}
 
@@ -456,8 +456,8 @@
 			                      "     gl_Position = vec4(animC, anim.zw);\n" +
 			                      "}");
 			glCompileShader(vshID);
-			if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile vertex shader.");
 			}
 
@@ -465,8 +465,8 @@
 			glAttachShader(progIDTF, vshID);
 			glTransformFeedbackVaryings(progIDTF, new CharSequence[] { "gl_Position" }, GL_SEPARATE_ATTRIBS);
 			glLinkProgram(progIDTF);
-			if ( glGetProgram(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
-				System.out.println(glGetProgramInfoLog(progIDTF, glGetProgram(progIDTF, GL_INFO_LOG_LENGTH)));
+			if ( glGetProgrami(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
+				System.out.println(glGetProgramInfoLog(progIDTF, glGetProgrami(progIDTF, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to link shader program.");
 			}
 
@@ -486,8 +486,8 @@
 			                      "     gl_Position = gl_ModelViewProjectionMatrix * vec4(gl_Vertex.xy, depth, gl_Vertex.w);\n" +
 			                      "}");
 			glCompileShader(vshID);
-			if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile vertex shader.");
 			}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -464,8 +464,8 @@
 			                      "     gl_FragColor = texture2D(COLOR_MAP, gl_PointCoord);\n" +
 			                      "}");
 			glCompileShader(fshID);
-			if ( glGetShader(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(fshID, glGetShader(fshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(fshID, glGetShaderi(fshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile fragment shader.");
 			}
 
@@ -473,8 +473,8 @@
 			glAttachShader(progID, vshID);
 			glAttachShader(progID, fshID);
 			glLinkProgram(progID);
-			if ( glGetProgram(progID, GL_LINK_STATUS) == GL_FALSE ) {
-				System.out.println(glGetProgramInfoLog(progID, glGetProgram(progID, GL_INFO_LOG_LENGTH)));
+			if ( glGetProgrami(progID, GL_LINK_STATUS) == GL_FALSE ) {
+				System.out.println(glGetProgramInfoLog(progID, glGetProgrami(progID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to link shader program.");
 			}
 
@@ -534,8 +534,8 @@
 			                      "     gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
 			                      "}");
 			glCompileShader(vshID);
-			if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile vertex shader.");
 			}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -445,8 +445,8 @@
 			                      "     gl_FragColor = texture2D(COLOR_MAP, gl_PointCoord);\n" +
 			                      "}");
 			glCompileShader(fshID);
-			if ( glGetShader(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(fshID, glGetShader(fshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(fshID, glGetShaderi(fshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile fragment shader.");
 			}
 
@@ -454,8 +454,8 @@
 			glAttachShader(progID, vshID);
 			glAttachShader(progID, fshID);
 			glLinkProgram(progID);
-			if ( glGetProgram(progID, GL_LINK_STATUS) == GL_FALSE ) {
-				System.out.println(glGetProgramInfoLog(progID, glGetProgram(progID, GL_INFO_LOG_LENGTH)));
+			if ( glGetProgrami(progID, GL_LINK_STATUS) == GL_FALSE ) {
+				System.out.println(glGetProgramInfoLog(progID, glGetProgrami(progID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to link shader program.");
 			}
 
@@ -487,8 +487,8 @@
 			                      "     gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
 			                      "}");
 			glCompileShader(vshID);
-			if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile vertex shader.");
 			}
 
@@ -708,8 +708,8 @@
 			                      "     gl_Position = vec4(animC, anim.zw);\n" +
 			                      "}");
 			glCompileShader(vshID);
-			if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile vertex shader.");
 			}
 
@@ -717,8 +717,8 @@
 			glAttachShader(progIDTF, vshID);
 			glTransformFeedbackVaryings(progIDTF, new CharSequence[] { "gl_Position" }, GL_SEPARATE_ATTRIBS);
 			glLinkProgram(progIDTF);
-			if ( glGetProgram(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
-				System.out.println(glGetProgramInfoLog(progIDTF, glGetProgram(progIDTF, GL_INFO_LOG_LENGTH)));
+			if ( glGetProgrami(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
+				System.out.println(glGetProgramInfoLog(progIDTF, glGetProgrami(progIDTF, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to link shader program.");
 			}
 
@@ -736,8 +736,8 @@
 			                           "     gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
 			                           "}");
 			glCompileShader(this.vshID);
-			if ( glGetShader(this.vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
-				System.out.println(glGetShaderInfoLog(this.vshID, glGetShader(this.vshID, GL_INFO_LOG_LENGTH)));
+			if ( glGetShaderi(this.vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+				System.out.println(glGetShaderInfoLog(this.vshID, glGetShaderi(this.vshID, GL_INFO_LOG_LENGTH)));
 				throw new RuntimeException("Failed to compile vertex shader.");
 			}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -75,7 +75,7 @@
 
 		glCompileShader(ID);
 
-		if ( glGetShader(ID, GL_COMPILE_STATUS) == GL_FALSE ) {
+		if ( glGetShaderi(ID, GL_COMPILE_STATUS) == GL_FALSE ) {
 			printInfoLog();
 			destroy();
 			throw new RuntimeException("A compilation error occured in a shader.");
@@ -86,7 +86,7 @@
 		if ( ID == 0 )
 			throw new IllegalStateException("The shader has not been created");
 
-		final int logLength = glGetShader(ID, GL_INFO_LOG_LENGTH);
+		final int logLength = glGetShaderi(ID, GL_INFO_LOG_LENGTH);
 		if ( logLength <= 1 )
 			return;
 

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -14,7 +14,7 @@
 
 		glLinkProgram(ID);
 
-		if ( glGetProgram(ID, GL_LINK_STATUS) == GL_FALSE ) {
+		if ( glGetProgrami(ID, GL_LINK_STATUS) == GL_FALSE ) {
 			printInfoLog();
 			destroy();
 			throw new RuntimeException("Failed to link a Shader Program: " + ID);
@@ -24,7 +24,7 @@
 	public void validate() {
 		glValidateProgram(ID);
 
-		final boolean error = glGetProgram(ID, GL_VALIDATE_STATUS) == GL_FALSE;
+		final boolean error = glGetProgrami(ID, GL_VALIDATE_STATUS) == GL_FALSE;
 
 		if ( error ) {
 			printInfoLog();
@@ -67,7 +67,7 @@
 	}
 
 	private void printInfoLog() {
-		final int logLength = glGetProgram(ID, GL_INFO_LOG_LENGTH);
+		final int logLength = glGetProgrami(ID, GL_INFO_LOG_LENGTH);
 
 		System.out.println(logLength);
 		if ( logLength <= 1 )

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -76,7 +76,7 @@
 	@Reuse("GL40")
 	@Alternate("glGetActiveSubroutineUniformiv")
 	@GLreturn("values")
-	@StripPostfix("values")
+	@StripPostfix(value = "values", postfix = "v")
 	void glGetActiveSubroutineUniformiv2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
 	                                     @OutParameter IntBuffer values);
 
@@ -125,7 +125,7 @@
 	@Reuse("GL40")
 	@Alternate("glGetProgramStageiv")
 	@GLreturn("values")
-	@StripPostfix("values")
+	@StripPostfix(value = "values", postfix = "v")
 	void glGetProgramStageiv2(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
 
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2012-08-18 14:00:45 UTC (rev 3787)
@@ -109,7 +109,7 @@
 	@Reuse("GL32")
 	@Alternate("glGetSynciv")
 	@GLreturn("values")
-	@StripPostfix("values")
+	@StripPostfix(value = "values", postfix = "v")
 	void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
 	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
 	                  @OutParameter IntBuffer values);

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

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

From: <sp...@us...> - 2012-08-18 11:46:33

Revision: 3786
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3786&view=rev
Author:   spasi
Date:     2012-08-18 11:46:25 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
Keep type postfix on alternative functions that return primitive values.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_timer_query.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES30.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -75,7 +75,7 @@
 
 	@Alternate("glGetObjectParameterivAPPLE")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetObjectParameterivAPPLE2(@GLenum int objectType, @GLuint int name, @GLenum int pname, @OutParameter IntBuffer params);
 
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -144,7 +144,7 @@
 
 	@Alternate("glGetBufferParameterivARB")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetBufferParameterivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("pointer")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -72,7 +72,7 @@
 	@Reuse("GL43")
 	@Alternate("glGetFramebufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetFramebufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Dependent("GL_EXT_direct_state_access")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -223,7 +223,7 @@
 	@Reuse("GL30")
 	@Alternate("glGetRenderbufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Reuse("GL30")
@@ -280,7 +280,7 @@
 	@Reuse("GL30")
 	@Alternate("glGetFramebufferAttachmentParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment,
 	                                            @GLenum int pname, @OutParameter IntBuffer params);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -180,7 +180,7 @@
 	@Reuse("GL43")
 	@Alternate("glGetInternalformati64v")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetInternalformati64v2(@GLenum int target, @GLenum int internalformat,
 	                              @GLenum int pname, @Constant("1") @GLsizei int bufSize, @OutParameter @GLint64 LongBuffer params);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -81,7 +81,7 @@
 
 	@Alternate("glGetQueryivARB")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -173,13 +173,13 @@
 
 	@Alternate("glGetProgramivARB")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetProgramivARB2(@GLenum int target, @GLenum int parameterName, @OutParameter IntBuffer params);
 
 	void glGetProgramStringARB(@GLenum int target, @GLenum int parameterName, @OutParameter @Check @GLbyte Buffer paramString);
 
 	@Alternate("glGetProgramStringARB")
-	@Code("\t\tint programLength = glGetProgramARB(target, GL_PROGRAM_LENGTH_ARB);")
+	@Code("\t\tint programLength = glGetProgramiARB(target, GL_PROGRAM_LENGTH_ARB);")
 	@GLreturn(value="paramString", maxLength = "programLength", forceMaxLength = true)
 	void glGetProgramStringARB2(@GLenum int target, @GLenum int parameterName, @OutParameter @GLchar ByteBuffer paramString);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -105,7 +105,7 @@
 	@Reuse("GL43")
 	@Alternate("glGetProgramInterfaceiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetProgramInterfaceiv2(@GLuint int program, @GLenum int programInterface,
 	                              @GLenum int pname, @OutParameter IntBuffer params);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -134,7 +134,7 @@
 	@Reuse("GL41")
 	@Alternate("glGetProgramPipelineiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetProgramPipelineiv2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Reuse("GL41")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -115,7 +115,7 @@
 	@Reuse("GL40")
 	@Alternate("glGetUniformSubroutineuiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetUniformSubroutineuiv2(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params);
 
 	@Reuse("GL40")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -97,7 +97,7 @@
 	@Reuse("GL32")
 	@Alternate("glGetInteger64v")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetInteger64v2(@GLenum int pname, @OutParameter @GLint64 LongBuffer params);
 
 	@Reuse("GL32")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_timer_query.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_timer_query.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_timer_query.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -63,7 +63,7 @@
 	@Reuse("GL33")
 	@Alternate("glGetQueryObjecti64v")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryObjecti64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params);
 
 	@Reuse("GL33")
@@ -73,7 +73,7 @@
 	@Reuse("GL33")
 	@Alternate("glGetQueryObjectui64v")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryObjectui64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params);
 
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -65,7 +65,7 @@
 	@Reuse("GL40")
 	@Alternate("glGetQueryIndexediv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryIndexediv2(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params);
 
 }
\ 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	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -121,7 +121,7 @@
 	@Reuse("GL31")
 	@Alternate("glGetActiveUniformsiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetActiveUniformsiv(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
 	                           @Constant(value = "params.put(1, uniformIndex), 1", keepParam = true) int uniformIndex, // Reuse params buffer
 	                           @GLenum int pname,
@@ -156,7 +156,7 @@
 	@Reuse("GL31")
 	@Alternate("glGetActiveUniformBlockiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                                @OutParameter @GLint IntBuffer params);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -75,7 +75,7 @@
 
 	@Alternate("glGetObjectBufferivATI")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetObjectBufferivATI2(@GLuint int buffer, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glFreeObjectBufferATI(@GLuint int buffer);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -151,7 +151,7 @@
 
 	@Alternate("glGetRenderbufferParameterivEXT")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetRenderbufferParameterivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	boolean glIsFramebufferEXT(@GLuint int framebuffer);
@@ -185,7 +185,7 @@
 
 	@Alternate("glGetFramebufferAttachmentParameterivEXT")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetFramebufferAttachmentParameterivEXT2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGenerateMipmapEXT(@GLenum int target);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -169,7 +169,7 @@
 
 	@Alternate("glGetBufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("pointer")
@@ -219,7 +219,7 @@
 
 	@Alternate("glGetQueryiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryiv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -191,7 +191,7 @@
 
 	@Alternate("glGetShaderiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -199,7 +199,7 @@
 
 	@Alternate("glGetProgramiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int maxLength,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -543,7 +543,7 @@
 
 	@Alternate("glGetRenderbufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	boolean glIsFramebuffer(@GLuint int framebuffer);
@@ -577,7 +577,7 @@
 
 	@Alternate("glGetFramebufferAttachmentParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGenerateMipmap(@GLenum int target);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -253,7 +253,7 @@
 
 	@Alternate("glGetActiveUniformsiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetActiveUniformsiv(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
 	                           @Constant(value = "MemoryUtil.getAddress(params.put(1, uniformIndex), 1)", keepParam = true) int uniformIndex, // Reuse params buffer
 	                           @GLenum int pname,
@@ -282,7 +282,7 @@
 
 	@Alternate("glGetActiveUniformBlockiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                                @OutParameter @GLint IntBuffer params);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -59,7 +59,7 @@
 
 	@Alternate("glGetBufferParameteri64v")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetBufferParameteri64v2(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
 
 	// ---------------------------------------------------------------------
@@ -338,7 +338,7 @@
 
 	@Alternate("glGetSynciv")
 	@GLreturn("values")
-	@StripPostfix("values")
+	@StripPostfix(value = "values", postfix = "v")
 	void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
 	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
 	                  @OutParameter IntBuffer values);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -211,7 +211,7 @@
 
 	@Alternate("glGetQueryObjecti64v")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryObjecti64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params);
 
 	@StripPostfix("params")
@@ -219,7 +219,7 @@
 
 	@Alternate("glGetQueryObjectui64v")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryObjectui64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params);
 
 	// --------------------------------------------------------------------

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -227,7 +227,7 @@
 
 	@Alternate("glGetActiveSubroutineUniformiv")
 	@GLreturn("values")
-	@StripPostfix("values")
+	@StripPostfix(value = "values", postfix = "v")
 	void glGetActiveSubroutineUniformiv2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
 	                                     @OutParameter IntBuffer values);
 
@@ -259,7 +259,7 @@
 
 	@Alternate("glGetUniformSubroutineuiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetUniformSubroutineuiv2(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params);
 
 	@StripPostfix("values")
@@ -267,7 +267,7 @@
 
 	@Alternate("glGetProgramStageiv")
 	@GLreturn("values")
-	@StripPostfix("values")
+	@StripPostfix(value = "values", postfix = "v")
 	void glGetProgramStageiv2(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
 
 	// -----------------------------------------------------------------------
@@ -448,7 +448,7 @@
 
 	@Alternate("glGetQueryIndexediv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryIndexediv2(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params);
 
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -188,7 +188,7 @@
 
 	@Alternate("glGetProgramPipelineiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetProgramPipelineiv2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glProgramUniform1i(@GLuint int program, int location, int v0);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -393,7 +393,7 @@
 
 	@Alternate("glGetFramebufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetFramebufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	// -----------------------------------------------------------------------------
@@ -536,7 +536,7 @@
 
 	@Alternate("glGetInternalformati64v")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetInternalformati64v2(@GLenum int target, @GLenum int internalformat,
 	                              @GLenum int pname, @Constant("1") @GLsizei int bufSize, @OutParameter @GLint64 LongBuffer params);
 
@@ -658,7 +658,7 @@
 
 	@Alternate("glGetProgramInterfaceiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetProgramInterfaceiv2(@GLuint int program, @GLenum int programInterface,
 	                              @GLenum int pname, @OutParameter IntBuffer params);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -86,7 +86,7 @@
 
 	@Alternate("glGetVideoivNV")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetVideoivNV2(@GLuint int video_slot, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -94,7 +94,7 @@
 
 	@Alternate("glGetVideouivNV")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetVideouivNV2(@GLuint int video_slot, @GLenum int pname, @OutParameter @GLuint IntBuffer params);
 
 	@StripPostfix("params")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -82,13 +82,13 @@
 
 	@Alternate("glGetProgramivNV")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetProgramivNV2(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLint IntBuffer params);
 
 	void glGetProgramStringNV(@GLuint int programID, @GLenum int parameterName, @OutParameter @Check @GLubyte Buffer paramString);
 
 	@Alternate("glGetProgramStringNV")
-	@Code("\t\tint programLength = glGetProgramNV(programID, GL_PROGRAM_LENGTH_NV);")
+	@Code("\t\tint programLength = glGetProgramiNV(programID, GL_PROGRAM_LENGTH_NV);")
 	@GLreturn(value="paramString", maxLength = "programLength", forceMaxLength = true)
 	void glGetProgramStringNV2(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLchar ByteBuffer paramString);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -68,7 +68,7 @@
 
 	@Alternate("glGetBufferParameterui64vNV")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetBufferParameterui64vNV2(@GLenum int target, @GLenum int pname, @OutParameter @GLuint64EXT LongBuffer params);
 
 	@StripPostfix("params")
@@ -76,7 +76,7 @@
 
 	@Alternate("glGetNamedBufferParameterui64vNV")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetNamedBufferParameterui64vNV2(@GLuint int buffer, @GLenum int pname, @OutParameter @GLuint64EXT LongBuffer params);
 
 	@StripPostfix("result")
@@ -84,7 +84,7 @@
 
 	@Alternate("glGetIntegerui64vNV")
 	@GLreturn("result")
-	@StripPostfix("result")
+	@StripPostfix(value = "result", postfix = "v")
 	void glGetIntegerui64vNV2(@GLenum int value, @OutParameter @GLuint64EXT LongBuffer result);
 
 	void glUniformui64NV(int location, @GLuint64EXT long value);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -107,7 +107,7 @@
 
 	@Alternate("glGetIntegerui64i_vNV")
 	@GLreturn("result")
-	@StripPostfix("result")
+	@StripPostfix(value = "result", postfix = "i_v")
 	void glGetIntegerui64i_vNV2(@GLenum int value, @GLuint int index, @OutParameter @GLuint64EXT LongBuffer result);
 
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -145,7 +145,7 @@
 
 	@Alternate("glGetVideoCaptureivNV")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetVideoCaptureivNV2(@GLuint int video_capture_slot, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -80,7 +80,7 @@
 
 	@Alternate("glGetQueryivEXT")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -113,7 +113,7 @@
 
 	@Alternate("glGetProgramPipelineivEXT")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetProgramPipelineivEXT2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glProgramUniform1iEXT(@GLuint int program, int location, int v0);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -701,7 +701,7 @@
 
 	@Alternate("glGetBufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@NoErrorCheck
@@ -721,7 +721,7 @@
 
 	@Alternate("glGetFramebufferAttachmentParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -737,7 +737,7 @@
 
 	@Alternate("glGetProgramiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int bufsize,
@@ -755,7 +755,7 @@
 
 	@Alternate("glGetRenderbufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -763,7 +763,7 @@
 
 	@Alternate("glGetShaderiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int bufsize,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES30.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES30.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -413,7 +413,7 @@
 
 	@Alternate("glGetQueryiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetQueryiv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -662,7 +662,7 @@
 
 	@Alternate("glGetActiveUniformsiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetActiveUniformsiv(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
 	                           @Constant(value = "MemoryUtil.getAddress(params.put(1, uniformIndex), 1)", keepParam = true) int uniformIndex, // Reuse params buffer
 	                           @GLenum int pname,
@@ -681,7 +681,7 @@
 
 	@Alternate("glGetActiveUniformBlockiv")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                                @OutParameter @GLint IntBuffer params);
 
@@ -742,7 +742,7 @@
 
 	@Alternate("glGetSynciv")
 	@GLreturn("values")
-	@StripPostfix("values")
+	@StripPostfix(value = "values", postfix = "v")
 	void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
 	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
 	                  @OutParameter IntBuffer values);
@@ -752,7 +752,7 @@
 
 	@Alternate("glGetBufferParameteri64v")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetBufferParameteri64v2(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
 
 	void glGenSamplers(@AutoSize("samplers") @GLsizei int count, @OutParameter @GLuint IntBuffer samplers);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java	2012-08-16 18:58:41 UTC (rev 3785)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java	2012-08-18 11:46:25 UTC (rev 3786)
@@ -144,7 +144,7 @@
 
 	@Alternate("glGetRenderbufferParameterivOES")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetRenderbufferParameterivOES2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	boolean glIsFramebufferOES(@GLuint int framebuffer);
@@ -174,7 +174,7 @@
 
 	@Alternate("glGetFramebufferAttachmentParameterivOES")
 	@GLreturn("params")
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "v")
 	void glGetFramebufferAttachmentParameterivOES2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGenerateMipmapOES(@GLenum int target);

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

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

From: <sp...@us...> - 2012-08-16 18:58:51

Revision: 3785
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3785&view=rev
Author:   spasi
Date:     2012-08-16 18:58:41 +0000 (Thu, 16 Aug 2012)
Log Message:
-----------
Changed ALC10's alcGetString and alcOpenDevice to use UTF8 decoding/encoding.
New GL extensions: NV_compute_program5, NV_shader_storage_buffer_object, NV_shader_atomic_counters, NV_deep_texture3D
New GLES extension: QCOM_binning_control

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/MemoryUtil.java
    trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java
    trunk/LWJGL/src/native/common/org_lwjgl_openal_ALC10.c

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_compute_program5.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_deep_texture3D.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_atomic_counters.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_storage_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_binning_control.java

Modified: trunk/LWJGL/src/java/org/lwjgl/MemoryUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/MemoryUtil.java	2012-08-14 12:53:54 UTC (rev 3784)
+++ trunk/LWJGL/src/java/org/lwjgl/MemoryUtil.java	2012-08-16 18:58:41 UTC (rev 3785)
@@ -33,10 +33,7 @@
 
 import java.lang.reflect.Field;
 import java.nio.*;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
+import java.nio.charset.*;
 
 /**
  * [INTERNAL USE ONLY]
@@ -289,6 +286,60 @@
 		return out;
 	}
 
+	public static String decodeASCII(final ByteBuffer buffer) {
+		return decode(buffer, ascii);
+	}
+
+	public static String decodeUTF8(final ByteBuffer buffer) {
+		return decode(buffer, utf8);
+	}
+
+	public static String decodeUTF16(final ByteBuffer buffer) {
+		return decode(buffer, utf16);
+	}
+
+	private static String decode(final ByteBuffer buffer, final Charset charset) {
+		if ( buffer == null )
+			return null;
+
+		return decodeImpl(buffer, charset);
+	}
+
+	private static String decodeImpl(final ByteBuffer in, final Charset charset) {
+		final CharsetDecoder decoder = charset.newDecoder(); // decoders are not thread-safe, create a new one on every call
+
+		int n = (int)(in.remaining() * decoder.averageCharsPerByte());
+		CharBuffer out = BufferUtils.createCharBuffer(n);
+
+		if ( (n == 0) && (in.remaining() == 0) )
+			return "";
+
+		decoder.reset();
+		for (; ; ) {
+			CoderResult cr = in.hasRemaining() ? decoder.decode(in, out, true) : CoderResult.UNDERFLOW;
+			if ( cr.isUnderflow() )
+				cr = decoder.flush(out);
+
+			if ( cr.isUnderflow() )
+				break;
+			if ( cr.isOverflow() ) {
+				n = 2 * n + 1;    // Ensure progress; n might be 0!
+				CharBuffer o = BufferUtils.createCharBuffer(n);
+				out.flip();
+				o.put(out);
+				out = o;
+				continue;
+			}
+			try {
+				cr.throwException();
+			} catch (CharacterCodingException e) {
+				throw new RuntimeException(e);
+			}
+		}
+		out.flip();
+		return out.toString();
+	}
+
 	/** A null-terminated CharSequence. */
 	private static class CharSequenceNT implements CharSequence {
 

Modified: trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java	2012-08-14 12:53:54 UTC (rev 3784)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/ALC10.java	2012-08-16 18:58:41 UTC (rev 3785)
@@ -152,12 +152,11 @@
 	 * @return String property from device
 	 */
 	public static String alcGetString(ALCdevice device, int pname) {
-		String result;
-		result = nalcGetString(getDevice(device), pname);
+		ByteBuffer buffer = nalcGetString(getDevice(device), pname);
 		Util.checkALCError(device);
-		return result;
+		return MemoryUtil.decodeUTF8(buffer);
 	}
-	static native String nalcGetString(long device, int pname);
+	static native ByteBuffer nalcGetString(long device, int pname);
 
 	/**
 	 * The application can query ALC for information using an integer query function.
@@ -199,7 +198,7 @@
 	 * @return opened device, or null
 	 */
 	public static ALCdevice alcOpenDevice(String devicename) {
-		ByteBuffer buffer = MemoryUtil.encodeASCII(devicename);
+		ByteBuffer buffer = MemoryUtil.encodeUTF8(devicename);
 		long device_address = nalcOpenDevice(MemoryUtil.getAddressSafe(buffer));
 		if(device_address != 0) {
 			ALCdevice device = new ALCdevice(device_address);

Modified: trunk/LWJGL/src/native/common/org_lwjgl_openal_ALC10.c
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_openal_ALC10.c	2012-08-14 12:53:54 UTC (rev 3784)
+++ trunk/LWJGL/src/native/common/org_lwjgl_openal_ALC10.c	2012-08-16 18:58:41 UTC (rev 3785)
@@ -81,8 +81,8 @@
  * C Specification:
  * ALubyte * alcGetString(ALCdevice *device, ALenum token);
  */
-static jstring JNICALL Java_org_lwjgl_openal_ALC10_nalcGetString (JNIEnv *env, jclass clazz, jlong deviceaddress, jint token) {
-	const char* alcString = (const char*) alcGetString((ALCdevice*)((intptr_t)deviceaddress), (ALenum) token);
+static jobject JNICALL Java_org_lwjgl_openal_ALC10_nalcGetString (JNIEnv *env, jclass clazz, jlong deviceaddress, jint token) {
+	char* alcString = (char*) alcGetString((ALCdevice*)((intptr_t)deviceaddress), (ALenum) token);
 	int length;
 	int i=1;
 
@@ -111,7 +111,8 @@
 		default:	// e.g. ALC_DEFAULT_ALL_DEVICES_SPECIFIER
 			length = strlen(alcString);
 	}
-	return NewStringNativeWithLength(env, alcString, length);
+	//return NewStringNativeWithLength(env, alcString, length);
+	return safeNewBuffer(env, alcString, length);
 }
 
 /**
@@ -263,7 +264,7 @@
 #endif
 JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC10_initNativeStubs(JNIEnv *env, jclass clazz) {
 	JavaMethodAndExtFunction functions[] = {
-		{"nalcGetString", "(JI)Ljava/lang/String;", (void*)&Java_org_lwjgl_openal_ALC10_nalcGetString, "alcGetString", (void*)&alcGetString, false},
+		{"nalcGetString", "(JI)Ljava/nio/ByteBuffer;", (void*)&Java_org_lwjgl_openal_ALC10_nalcGetString, "alcGetString", (void*)&alcGetString, false},
 		{"nalcGetIntegerv", "(JIIJ)V", (void*)&Java_org_lwjgl_openal_ALC10_nalcGetIntegerv, "alcGetIntegerv", (void*)&alcGetIntegerv, false},
 		{"nalcOpenDevice", "(J)J", (void*)&Java_org_lwjgl_openal_ALC10_nalcOpenDevice, "alcOpenDevice", (void*)&alcOpenDevice, false},
 		{"nalcCloseDevice", "(J)Z", (void*)&Java_org_lwjgl_openal_ALC10_nalcCloseDevice, "alcCloseDevice", (void*)&alcCloseDevice, false},

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_compute_program5.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_compute_program5.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_compute_program5.java	2012-08-16 18:58:41 UTC (rev 3785)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2002-2012 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 NV_compute_program5 {
+
+	/**
+	 * Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled,
+	 * by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev, and by the &lt;target&gt; parameter of ProgramStringARB,
+	 * BindProgramARB, ProgramEnvParameter4[df][v]ARB,
+	 * ProgramLocalParameter4[df][v]ARB, GetProgramEnvParameter[df]vARB,
+	 * GetProgramLocalParameter[df]vARB, GetProgramivARB and
+	 * GetProgramStringARB:
+	 */
+	int GL_COMPUTE_PROGRAM_NV = 0x90FB;
+
+	/**
+	 * Accepted by the &lt;target&gt; parameter of ProgramBufferParametersfvNV,
+	 * ProgramBufferParametersIivNV, and ProgramBufferParametersIuivNV,
+	 * BindBufferRangeNV, BindBufferOffsetNV, BindBufferBaseNV, and BindBuffer
+	 * and the &lt;value&gt; parameter of GetIntegerIndexedvEXT:
+	 */
+	int GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV = 0x90FC;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_deep_texture3D.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_deep_texture3D.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_deep_texture3D.java	2012-08-16 18:58:41 UTC (rev 3785)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2002-2012 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 NV_deep_texture3D {
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv
+	 * and GetFloatv:
+	 */
+	int GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV = 0x90D0,
+		GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV        = 0x90D1;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_atomic_counters.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_atomic_counters.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_atomic_counters.java	2012-08-16 18:58:41 UTC (rev 3785)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2012 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 NV_shader_atomic_counters {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_storage_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_storage_buffer_object.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_storage_buffer_object.java	2012-08-16 18:58:41 UTC (rev 3785)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2012 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 NV_shader_storage_buffer_object {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_binning_control.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_binning_control.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/QCOM_binning_control.java	2012-08-16 18:58:41 UTC (rev 3785)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+public interface QCOM_binning_control {
+
+	/** Accepted by the &lt;target&gt; parameter of Hint: */
+	int GL_BINNING_CONTROL_HINT_QCOM = 0x8FB0;
+
+	/** Accepted by the &lt;hint&gt; parameter of Hint: */
+	int GL_CPU_OPTIMIZED_QCOM                = 0x8FB1,
+		GL_GPU_OPTIMIZED_QCOM                = 0x8FB2,
+		GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM = 0x8FB3,
+		GL_DONT_CARE                         = 0x1100;
+
+}
\ No newline at end of file

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

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

From: <sp...@us...> - 2012-08-14 12:54:01

Revision: 3784
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3784&view=rev
Author:   spasi
Date:     2012-08-14 12:53:54 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Removed ARB_debug_group, ARB_debug_label and ARB_debug_output2. They're part of KHR_debug and weren't supposed to be posted in the GL registry.

Removed Paths:
-------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_group.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_label.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output2.java

Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_group.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_group.java	2012-08-07 15:14:03 UTC (rev 3783)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_group.java	2012-08-14 12:53:54 UTC (rev 3784)
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2002-2012 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 org.lwjgl.util.generator.opengl.GLchar;
-import org.lwjgl.util.generator.opengl.GLenum;
-import org.lwjgl.util.generator.opengl.GLsizei;
-import org.lwjgl.util.generator.opengl.GLuint;
-
-import java.nio.ByteBuffer;
-
-public interface ARB_debug_group {
-
-	/**
-	 * Tokens accepted or provided by the &lt;type&gt; parameters of
-	 * DebugMessageControl, DebugMessageInsertand DEBUGPROC,
-	 * and the &lt;types&gt; parameter of GetDebugMessageLog:
-	 */
-	int GL_DEBUG_TYPE_MARKER = 0x8268;
-
-	/**
-	 * Tokens accepted or provided by the &lt;type&gt; parameters of
-	 * DebugMessageControl and DEBUGPROC, and the &lt;types&gt; parameter of
-	 * GetDebugMessageLog:
-	 */
-	int GL_DEBUG_TYPE_PUSH_GROUP = 0x8269,
-		GL_DEBUG_TYPE_POP_GROUP  = 0x826A;
-
-	/**
-	 * Tokens accepted or provided by the &lt;severity&gt; parameters of
-	 * DebugMessageControl, DebugMessageInsert and DEBUGPROC
-	 * callback functions, and the &lt;severities&gt; parameter of
-	 * GetDebugMessageLog:
-	 */
-	int GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B;
-
-	/**
-	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
-	 * GetFloatv, GetDoublev, and GetInteger64v:
-	 */
-	int GL_MAX_DEBUG_GROUP_STACK_DEPTH = 0x826C,
-		GL_DEBUG_GROUP_STACK_DEPTH     = 0x826D;
-
-	/** Returned by GetError: */
-	int GL_STACK_UNDERFLOW = 0x0504,
-		GL_STACK_OVERFLOW  = 0x0503;
-
-	@Reuse("GL43")
-	void glPushDebugGroup(@GLenum int source, @GLuint int id, @AutoSize("message") @GLsizei int length,
-	                      @Const @GLchar ByteBuffer message);
-
-	@Reuse("GL43")
-	@Alternate("glPushDebugGroup")
-	void glPushDebugGroup(@GLenum int source, @GLuint int id, @Constant("message.length()") @GLsizei int length,
-	                      CharSequence message);
-
-	@Reuse("GL43")
-	void glPopDebugGroup();
-
-}
\ No newline at end of file

Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_label.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_label.java	2012-08-07 15:14:03 UTC (rev 3783)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_label.java	2012-08-14 12:53:54 UTC (rev 3784)
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2002-2012 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 org.lwjgl.util.generator.opengl.*;
-
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-
-public interface ARB_debug_label {
-
-	/**
-	 * Tokens accepted or provided by the &lt;identifier&gt; parameters of
-	 * ObjectLabel and GetObjectLabel:
-	 */
-	int GL_BUFFER           = 0x82E0,
-		GL_SHADER           = 0x82E1,
-		GL_PROGRAM          = 0x82E2,
-		GL_QUERY            = 0x82E3,
-		GL_PROGRAM_PIPELINE = 0x82E4,
-		GL_SAMPLER          = 0x82E6,
-		GL_DISPLAY_LIST     = 0x82E7;
-
-	/**
-	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
-	 * GetFloatv, GetDoublev, and GetInteger64v:
-	 */
-	int GL_MAX_LABEL_LENGTH = 0x82E8;
-
-	@Reuse("GL43")
-	void glObjectLabel(@GLenum int identifier, @GLuint int name, @AutoSize(value = "label", canBeNull = true) @GLsizei int length,
-	                   @Check(canBeNull = true) @Const @GLchar ByteBuffer label);
-
-	@Reuse("GL43")
-	@Alternate("glObjectLabel")
-	void glObjectLabel(@GLenum int identifier, @GLuint int name, @Constant("label.length()") @GLsizei int length,
-	                   CharSequence label);
-
-	@Reuse("GL43")
-	void glGetObjectLabel(@GLenum int identifier, @GLuint int name, @AutoSize("label") @GLsizei int bufSize,
-	                      @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
-	                      @OutParameter @GLchar ByteBuffer label);
-
-	@Reuse("GL43")
-	@Alternate("glGetObjectLabel")
-	@GLreturn(value = "label", maxLength = "bufSize")
-	void glGetObjectLabel2(@GLenum int identifier, @GLuint int name, @GLsizei int bufSize,
-	                       @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(label_length)") IntBuffer length,
-	                       @OutParameter @GLchar ByteBuffer label);
-
-	@Reuse("GL43")
-	void glObjectPtrLabel(@PointerWrapper("GLvoid *") org.lwjgl.PointerWrapper ptr, @AutoSize(value = "label", canBeNull = true) @GLsizei int length,
-	                      @Check(canBeNull = true) @Const @GLchar ByteBuffer label);
-
-	@Reuse("GL43")
-	@Alternate("glObjectPtrLabel")
-	void glObjectPtrLabel(@PointerWrapper("GLvoid *") org.lwjgl.PointerWrapper ptr, @Constant("label.length()") @GLsizei int length,
-	                      CharSequence label);
-
-	@Reuse("GL43")
-	void glGetObjectPtrLabel(@PointerWrapper("GLvoid *") org.lwjgl.PointerWrapper ptr, @AutoSize("label") @GLsizei int bufSize,
-	                         @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
-	                         @OutParameter @GLchar ByteBuffer label);
-
-	@Reuse("GL43")
-	@Alternate("glGetObjectPtrLabel")
-	@GLreturn(value = "label", maxLength = "bufSize")
-	void glGetObjectPtrLabel2(@PointerWrapper("GLvoid *") org.lwjgl.PointerWrapper ptr, @GLsizei int bufSize,
-	                          @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(label_length)") IntBuffer length,
-	                          @OutParameter @GLchar ByteBuffer label);
-
-}
\ No newline at end of file

Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output2.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output2.java	2012-08-07 15:14:03 UTC (rev 3783)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output2.java	2012-08-14 12:53:54 UTC (rev 3784)
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2002-2012 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_debug_output2 {
-
-	/** Returned by GetIntegerv when &lt;pname&gt; is CONTEXT_FLAGS: */
-	int GL_CONTEXT_FLAG_DEBUG_BIT = 0x00000002;
-
-	/**
-	 * Tokens accepted by the &lt;target&gt; parameters of Enable, Disable,
-	 * and IsEnabled:
-	 */
-	int GL_DEBUG_OUTPUT = 0x92E0;
-
-}
\ No newline at end of file

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

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

From: <sp...@us...> - 2012-08-07 15:14:17

Revision: 3783
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3783&view=rev
Author:   spasi
Date:     2012-08-07 15:14:03 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Added support for OpenGL 4.3 and OpenGL ES 3.0.
Modified the generator process to use relative paths. We were hitting the command line length limit on Windows.
Some extension improvements, fixes and spec updates.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/platform_build/build-generator.xml
    trunk/LWJGL/src/java/org/lwjgl/opengl/CallbackUtil.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/APIUtil.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/ContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/GLContext.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/StateTracker.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/SignatureTranslator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESGeneratorProcessorFactory.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/opengl/GLESTypeMap.java
    trunk/LWJGL/src/native/common/opengl/extgl.h
    trunk/LWJGL/src/native/common/opengl/org_lwjgl_opengl_CallbackUtil.c
    trunk/LWJGL/src/native/common/opengles/extgl.h
    trunk/LWJGL/src/native/common/opengles/extgl_types.h
    trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c
    trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_indirect.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/opengl/KHRDebugCallback.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/CallbackUtil.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/FastIntMap.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/GLSync.java
    trunk/LWJGL/src/java/org/lwjgl/opengles/KHRDebugCallback.java
    trunk/LWJGL/src/native/common/opengles/org_lwjgl_opengles_CallbackUtil.c
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_ES3_compatibility.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_arrays_of_arrays.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_clear_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_compute_shader.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_image.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_group.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_label.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output2.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_explicit_uniform_location.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_fragment_layer_viewport.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_invalidate_subdata.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multi_draw_indirect.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_robust_buffer_access_behavior.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_robustness_isolation.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_image_size.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_storage_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_stencil_texturing.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_range.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_query_levels.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_storage_multisample.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_view.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_binding.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/KHR_debug.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/KHR_texture_compression_astc_ldr.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES30.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/KHR_debug.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/KHR_texture_compression_astc_ldr.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_required_internalformat.java
    trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_surfaceless_context.java

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2012-07-14 23:29:21 UTC (rev 3782)
+++ trunk/LWJGL/build.xml	2012-08-07 15:14:03 UTC (rev 3783)
@@ -177,7 +177,7 @@
 		<!-- ================================================================== -->
 		<!-- Generate a list of the OpenGL extension classes					-->
 		<!-- ================================================================== -->
-		<fileset id="opengl-template-fileset" dir="${lwjgl.src}/generated" includes="${opengl-template-pattern}"/>
+		<fileset id="opengl-template-fileset" dir="${lwjgl.src}/generated/org/lwjgl/opengl" includes="${opengl-template-pattern}"/>
 		<property name="opengl-template-files" refid="opengl-template-fileset"/>
 
 		<tempfile property="temp.file"/>
@@ -187,7 +187,7 @@
 			<filterchain>
 				<tokenfilter delimoutput=",">
 					<stringtokenizer delims=";"/>
-					<replaceregex pattern="org\${file.separator}lwjgl\${file.separator}opengl\${file.separator}(.+)[.]java"
+					<replaceregex pattern="(.+)[.]java"
 					              replace="org/lwjgl/opengl/\1.class"/>
 				</tokenfilter>
 			</filterchain>
@@ -350,6 +350,7 @@
 			<class name="org.lwjgl.opengles.EGLKHRReusableSync"/>
 			<class name="org.lwjgl.opengles.EGLNVSync"/>
 			<class name="org.lwjgl.opengles.GLContext"/>
+			<class name="org.lwjgl.opengles.CallbackUtil"/>
 		</javah>
 	</target>
 
@@ -626,7 +627,7 @@
 			<bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
 		</javadoc>
 	</target>
-	
+
 	<!-- get and copy nightly binaries into libs folder -->
 	<target name="copy-nightly-binaries" depends="-initialize" description="Copies latest successful nightly binaries into appropriate libs folder">
 		<delete file="${lwjgl.temp}/lwjgl-${lwjgl.version}.zip" failonerror="false"/>
@@ -635,7 +636,7 @@
 		 	<patternset>
 				<include name="**/native/**/*lwjgl*"/>
 			</patternset>
-			<globmapper from="lwjgl-${lwjgl.version}/native/*" to="*"/>	
+			<globmapper from="lwjgl-${lwjgl.version}/native/*" to="*"/>
 		</unzip>
-	</target>	
+	</target>
 </project>

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2012-07-14 23:29:21 UTC (rev 3782)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2012-08-07 15:14:03 UTC (rev 3783)
@@ -15,11 +15,17 @@
 	<property name="lwjgl.version" 				value="2.8.5" />
 	<property name="lwjgl.web" 						location="www" />
 
-	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>
-	<property name="opengles-template-pattern" value="org/lwjgl/opengles/GLES*.java,org/lwjgl/opengles/ARB*.java,org/lwjgl/opengles/EXT*.java,org/lwjgl/opengles/AMD*.java,org/lwjgl/opengles/ANGLE*.java,org/lwjgl/opengles/APPLE*.java,org/lwjgl/opengles/ARM*.java,org/lwjgl/opengles/DMP*.java,org/lwjgl/opengles/IMG*.java,org/lwjgl/opengles/NV*.java,org/lwjgl/opengles/OES*.java,org/lwjgl/opengles/QCOM*.java,org/lwjgl/opengles/VIV*.java"/>
-    <property name="opencl-template-pattern-extensions" value="org/lwjgl/opencl/KHR*.java,org/lwjgl/opencl/EXT*.java,org/lwjgl/opencl/APPLE*.java,org/lwjgl/opencl/AMD*.java,org/lwjgl/opencl/INTEL*.java,org/lwjgl/opencl/NV*.java"/>
-    <property name="opencl-template-pattern" value="org/lwjgl/opencl/CL*.java,${opencl-template-pattern-extensions}"/>
+	<property name="lwjgl.src.templates.al" location="${lwjgl.src.templates}/org/lwjgl/openal"/>
+	<property name="lwjgl.src.templates.gl" location="${lwjgl.src.templates}/org/lwjgl/opengl"/>
+	<property name="lwjgl.src.templates.gles" location="${lwjgl.src.templates}/org/lwjgl/opengles"/>
+	<property name="lwjgl.src.templates.cl" location="${lwjgl.src.templates}/org/lwjgl/opencl"/>
 
+	<property name="openal-template-pattern" value="AL*.java,EFX*.java"/>
+	<property name="opengl-template-pattern" value="GL*.java,ARB*.java,EXT*.java,KHR*.java,AMD*.java,APPLE*.java,ATI*.java,NV*.java,NVX*.java,HP*.java,IBM*.java,SUN*.java,SGIS*.java,GREMEDY*.java"/>
+	<property name="opengles-template-pattern" value="GLES*.java,ARB*.java,EXT*.java,KHR*.java,AMD*.java,ANGLE*.java,APPLE*.java,ARM*.java,DMP*.java,IMG*.java,NV*.java,OES*.java,QCOM*.java,VIV*.java"/>
+    <property name="opencl-template-pattern-extensions" value="KHR*.java,EXT*.java,APPLE*.java,AMD*.java,INTEL*.java,NV*.java"/>
+    <property name="opencl-template-pattern" value="CL*.java,${opencl-template-pattern-extensions}"/>
+
 	<!-- ================================================================== -->
 	<!-- Filesets used for targets 																					-->
 	<!-- ================================================================== -->

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2012-07-14 23:29:21 UTC (rev 3782)
+++ trunk/LWJGL/platform_build/build-generator.xml	2012-08-07 15:14:03 UTC (rev 3783)
@@ -30,8 +30,10 @@
 			<include name="org/lwjgl/opengl/GLSync.java"/>
             <include name="org/lwjgl/opengl/AMDDebugOutputCallback.java"/>
             <include name="org/lwjgl/opengl/ARBDebugOutputCallback.java"/>
+			<include name="org/lwjgl/opengl/KHRDebugCallback.java"/>
 			<!-- OpenGL ES -->
 			<include name="org/lwjgl/opengles/EGLImageOES.java"/>
+			<include name="org/lwjgl/opengles/KHRDebugCallback.java"/>
             <!-- OpenCL -->
             <include name="org/lwjgl/opencl/CLPlatform.java"/>
             <include name="org/lwjgl/opencl/CLDevice.java"/>
@@ -57,7 +59,7 @@
 
 	<!-- Generate OpenAL -->
 	<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.al}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
@@ -67,14 +69,15 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated/openal"/>
+			<arg value="-Abinpath=${lwjgl.bin}"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.openal.ALTypeMap"/>
-			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java, org/lwjgl/openal/EFX10.java"/>
+			<fileset dir="${lwjgl.src.templates.al}" includes="${openal-template-pattern}"/>
 		</apply>
 	</target>
 
 	<!-- Generate OpenAL [DEBUG] -->
 	<target name="generate-openal-debug" depends="generators" description="Generates java and native source for AL">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.al}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
@@ -84,9 +87,10 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated/openal"/>
+			<arg value="-Abinpath=${lwjgl.bin}"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.openal.ALTypeMap"/>
 			<arg value="-Ageneratechecks"/>
-			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java, org/lwjgl/openal/EFX10.java"/>
+			<fileset dir="${lwjgl.src.templates.al}" includes="${openal-template-pattern}"/>
 		</apply>
 	</target>
 
@@ -98,7 +102,7 @@
 
 	<!-- Generate OpenGL -->
 	<target name="generate-opengl" depends="generators" description="Generates java and native source for GL">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.gl}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
@@ -108,15 +112,16 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated/opengl"/>
+			<arg value="-Abinpath=${lwjgl.bin}"/>
 			<arg value="-Acontextspecific"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLTypeMap"/>
-			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
+			<fileset dir="${lwjgl.src.templates.gl}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>
 
 	<!-- Generate OpenGL [DEBUG] -->
 	<target name="generate-opengl-debug" depends="generators" description="Generates debug java and native source for GL">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.gl}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
@@ -126,16 +131,17 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated/opengl"/>
+			<arg value="-Abinpath=${lwjgl.bin}"/>
 			<arg value="-Ageneratechecks"/>
 			<arg value="-Acontextspecific"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLTypeMap"/>
-			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
+			<fileset dir="${lwjgl.src.templates.gl}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>
 
 	<!-- Generate OpenGL references -->
 	<target name="generate-opengl-references" depends="generators" description="Generates java and native source for GL">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.gl}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.opengl.GLReferencesGeneratorProcessorFactory"/>
@@ -143,13 +149,13 @@
 			<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
 			<arg value="-s"/>
 			<arg path="${lwjgl.src}/generated"/>
-			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
+			<fileset dir="${lwjgl.src.templates.gl}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>
 
 	<!-- Generate OpenGL context capabilities -->
 	<target name="generate-opengl-capabilities" depends="generators" description="Generates java and native source for GL">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.gl}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.opengl.GLGeneratorProcessorFactory"/>
@@ -158,13 +164,13 @@
 			<arg value="-s"/>
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-Acontextspecific"/>
-			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
+			<fileset dir="${lwjgl.src.templates.gl}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>
 
 	<!-- Generate OpenGL context capabilities [DEBUG] -->
 	<target name="generate-opengl-capabilities-debug" depends="generators" description="Generates debug java and native source for GL">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.gl}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.opengl.GLGeneratorProcessorFactory"/>
@@ -174,7 +180,7 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-Ageneratechecks"/>
 			<arg value="-Acontextspecific"/>
-			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
+			<fileset dir="${lwjgl.src.templates.gl}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>
 
@@ -186,7 +192,7 @@
 
 	<!-- Generate OpenGL ES -->
 	<target name="generate-opengles" depends="generators" description="Generates java and native source for GL ES">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.gles}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
@@ -196,15 +202,16 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated/opengles"/>
+			<arg value="-Abinpath=${lwjgl.bin}"/>
 			<!--<arg value="-Acontextspecific"/>-->
 			<arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLESTypeMap"/>
-			<fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/>
+			<fileset dir="${lwjgl.src.templates.gles}" includes="${opengles-template-pattern}"/>
 		</apply>
 	</target>
 
 	<!-- Generate OpenGL ES [DEBUG] -->
 	<target name="generate-opengles-debug" depends="generators" description="Generates debug java and native source for GL ES">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.gles}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
@@ -214,16 +221,17 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated/opengles"/>
+			<arg value="-Abinpath=${lwjgl.bin}"/>
 			<arg value="-Ageneratechecks"/>
 			<!--<arg value="-Acontextspecific"/>-->
 			<arg value="-Atypemap=org.lwjgl.util.generator.opengl.GLESTypeMap"/>
-			<fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/>
+			<fileset dir="${lwjgl.src.templates.gles}" includes="${opengles-template-pattern}"/>
 		</apply>
 	</target>
 
 	<!-- Generate OpenGL ES context capabilities -->
 	<target name="generate-opengles-capabilities" depends="generators" description="Generates java and native source for GL ES">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.gles}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.opengl.GLESGeneratorProcessorFactory"/>
@@ -232,13 +240,13 @@
 			<arg value="-s"/>
 			<arg path="${lwjgl.src}/generated"/>
 			<!--<arg value="-Acontextspecific"/>-->
-			<fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/>
+			<fileset dir="${lwjgl.src.templates.gles}" includes="${opengles-template-pattern}"/>
 		</apply>
 	</target>
 
 	<!-- Generate OpenGL ES context capabilities [DEBUG] -->
 	<target name="generate-opengles-capabilities-debug" depends="generators" description="Generates debug java and native source for GL ES">
-		<apply executable="apt" parallel="true">
+		<apply executable="apt" parallel="true" dir="${lwjgl.src.templates.gles}" relative="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
 			<arg value="org.lwjgl.util.generator.opengl.GLESGeneratorProcessorFactory"/>
@@ -248,7 +256,7 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-Ageneratechecks"/>
 			<!--<arg value="-Acontextspecific"/>-->
-			<fileset dir="${lwjgl.src.templates}" includes="${opengles-template-pattern}"/>
+			<fileset dir="${lwjgl.src.templates.gles}" includes="${opengles-template-pattern}"/>
 		</apply>
 	</target>
 
@@ -260,7 +268,7 @@
 
 	<!-- Generate OpenCL -->
     <target name="generate-opencl" depends="generators" description="Generates java and native source for CL">
-        <apply executable="apt" parallel="true">
+        <apply executable="apt" parallel="true" dir="${lwjgl.src.templates.cl}" relative="true">
             <arg value="-nocompile"/>
             <arg value="-factory"/>
             <arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
@@ -270,15 +278,16 @@
             <arg path="${lwjgl.src}/generated"/>
             <arg value="-d"/>
             <arg path="${lwjgl.src.native}/generated/opencl"/>
+	        <arg value="-Abinpath=${lwjgl.bin}"/>
             <arg value="-Acontextspecific"/>
             <arg value="-Atypemap=org.lwjgl.util.generator.opencl.CLTypeMap"/>
-            <fileset dir="${lwjgl.src.templates}" includes="${opencl-template-pattern}"/>
+            <fileset dir="${lwjgl.src.templates.cl}" includes="${opencl-template-pattern}"/>
         </apply>
     </target>
 
     <!-- Generate OpenCL [DEBUG] -->
     <target name="generate-opencl-debug" depends="generators" description="Generates debug java and native source for CL">
-        <apply executable="apt" parallel="true">
+        <apply executable="apt" parallel="true" dir="${lwjgl.src.templates.cl}" relative="true">
             <arg value="-nocompile"/>
             <arg value="-factory"/>
             <arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
@@ -288,16 +297,17 @@
             <arg path="${lwjgl.src}/generated"/>
             <arg value="-d"/>
             <arg path="${lwjgl.src.native}/generated/opencl"/>
+	        <arg value="-Abinpath=${lwjgl.bin}"/>
             <arg value="-Ageneratechecks"/>
             <arg value="-Acontextspecific"/>
             <arg value="-Atypemap=org.lwjgl.util.generator.opencl.CLTypeMap"/>
-            <fileset dir="${lwjgl.src.templates}" includes="${opencl-template-pattern}"/>
+            <fileset dir="${lwjgl.src.templates.cl}" includes="${opencl-template-pattern}"/>
         </apply>
     </target>
 
     <!-- Generate OpenCL capabilities -->
     <target name="generate-opencl-capabilities" depends="generators" description="Generates capabilities for CL">
-        <apply executable="apt" parallel="true">
+        <apply executable="apt" parallel="true" dir="${lwjgl.src.templates.cl}" relative="true">
             <arg value="-nocompile"/>
             <arg value="-factory"/>
             <arg value="org.lwjgl.util.generator.opencl.CLGeneratorProcessorFactory"/>
@@ -306,13 +316,13 @@
             <arg value="-s"/>
             <arg path="${lwjgl.src}/generated"/>
             <arg value="-Acontextspecific"/>
-            <fileset dir="${lwjgl.src.templates}" includes="${opencl-template-pattern}"/>
+            <fileset dir="${lwjgl.src.templates.cl}" includes="${opencl-template-pattern}"/>
         </apply>
     </target>
 
     <!-- Generate OpenCL capabilities [DEBUG] -->
     <target name="generate-opencl-capabilities-debug" depends="generators" description="Generates debug capabilities for CL">
-        <apply executable="apt" parallel="true">
+        <apply executable="apt" parallel="true" dir="${lwjgl.src.templates.cl}" relative="true">
             <arg value="-nocompile"/>
             <arg value="-factory"/>
             <arg value="org.lwjgl.util.generator.opencl.CLGeneratorProcessorFactory"/>
@@ -322,7 +332,7 @@
             <arg path="${lwjgl.src}/generated"/>
             <arg value="-Ageneratechecks"/>
             <arg value="-Acontextspecific"/>
-            <fileset dir="${lwjgl.src.templates}" includes="${opencl-template-pattern}"/>
+            <fileset dir="${lwjgl.src.templates.cl}" includes="${opencl-template-pattern}"/>
         </apply>
     </target>
 </project>

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/CallbackUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/CallbackUtil.java	2012-07-14 23:29:21 UTC (rev 3782)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/CallbackUtil.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -45,6 +45,8 @@
 	private static final Map<ContextCapabilities, Long> contextUserParamsARB = new HashMap<ContextCapabilities, Long>();
 	/** Context -> Long */
 	private static final Map<ContextCapabilities, Long> contextUserParamsAMD = new HashMap<ContextCapabilities, Long>();
+	/** Context -> Long */
+	private static final Map<ContextCapabilities, Long> contextUserParamsKHR = new HashMap<ContextCapabilities, Long>();
 
 	private CallbackUtil() {}
 
@@ -115,6 +117,10 @@
 		userParam = contextUserParamsAMD.remove(caps);
 		if ( userParam != null )
 			deleteGlobalRef(userParam);
+
+		userParam = contextUserParamsKHR.remove(caps);
+		if ( userParam != null )
+			deleteGlobalRef(userParam);
 	}
 
 	// --------- [ ARB_debug_output ] ---------
@@ -157,4 +163,24 @@
 		registerContextCallback(userParam, contextUserParamsAMD);
 	}
 
+	// --------- [ KHR_debug ] ---------
+
+	/**
+	 * Returns the memory address of the native function we pass to glDebugMessageCallback.
+	 *
+	 * @return the callback function address
+	 */
+	static native long getDebugCallbackKHR();
+
+	/**
+	 * Associates the current OpenGL context with the specified global reference. If there
+	 * is no context current, the global reference is deleted and an exception is thrown.
+	 * Any previous callback registrations will be cleared.
+	 *
+	 * @param userParam the global reference pointer
+	 */
+	static void registerContextCallbackKHR(final long userParam) {
+		registerContextCallback(userParam, contextUserParamsKHR);
+	}
+
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2012-07-14 23:29:21 UTC (rev 3782)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -63,12 +63,14 @@
 	// Same values for GLX & WGL
 	private static final int CONTEXT_ES2_PROFILE_BIT_EXT = 0x00000004;
 
-	private static final int CONTEXT_ROBUST_ACCESS_BIT_ARB = 0x00000004;
+	private static final int CONTEXT_ROBUST_ACCESS_BIT_ARB           = 0x00000004;
 	private static final int CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB = 0x8256;
 	private static final int
-		NO_RESET_NOTIFICATION_ARB = 0x8261,
-		LOSE_CONTEXT_ON_RESET_ARB = 0x8252;
+	                         NO_RESET_NOTIFICATION_ARB               = 0x8261,
+		LOSE_CONTEXT_ON_RESET_ARB                                    = 0x8252;
 
+	private static final int CONTEXT_RESET_ISOLATION_BIT_ARB = 0x00000008;
+
 	private int majorVersion;
 	private int minorVersion;
 
@@ -83,6 +85,7 @@
 	private boolean profileES;
 
 	private boolean loseContextOnReset;
+	private boolean contextResetIsolation;
 
 	public ContextAttribs() {
 		this(1, 0);
@@ -91,7 +94,7 @@
 	public ContextAttribs(final int majorVersion, final int minorVersion) {
 		if ( majorVersion < 0 || 4 < majorVersion ||
 		     minorVersion < 0 ||
-		     (majorVersion == 4 && 2 < minorVersion) ||
+		     (majorVersion == 4 && 3 < minorVersion) ||
 		     (majorVersion == 3 && 3 < minorVersion) ||
 		     (majorVersion == 2 && 1 < minorVersion) ||
 		     (majorVersion == 1 && 5 < minorVersion) )
@@ -241,6 +244,15 @@
 		return attribs;
 	}
 
+	public ContextAttribs withContextResetIsolation(final boolean contextResetIsolation) {
+		if ( contextResetIsolation == this.contextResetIsolation )
+			return this;
+
+		final ContextAttribs attribs = new ContextAttribs(this);
+		attribs.contextResetIsolation = contextResetIsolation;
+		return attribs;
+	}
+
 	private static ContextAttribsImplementation getImplementation() {
 		switch ( LWJGLUtil.getPlatform() ) {
 			case LWJGLUtil.PLATFORM_LINUX:
@@ -272,6 +284,8 @@
 			flags |= implementation.getForwardCompatibleBit();
 		if ( robustAccess )
 			flags |= CONTEXT_ROBUST_ACCESS_BIT_ARB;
+		if ( contextResetIsolation )
+			flags |= CONTEXT_RESET_ISOLATION_BIT_ARB;
 		if ( 0 < flags )
 			attribCount++;
 
@@ -285,6 +299,9 @@
 		if ( 0 < profileMask )
 			attribCount++;
 
+		if ( loseContextOnReset )
+			attribCount++;
+
 		if ( attribCount == 0 )
 			return null;
 

Added: trunk/LWJGL/src/java/org/lwjgl/opengl/KHRDebugCallback.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/KHRDebugCallback.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/KHRDebugCallback.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -0,0 +1,205 @@
+/*
+ * 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.PointerWrapperAbstract;
+
+/**
+ * Instances of this class are needed to use the callback functionality of the KHR_debug extension.
+ * Users of this class may provide implementations of the {@code Handler} interface to receive notifications.
+ * The same {@code Handler} instance may be used by different contexts but it is not recommended.
+ * Handler notifications are synchronized.
+ *
+ * @author Spasi
+ */
+public final class KHRDebugCallback extends PointerWrapperAbstract {
+
+	/** Severity levels. */
+	private static final int
+		GL_DEBUG_SEVERITY_HIGH         = 0x9146,
+		GL_DEBUG_SEVERITY_MEDIUM       = 0x9147,
+		GL_DEBUG_SEVERITY_LOW          = 0x9148,
+		GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B;
+
+	/** Sources. */
+	private static final int
+		GL_DEBUG_SOURCE_API             = 0x8246,
+		GL_DEBUG_SOURCE_WINDOW_SYSTEM   = 0x8247,
+		GL_DEBUG_SOURCE_SHADER_COMPILER = 0x8248,
+		GL_DEBUG_SOURCE_THIRD_PARTY     = 0x8249,
+		GL_DEBUG_SOURCE_APPLICATION     = 0x824A,
+		GL_DEBUG_SOURCE_OTHER           = 0x824B;
+
+	/** Types. */
+	private static final int
+		GL_DEBUG_TYPE_ERROR               = 0x824C,
+		GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR = 0x824D,
+		GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  = 0x824E,
+		GL_DEBUG_TYPE_PORTABILITY         = 0x824F,
+		GL_DEBUG_TYPE_PERFORMANCE         = 0x8250,
+		GL_DEBUG_TYPE_OTHER               = 0x8251,
+		GL_DEBUG_TYPE_MARKER              = 0x8268;
+
+	private static final long CALLBACK_POINTER;
+
+	static {
+		long pointer = 0;
+		try {
+			// Call reflectively so that we can compile this class for the Generator.
+			pointer = (Long)Class.forName("org.lwjgl.opengl.CallbackUtil").getDeclaredMethod("getDebugCallbackKHR").invoke(null);
+		} catch (Exception e) {
+			// ignore
+		}
+		CALLBACK_POINTER = pointer;
+	}
+
+	private final Handler handler;
+
+	/**
+	 * Creates an KHRebugCallback with a default callback handler.
+	 * The default handler will simply print the message on System.err.
+	 */
+	public KHRDebugCallback() {
+		this(new Handler() {
+			public void handleMessage(final int source, final int type, final int id, final int severity, final String message) {
+				System.err.println("[LWJGL] KHR_debug message");
+				System.err.println("\tID: " + id);
+
+				String description;
+				switch ( source ) {
+					case GL_DEBUG_SOURCE_API:
+						description = "API";
+						break;
+					case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
+						description = "WINDOW SYSTEM";
+						break;
+					case GL_DEBUG_SOURCE_SHADER_COMPILER:
+						description = "SHADER COMPILER";
+						break;
+					case GL_DEBUG_SOURCE_THIRD_PARTY:
+						description = "THIRD PARTY";
+						break;
+					case GL_DEBUG_SOURCE_APPLICATION:
+						description = "APPLICATION";
+						break;
+					case GL_DEBUG_SOURCE_OTHER:
+						description = "OTHER";
+						break;
+					default:
+						description = "Unknown (" + Integer.toHexString(source) + ")";
+				}
+				System.err.println("\tSource: " + description);
+
+				switch ( type ) {
+					case GL_DEBUG_TYPE_ERROR:
+						description = "ERROR";
+						break;
+					case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
+						description = "DEPRECATED BEHAVIOR";
+						break;
+					case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
+						description = "UNDEFINED BEHAVIOR";
+						break;
+					case GL_DEBUG_TYPE_PORTABILITY:
+						description = "PORTABILITY";
+						break;
+					case GL_DEBUG_TYPE_PERFORMANCE:
+						description = "PERFORMANCE";
+						break;
+					case GL_DEBUG_TYPE_OTHER:
+						description = "OTHER";
+						break;
+					case GL_DEBUG_TYPE_MARKER:
+						description = "MARKER";
+						break;
+					default:
+						description = "Unknown (" + Integer.toHexString(source) + ")";
+				}
+				System.err.println("\tType: " + description);
+
+				switch ( severity ) {
+					case GL_DEBUG_SEVERITY_HIGH:
+						description = "HIGH";
+						break;
+					case GL_DEBUG_SEVERITY_MEDIUM:
+						description = "MEDIUM";
+						break;
+					case GL_DEBUG_SEVERITY_LOW:
+						description = "LOW";
+						break;
+					case GL_DEBUG_SEVERITY_NOTIFICATION:
+						description = "NOTIFICATION";
+						break;
+					default:
+						description = "Unknown (" + Integer.toHexString(source) + ")";
+				}
+				System.err.println("\tSeverity: " + description);
+
+				System.err.println("\tMessage: " + message);
+			}
+		});
+	}
+
+	/**
+	 * Creates an ARBDebugOutputCallback with the specified callback handler.
+	 * The handler's {@code handleMessage} method will be called whenever
+	 * debug output is generated by the GL.
+	 *
+	 * @param handler the callback handler
+	 */
+	public KHRDebugCallback(final Handler handler) {
+		super(CALLBACK_POINTER);
+
+		this.handler = handler;
+	}
+
+	Handler getHandler() {
+		return handler;
+	}
+
+	/** Implementations of this interface can be used to receive ARB_debug_output notifications. */
+	public interface Handler {
+
+		/**
+		 * This method will be called when an ARB_debug_output message is generated.
+		 *
+		 * @param id       the message ID
+		 * @param source   the message source
+		 * @param type     the message type
+		 * @param severity the message severity
+		 * @param message  the string representation of the message.
+		 */
+		void handleMessage(int source, int type, int id, int severity, String message);
+
+	}
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/opengles/APIUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/APIUtil.java	2012-07-14 23:29:21 UTC (rev 3782)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/APIUtil.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -39,6 +39,7 @@
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
+import java.nio.LongBuffer;
 
 /**
  * Utility class for OpenGL ES API calls.
@@ -143,6 +144,8 @@
 
 	static IntBuffer getBufferInt() { return buffersTL.get().ints; }
 
+	static LongBuffer getBufferLong() { return buffersTL.get().longs; }
+
 	static FloatBuffer getBufferFloat() { return buffersTL.get().floats; }
 
 	static IntBuffer getLengths() {
@@ -312,10 +315,12 @@
 	private static class Buffers {
 
 		final IntBuffer   ints;
+		final LongBuffer  longs;
 		final FloatBuffer floats;
 
 		Buffers() {
 			ints = BufferUtils.createIntBuffer(BUFFERS_SIZE);
+			longs = BufferUtils.createLongBuffer(BUFFERS_SIZE);
 			floats = BufferUtils.createFloatBuffer(BUFFERS_SIZE);
 		}
 

Added: trunk/LWJGL/src/java/org/lwjgl/opengles/CallbackUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/CallbackUtil.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/CallbackUtil.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2002-2010 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.opengles;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Utility class that handles OpenGL API callbacks.
+ *
+ * @author Spasi
+ */
+final class CallbackUtil {
+
+	/** Context -> Long */
+	private static final Map<ContextCapabilities, Long> contextUserParamsKHR = new HashMap<ContextCapabilities, Long>();
+
+	private CallbackUtil() {}
+
+	/**
+	 * Creates a new global reference to the specified Object.
+	 *
+	 * @param obj the Object
+	 *
+	 * @return the GlobalRef memory address or 0 if the Object is null.
+	 */
+	static long createGlobalRef(final Object obj) {
+		return obj == null ? 0 : ncreateGlobalRef(obj);
+	}
+
+	/**
+	 * Creates a new global reference to the specified Object.
+	 *
+	 * @param obj the Object
+	 *
+	 * @return the GlobalRef memory address.
+	 */
+	private static native long ncreateGlobalRef(Object obj);
+
+	/**
+	 * Deletes a global reference.
+	 *
+	 * @param ref the GlobalRef memory address.
+	 */
+	private static native void deleteGlobalRef(long ref);
+
+	// --------- [ XXX_debug_output ] ---------
+
+	/**
+	 * Associates the current OpenGL context with the specified global reference. If there
+	 * is no context current, the global reference is deleted and an exception is thrown.
+	 * Any previous callback registrations will be cleared.
+	 *
+	 * @param userParam the global reference pointer
+	 */
+	private static void registerContextCallback(final long userParam, final Map<ContextCapabilities, Long> contextUserData) {
+		ContextCapabilities caps = GLContext.getCapabilities();
+		if ( caps == null ) {
+			deleteGlobalRef(userParam);
+			throw new IllegalStateException("No context is current.");
+		}
+
+		final Long userParam_old = contextUserData.remove(caps);
+		if ( userParam_old != null )
+			deleteGlobalRef(userParam_old);
+
+		if ( userParam != 0 )
+			contextUserData.put(caps, userParam);
+	}
+
+	/**
+	 * Releases references to any callbacks associated with the specified GL context.
+	 *
+	 * @param context the Context to unregister
+	 */
+	static void unregisterCallbacks(final Object context) {
+		// TODO: This is never called for custom contexts. Need to fix for LWJGL 3.0
+		final ContextCapabilities caps = GLContext.getCapabilities();
+
+		Long userParam = contextUserParamsKHR.remove(caps);
+		if ( userParam != null )
+			deleteGlobalRef(userParam);
+	}
+
+	// --------- [ KHR_debug ] ---------
+
+	/**
+	 * Returns the memory address of the native function we pass to glDebugMessageCallback.
+	 *
+	 * @return the callback function address
+	 */
+	static native long getDebugCallbackKHR();
+
+	/**
+	 * Associates the current OpenGL context with the specified global reference. If there
+	 * is no context current, the global reference is deleted and an exception is thrown.
+	 * Any previous callback registrations will be cleared.
+	 *
+	 * @param userParam the global reference pointer
+	 */
+	static void registerContextCallbackKHR(final long userParam) {
+		registerContextCallback(userParam, contextUserParamsKHR);
+	}
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/opengles/ContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/ContextAttribs.java	2012-07-14 23:29:21 UTC (rev 3782)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/ContextAttribs.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -39,7 +39,7 @@
 
 /**
  * This class represents the context attributes passed to EGL's eglCreateContext.
- * The only attribute allowed is EGL_CONTEXT_CLIENT_VERSION and it must be 2 (LWJGL does not support GLES 1.x).
+ * The only attribute allowed is EGL_CONTEXT_CLIENT_VERSION and it must be 2 or 3 (LWJGL does not support GLES 1.x).
  */
 public final class ContextAttribs {
 
@@ -50,7 +50,7 @@
 	}
 
 	public ContextAttribs(final int version) {
-		if ( version != 2 )
+		if ( 3 < version )
 			throw new IllegalArgumentException("Invalid OpenGL ES version specified: " + version);
 
 		this.version = version;

Added: trunk/LWJGL/src/java/org/lwjgl/opengles/FastIntMap.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/FastIntMap.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/FastIntMap.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2002-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.lwjgl.opengles;
+
+import java.util.Iterator;
+
+/**
+ * A hash map using primitive ints as keys rather than objects.
+ *
+ * @author Justin Couch
+ * @author Alex Chaffee (al...@ap...)
+ * @author Stephen Colebourne
+ * @author Nathan Sweet
+ */
+final class FastIntMap<V> implements Iterable<FastIntMap.Entry<V>> {
+
+	private Entry[] table;
+	private int size, mask, capacity, threshold;
+
+	/** Same as: FastIntMap(16, 0.75f); */
+	FastIntMap() {
+		this(16, 0.75f);
+	}
+
+	/** Same as: FastIntMap(initialCapacity, 0.75f); */
+	FastIntMap(int initialCapacity) {
+		this(initialCapacity, 0.75f);
+	}
+
+	FastIntMap(int initialCapacity, float loadFactor) {
+		if ( initialCapacity > 1 << 30 ) throw new IllegalArgumentException("initialCapacity is too large.");
+		if ( initialCapacity < 0 ) throw new IllegalArgumentException("initialCapacity must be greater than zero.");
+		if ( loadFactor <= 0 ) throw new IllegalArgumentException("initialCapacity must be greater than zero.");
+		capacity = 1;
+		while ( capacity < initialCapacity )
+			capacity <<= 1;
+		this.threshold = (int)(capacity * loadFactor);
+		this.table = new Entry[capacity];
+		this.mask = capacity - 1;
+	}
+
+	private int index(final int key) {
+		return index(key, mask);
+	}
+
+	private static int index(final int key, final int mask) {
+		return key & mask;
+	}
+
+	public V put(int key, V value) {
+		final Entry<V>[] table = this.table;
+		int index = index(key);
+
+		// Check if key already exists.
+		for ( Entry<V> e = table[index]; e != null; e = e.next ) {
+			if ( e.key != key ) continue;
+			V oldValue = e.value;
+			e.value = value;
+			return oldValue;
+		}
+
+		table[index] = new Entry<V>(key, value, table[index]);
+
+		if ( size++ >= threshold )
+			rehash(table);
+
+		return null;
+	}
+
+	private void rehash(final Entry<V>[] table) {
+		final int newCapacity = 2 * capacity;
+		final int newMask = newCapacity - 1;
+
+		final Entry<V>[] newTable = new Entry[newCapacity];
+
+		for ( int i = 0, index; i < table.length; i++ ) {
+			Entry<V> e = table[i];
+			if ( e == null ) continue;
+			do {
+				final Entry<V> next = e.next;
+				index = index(e.key, newMask);
+				e.next = newTable[index];
+				newTable[index] = e;
+				e = next;
+			} while ( e != null );
+		}
+
+		this.table = newTable;
+		capacity = newCapacity;
+		mask = newMask;
+		threshold *= 2;
+	}
+
+	public V get(int key) {
+		final int index = index(key);
+		for ( Entry<V> e = table[index]; e != null; e = e.next )
+			if ( e.key == key ) return e.value;
+		return null;
+	}
+
+	public boolean containsValue(Object value) {
+		final Entry<V>[] table = this.table;
+		for ( int i = table.length - 1; i >= 0; i-- )
+			for ( Entry<V> e = table[i]; e != null; e = e.next )
+				if ( e.value.equals(value) ) return true;
+		return false;
+	}
+
+	public boolean containsKey(int key) {
+		final int index = index(key);
+		for ( Entry<V> e = table[index]; e != null; e = e.next )
+			if ( e.key == key ) return true;
+		return false;
+	}
+
+	public V remove(int key) {
+		final int index = index(key);
+
+		Entry<V> prev = table[index];
+		Entry<V> e = prev;
+		while ( e != null ) {
+			Entry<V> next = e.next;
+			if ( e.key == key ) {
+				size--;
+				if ( prev == e )
+					table[index] = next;
+				else
+					prev.next = next;
+				return e.value;
+			}
+			prev = e;
+			e = next;
+		}
+		return null;
+	}
+
+	public int size() {
+		return size;
+	}
+
+	public boolean isEmpty() {
+		return size == 0;
+	}
+
+	public void clear() {
+		final Entry<V>[] table = this.table;
+		for ( int index = table.length - 1; index >= 0; index-- )
+			table[index] = null;
+		size = 0;
+	}
+
+	public EntryIterator iterator() {
+		return new EntryIterator();
+	}
+
+	public class EntryIterator implements Iterator<Entry<V>> {
+
+		private int nextIndex;
+		private Entry<V> current;
+
+		EntryIterator() {
+			reset();
+		}
+
+		public void reset() {
+			current = null;
+			// Find first bucket.
+			final Entry<V>[] table = FastIntMap.this.table;
+			int i;
+			for ( i = table.length - 1; i >= 0; i-- )
+				if ( table[i] != null ) break;
+			nextIndex = i;
+		}
+
+		public boolean hasNext() {
+			if ( nextIndex >= 0 ) return true;
+			Entry e = current;
+			return e != null && e.next != null;
+		}
+
+		public Entry<V> next() {
+			// Next entry in current bucket.
+			Entry<V> e = current;
+			if ( e != null ) {
+				e = e.next;
+				if ( e != null ) {
+					current = e;
+					return e;
+				}
+			}
+			// Use the bucket at nextIndex and find the next nextIndex.
+			final Entry<V>[] table = FastIntMap.this.table;
+			int i = nextIndex;
+			e = current = table[i];
+			while ( --i >= 0 )
+				if ( table[i] != null ) break;
+			nextIndex = i;
+			return e;
+		}
+
+		public void remove() {
+			FastIntMap.this.remove(current.key);
+		}
+	}
+
+	static final class Entry<T> {
+
+		final int key;
+		T value;
+		Entry<T> next;
+
+		Entry(int key, T value, Entry<T> next) {
+			this.key = key;
+			this.value = value;
+			this.next = next;
+		}
+
+		public int getKey() {
+			return key;
+		}
+
+		public T getValue() {
+			return value;
+		}
+
+	}
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java	2012-07-14 23:29:21 UTC (rev 3782)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -86,6 +86,30 @@
 			throw new OpenGLException("Cannot use offsets when Element Array Buffer Object is disabled");
 	}
 
+	/** Helper method to ensure that pixel pack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
+	static void ensurePackPBOdisabled() {
+		if ( LWJGLUtil.CHECKS && StateTracker.getTracker().pixelPackBuffer != 0 )
+			throw new OpenGLException("Cannot use Buffers when Pixel Pack Buffer Object is enabled");
+	}
+
+	/** Helper method to ensure that pixel pack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
+	static void ensurePackPBOenabled() {
+		if ( LWJGLUtil.CHECKS && StateTracker.getTracker().pixelPackBuffer == 0 )
+			throw new OpenGLException("Cannot use offsets when Pixel Pack Buffer Object is disabled");
+	}
+
+	/** Helper method to ensure that pixel unpack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
+	static void ensureUnpackPBOdisabled() {
+		if ( LWJGLUtil.CHECKS && StateTracker.getTracker().pixelUnpackBuffer != 0 )
+			throw new OpenGLException("Cannot use Buffers when Pixel Unpack Buffer Object is enabled");
+	}
+
+	/** Helper method to ensure that pixel unpack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
+	static void ensureUnpackPBOenabled() {
+		if ( LWJGLUtil.CHECKS && StateTracker.getTracker().pixelUnpackBuffer == 0 )
+			throw new OpenGLException("Cannot use offsets when Pixel Unpack Buffer Object is disabled");
+	}
+
 	/**
 	 * Calculate the storage required for an image in elements
 	 *

Modified: trunk/LWJGL/src/java/org/lwjgl/opengles/GLContext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/GLContext.java	2012-07-14 23:29:21 UTC (rev 3782)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/GLContext.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -180,6 +180,8 @@
 		}
 
 		// ----------------------[ 2.X ]----------------------
+		if ( 3 <= majorVersion )
+			supported_extensions.add("OpenGLES30");
 		if ( 2 <= majorVersion )
 			supported_extensions.add("OpenGLES20");
 

Added: trunk/LWJGL/src/java/org/lwjgl/opengles/GLSync.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/GLSync.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/GLSync.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002-2012 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.opengles;
+
+import org.lwjgl.PointerWrapperAbstract;
+
+/**
+ * This class is a wrapper around a GLsync pointer.
+ *
+ * @author spasi <sp...@us...>
+ */
+public final class GLSync extends PointerWrapperAbstract {
+
+	GLSync(final long sync) {
+		super(sync);
+	}
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/java/org/lwjgl/opengles/KHRDebugCallback.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/KHRDebugCallback.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/KHRDebugCallback.java	2012-08-07 15:14:03 UTC (rev 3783)
@@ -0,0 +1,205 @@
+/*
+ * 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.opengles;
+
+import org.lwjgl.PointerWrapperAbstract;
+
+/**
+ * Instances of this class are needed to use the callback functionality of the KHR_debug extension.
+ * Users of this class may provide implementations of the {@code Handler} interface to receive notifications.
+ * The same {@code Handler} instance may be used by different contexts but it is not recommended.
+ * Handler notifications are synchronized.
+ *
+ * @author Spasi
+ */
+public final class KHRDebugCallback extends PointerWrapperAbstract {
+
+	/** Severity levels. */
+	private static final int
+		GL_DEBUG_SEVERITY_HIGH         = 0x9146,
+		GL_DEBUG_SEVERITY_MEDIUM       = 0x9147,
+		GL_DEBUG_SEVERITY_LOW          = 0x9148,
+		GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B;
+
+	/** Sources. */
+	private static final int
+		GL_DEBUG_SOURCE_API             = 0x8246,
+		GL_DEBUG_SOURCE_WINDOW_SYSTEM   = 0x8247,
+		GL_DEBUG_SOURCE_SHADER_COMPILER = 0x8248,
+		GL_DEBUG_SOURCE_THIRD_PARTY     = 0x8249,
+		GL_DEBUG_SOURCE_APPLICATION     = 0x824A,
+		GL_DEBUG_SOURCE_OTHER           = 0x824B;
+
+	/** Types. */
+	private static final int
+		GL_DEBUG_TYPE_ERROR               = 0x824C,
+		GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR = 0x824D,
+		GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  = 0x824E,
+		GL_DEBUG_TYPE_PORTABILITY         = 0x824F,
+		GL_DEBUG_TYPE_PERFORMANCE         = 0x8250,
+		GL_DEBUG_TYPE_OTHER               = 0x8251,
+		GL_DEBUG_TYPE_MARKER              = 0x8268;
+
+	private static final long CALLBACK_POINTER;
+
+	static {
+		long pointer = 0;
+		try {
+			// Call reflectively so that we can compile this class for the Generator.
+			pointer = (Long)Class.forName("org.lwjgl.opengles.CallbackUtil").getDeclaredMethod("getDebugCallbackKHR").invoke(null);
+		} catch (Exception e) {
+			// ignore
+		}
+		CALLBACK_POINTER = pointer;
+	}
+
+	private final Handler handler;
+
+	/**
+	 * Creates an KHRebugCallback with a default callback handler.
+	 * The default handler will simply print the message on System.err.
+	 */
+	public KHRDebugCallback() {
+		this(new Handler() {
+			public void handleMessage(final int source, final int type, final int id, final int severity, final String message) {
+				System.err.println("[LWJGL] KHR_debug message");
+				System.err.println("\tID: " + id);
+
+				String description;
+				switch ( source ) {
+					case GL_DEBUG_SOURCE_API:
+						description = "API";
+						break;
+					case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
+						description = "WINDOW SYSTEM";
+						break;
+					case GL_DEBUG_SOURCE_SHADER_COMPILER:
+						description = "SHADER COMPILER";
+						break;
+					case GL_DEBUG_SOURCE_THIRD_PARTY:
+						description = "THIRD PARTY";
+						break;
+					case GL_DEBUG_SOURCE_APPLICATION:
+						description = "APPLICATION";
+						break;
+					case GL_DEBUG_SOURCE_OTHER:
+						description = "OTHER";
+						break;
+					default:
+						description = "Unknown (" + Integer.toHexString(source) + ")";
+				}
+				System.err.println("\tSource: " + description);
+
+				switch ( type ) {
+					case GL_DEBUG_TYPE_ERROR:
+						description = "ERROR";
+						break;
+					case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
+						description = "DEPRECATED BEHAVIOR";
+						break;
+					case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
+						description = "UNDEFINED BEHAVIOR";
+						break;
+					case GL_DEBUG_TYPE_PORTABILITY:
+						description = "PORTABILITY";
+						break;
+					case GL_DEBUG_TYPE_PERFORMANCE:
+						description = "PERFORMANCE";
+						break;
+					case GL_DEBUG_TYPE_OTHER:
+						description = "OTHER";
+						break;
+					case GL_DEBUG_TYPE_MARKER:
+						description = "MARKER";
+						break;
+					default:
+						description = "Unknown (" + Integer.toHexString(source) + ")";
+				}
+				System.err.println("\tType: " + description);
+
+				switch ( severity ) {
+					case GL_DEBUG_SEVERITY_HIGH:
+						description = "HIGH";
+						break;
+					case GL_DEBUG_SEVERITY_MEDIUM:
+						description = "MEDIUM";
+						break;
+					case GL_DEBUG_SEVERITY_LOW:
+						description = "LOW";
+						break;
+					case GL_DEBUG_SEVERITY_NOTIFICATION:
+						description = "NOTIFICATION";
+						break;
+					default:
+						description = "Unknown (" + Integer.toHexString(source) + ")";
+				}
+				System.err.println("\tSeverity: " + description);
+
+				System.err.println("\tMessage: " + message);
+			}
+		});
+	}
+
+	/**
+	 * Creates an ARBDebugOutputCallback with the specified callback handler.
+	 * The handler's {@code handleMessage} method will be called whenever
+	 * debug output is generated by the GL.
+	 *
+	 * @param handler the callback handler
+	 */
+	public KHRDebugCallback(final Handler handler) {
+		super(CALLBACK_POINTER);
+
+		this.handler = handler;...
 
[truncated message content]

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

From: <ma...@us...> - 2012-07-14 23:29:28

Revision: 3782
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3782&view=rev
Author:   matzon
Date:     2012-07-14 23:29:21 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
fixed issue with win32 get x/y returning client-area coords

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-06-29 10:25:36 UTC (rev 3781)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-07-14 23:29:21 UTC (rev 3782)
@@ -52,6 +52,7 @@
 final class WindowsDisplay implements DisplayImplementation {
 	private static final int GAMMA_LENGTH = 256;
 
+	private static final int WM_WINDOWPOSCHANGED              = 0x0047;
 	private static final int WM_MOVE                          = 0x0003;
 	private static final int WM_CANCELMODE                    = 0x001F;
 	private static final int WM_MOUSEMOVE                     = 0x0200;
@@ -1012,15 +1013,22 @@
 					captureMouse = -1;
 				}
 				return 0;
-			case WM_MOVE:
-				x = (int)(short)(lParam & 0xFFFF);
-				y = (int)(short)(lParam >> 16);
-				return defWindowProc(hwnd, msg, wParam, lParam);
+			case WM_WINDOWPOSCHANGED:
+				if(getWindowRect(hwnd, rect_buffer)) {
+					rect.copyFromBuffer(rect_buffer);
+					x = rect.top;
+					y = rect.bottom;
+				} else {
+					LWJGLUtil.log("WM_WINDOWPOSCHANGED: Unable to get window rect");
+				}
+				return defWindowProc(hwnd, msg, wParam, lParam);				
 			default:
 				return defWindowProc(hwnd, msg, wParam, lParam);
 		}
 	}
 	
+	private native boolean getWindowRect(long hwnd, IntBuffer rectBuffer);
+
 	public int getX() {
 		return x;
 	}

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2012-06-29 10:25:36 UTC (rev 3781)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2012-07-14 23:29:21 UTC (rev 3782)
@@ -199,6 +199,18 @@
 	buffer[1] = point.y;
 }
 
+
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_WindowsDisplay_getWindowRect(JNIEnv *env, jclass unused, jlong hwnd_int, jobject buffer_handle) {
+	HWND hwnd = (HWND)(INT_PTR)hwnd_int;
+	RECT *buffer = (RECT *)(*env)->GetDirectBufferAddress(env, buffer_handle);
+	jlong size = (*env)->GetDirectBufferCapacity(env, buffer_handle);
+	if (size < 4) {
+		throwFormattedRuntimeException(env, "Buffer size < 4", size);
+		return false;
+	}
+	return GetWindowRect(hwnd, buffer);
+}
+
 JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_WindowsDisplay_getForegroundWindow(JNIEnv *env, jclass unused) {
 	return (INT_PTR)GetForegroundWindow();
 }
@@ -509,4 +521,5 @@
 		tme.dwFlags = TME_LEAVE;
 		tme.hwndTrack = hwnd;
 		return TrackMouseEvent(&tme);
-}
\ No newline at end of file
+}
+

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

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

From: <sp...@us...> - 2012-06-29 10:25:47

Revision: 3781
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3781&view=rev
Author:   spasi
Date:     2012-06-29 10:25:36 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Removed @Constant("0") from pathBase parameters.

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

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_path_rendering.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_path_rendering.java	2012-06-19 10:44:02 UTC (rev 3780)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_path_rendering.java	2012-06-29 10:25:36 UTC (rev 3781)
@@ -373,14 +373,14 @@
 
 	void glStencilFillPathInstancedNV(@AutoSize(value="paths", expression = " / GLChecks.calculateBytesPerPathName(pathNameType)") @GLsizei int numPaths,
 	                                  @GLenum int pathNameType, @Const @GLvoid ByteBuffer paths,
-	                                  @Constant("0") @GLuint int pathBase,
+	                                  @GLuint int pathBase,
 	                                  @GLenum int fillMode, @GLuint int mask,
 	                                  @GLenum int transformType,
 	                                  @Check(value = "GLChecks.calculateTransformPathValues(transformType)", canBeNull = true) @Const FloatBuffer transformValues);
 
 	void glStencilStrokePathInstancedNV(@AutoSize(value = "paths", expression = " / GLChecks.calculateBytesPerPathName(pathNameType)") @GLsizei int numPaths,
 	                                    @GLenum int pathNameType, @Const @GLvoid ByteBuffer paths,
-	                                    @Constant("0") @GLuint int pathBase,
+	                                    @GLuint int pathBase,
 	                                    int reference, @GLuint int mask,
 	                                    @GLenum int transformType,
 	                                    @Check(value = "GLChecks.calculateTransformPathValues(transformType)", canBeNull = true) @Const FloatBuffer transformValues);
@@ -405,14 +405,14 @@
 
 	void glCoverFillPathInstancedNV(@AutoSize(value = "paths", expression = " / GLChecks.calculateBytesPerPathName(pathNameType)") @GLsizei int numPaths,
 	                                @GLenum int pathNameType, @Const @GLvoid ByteBuffer paths,
-	                                @Constant("0") @GLuint int pathBase,
+	                                @GLuint int pathBase,
 	                                @GLenum int coverMode,
 	                                @GLenum int transformType,
 	                                @Check(value = "GLChecks.calculateTransformPathValues(transformType)", canBeNull = true) @Const FloatBuffer transformValues);
 
 	void glCoverStrokePathInstancedNV(@AutoSize(value = "paths", expression = " / GLChecks.calculateBytesPerPathName(pathNameType)") @GLsizei int numPaths,
 	                                  @GLenum int pathNameType, @Const @GLvoid ByteBuffer paths,
-	                                  @Constant("0") @GLuint int pathBase,
+	                                  @GLuint int pathBase,
 	                                  @GLenum int coverMode,
 	                                  @GLenum int transformType,
 	                                  @Check(value = "GLChecks.calculateTransformPathValues(transformType)", canBeNull = true) @Const FloatBuffer transformValues);
@@ -443,7 +443,7 @@
 	void glGetPathMetricsNV(@GLbitfield int metricQueryMask,
 	                        @AutoSize(value = "paths", expression = " / GLChecks.calculateBytesPerPathName(pathNameType)") @GLsizei int numPaths,
 	                        @GLenum int pathNameType, @Const @GLvoid ByteBuffer paths,
-	                        @Constant("0") @GLuint int pathBase,
+	                        @GLuint int pathBase,
 	                        @GLsizei int stride,
 	                        @Check("GLChecks.calculateMetricsSize(metricQueryMask, stride)") @OutParameter FloatBuffer metrics);
 
@@ -457,7 +457,7 @@
 	void glGetPathSpacingNV(@GLenum int pathListMode,
 	                        @AutoSize(value = "paths", expression = "numPaths", useExpression = true) @GLsizei int numPaths,
 	                        @GLenum int pathNameType, @Const @GLvoid ByteBuffer paths,
-	                        @Constant("0") @GLuint int pathBase,
+	                        @GLuint int pathBase,
 	                        float advanceScale,
 	                        float kerningScale,
 	                        @GLenum int transformType,

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

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

From: <sp...@us...> - 2012-06-19 10:44:11

Revision: 3780
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3780&view=rev
Author:   spasi
Date:     2012-06-19 10:44:02 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Removed unnecessary GL_RED from GL30.
Added AMD_query_buffer_object.

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

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

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java	2012-06-19 10:44:02 UTC (rev 3780)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2002-2010 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_query_buffer_object {
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetQueryObjectiv, GetQueryObjectuiv,
+	 * GetQueryObjecti64v and GetQueryObjectui64v:
+	 */
+	int GL_QUERY_RESULT_NO_WAIT_AMD = 0x9194;
+
+	/**
+	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, MapBufferRange, GetBufferSubData,
+	 * GetBufferParameteriv
+	 * and GetBufferPointerv:
+	 */
+	int GL_QUERY_BUFFER_AMD = 0x9192;
+
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
+	int GL_QUERY_BUFFER_BINDING_AMD = 0x9193;
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2012-06-17 20:54:07 UTC (rev 3779)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2012-06-19 10:44:02 UTC (rev 3780)
@@ -907,12 +907,6 @@
 	int GL_RG = 0x8227;
 	int GL_RG_INTEGER = 0x8228;
 
-	/**
-	 * Accepted by the &lt;param&gt; parameter of the TexParameter{if}*
-	 * functions when &lt;pname&gt; is DEPTH_TEXTURE_MODE:
-	 */
-	int GL_RED = 0x1903;
-
 	// ----------------------------------------------------------------------
 	// ----------------------[ EXT_transform_feedback ]----------------------
 	// ----------------------------------------------------------------------

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

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

From: <ma...@us...> - 2012-06-17 20:54:14

Revision: 3779
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3779&view=rev
Author:   matzon
Date:     2012-06-17 20:54:07 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
pushing latest openal (785f52aa29d...) with fix for float32

Modified Paths:
--------------
    trunk/LWJGL/libs/linux/libopenal.so
    trunk/LWJGL/libs/linux/libopenal64.so
    trunk/LWJGL/libs/solaris/libopenal.so
    trunk/LWJGL/libs/solaris/libopenal64.so
    trunk/LWJGL/libs/windows/OpenAL32.dll
    trunk/LWJGL/libs/windows/OpenAL64.dll

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

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

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

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

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

Modified: trunk/LWJGL/libs/windows/OpenAL64.dll
===================================================================
(Binary files differ)

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

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

From: <ma...@us...> - 2012-06-03 19:08:05

Revision: 3778
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3778&view=rev
Author:   matzon
Date:     2012-06-03 19:07:57 +0000 (Sun, 03 Jun 2012)
Log Message:
-----------
bumping to 2.8.5, adding changelogs

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    trunk/LWJGL/www/changelogs/full-changelog.txt

Added Paths:
-----------
    trunk/LWJGL/www/changelogs/2.8.4-changelog.txt

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2012-06-03 18:54:24 UTC (rev 3777)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2012-06-03 19:07:57 UTC (rev 3778)
@@ -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.8.4" />
+	<property name="lwjgl.version" 				value="2.8.5" />
 	<property name="lwjgl.web" 						location="www" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2012-06-03 18:54:24 UTC (rev 3777)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2012-06-03 19:07:57 UTC (rev 3778)
@@ -54,7 +54,7 @@
 	private static final String JNI_LIBRARY_NAME = "lwjgl";
 
 	/** Current version of library */
-	private static final String VERSION = "2.8.4";
+	private static final String VERSION = "2.8.5";
 
 	private static final String POSTFIX64BIT = "64";
 

Added: trunk/LWJGL/www/changelogs/2.8.4-changelog.txt
===================================================================
--- trunk/LWJGL/www/changelogs/2.8.4-changelog.txt	                        (rev 0)
+++ trunk/LWJGL/www/changelogs/2.8.4-changelog.txt	2012-06-03 19:07:57 UTC (rev 3778)
@@ -0,0 +1,292 @@
+2012-05-21 20:39  kappa1
+
+	* libs/macosx/openal.dylib: Add OpenAL-Soft 1.14 for OS X
+
+2012-05-21 18:30  matzon
+
+	* libs/linux/libopenal.so, libs/linux/libopenal64.so,
+	  libs/solaris/libopenal.so, libs/solaris/libopenal64.so,
+	  libs/windows/OpenAL32.dll, libs/windows/OpenAL64.dll: updating
+	  OpenAL-soft to 1.14+
+
+2012-05-13 18:03  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Minor tweak to remove
+	  unused code
+
+2012-05-13 18:01  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Display.wasResized()
+	  should now work correctly when using Display.setParent()
+
+2012-05-13 13:50  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  fixed issue with applets on linux with Java 7 where the natives
+	  where LWJGL natives were failing to load.
+
+2012-05-13 12:11  kappa1
+
+	* src/java/org/lwjgl/input/Mouse.java: Fix Mouse.getDX() and
+	  Mouse.getDY() values when mouse moves outside Display window &
+	  clipping is on. Thanks to ra4king for patch.
+
+2012-05-09 12:33  jpilgrim
+
+	* eclipse-update/org.lwjgl.info/plugin.xml: LWJGL info and test
+	  view are now sorted into category "general" (otherwise they are
+	  not visible in Eclipse 4.2)
+
+2012-05-08 19:38  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  fix to ensure a jar file download is attempted 3 times even if it
+	  throws some download exception.
+
+2012-05-04 17:23  spasi
+
+	* src/templates/org/lwjgl/opengl/GL11.java,
+	  src/templates/org/lwjgl/opengl/GL13.java,
+	  src/templates/org/lwjgl/opengl/GL14.java,
+	  src/templates/org/lwjgl/opengl/GL31.java,
+	  src/templates/org/lwjgl/opengl/GL40.java,
+	  src/templates/org/lwjgl/opengl/GL41.java: GL spec 20120427
+	  updates.
+
+2012-04-26 18:08  jpilgrim
+
+	* eclipse-update/org.lwjgl.info/src/java/org/lwjgl/info/LWJGLInfoView.java:
+	  fixed problem with InfoView, also see
+	  https://bugs.eclipse.org/bugs/show_bug.cgi?id=367718
+
+2012-04-26 13:19  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  add further checks to prevent Java default caching
+
+2012-04-22 23:05  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  set all streams that are open to use try/finally blocks to close
+	  the streams
+
+2012-04-22 22:51  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  add try/finally block to ensure file is closed on exception in
+	  the downloadJars(), thx to MatthiasM for pointing it out.
+
+2012-04-22 22:21  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  add extra urlconnections.setUseCaches(false) as an extra
+	  precaution to make sure caching is disabled.
+
+2012-04-18 16:50  spasi
+
+	* src/templates/org/lwjgl/opencl/INTEL_thread_local_exec.java:
+	  Added INTEL_thread_local_exec OpenCL extension.
+
+2012-04-14 18:55  kappa1
+
+	* src/java/org/lwjgl/opengl/MacOSXFrame.java: Fix
+	  Display.getWidth() and Display.getHeight() to return the correct
+	  values on OS X when the window has been resized.
+
+2012-04-10 13:23  kappa1
+
+	* src/java/org/lwjgl/input/Controller.java,
+	  src/java/org/lwjgl/input/JInputController.java,
+	  src/java/org/lwjgl/util/input/ControllerAdapter.java: Update
+	  ControllerAdapter in util package to reflect new changes in the
+	  Controller interface class (should fix broken build)
+
+2012-04-10 11:44  kappa1
+
+	* src/java/org/lwjgl/input/Controller.java,
+	  src/java/org/lwjgl/input/JInputController.java: Apply patch by
+	  OrangyTang to expose JInput's rumble functionality in LWJGL's
+	  Controller class.
+
+2012-03-27 13:12  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_vertex_shader_layer.java,
+	  src/templates/org/lwjgl/opengl/AMD_vertex_shader_viewport_index.java,
+	  src/templates/org/lwjgl/opengl/NV_bindless_texture.java,
+	  src/templates/org/lwjgl/opengl/NV_shader_atomic_float.java: Added
+	  support for: AMD_vertex_shader_viewport_index,
+	  AMD_vertex_shader_layer, NV_bindless_texture,
+	  NV_shader_atomic_float.
+
+2012-03-24 00:39  kappa1
+
+	* src/java/org/lwjgl/opengl/Sync.java: remove non-existing import.
+
+2012-03-24 00:20  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java,
+	  src/java/org/lwjgl/opengl/Sync.java: fix minor javadoc typo's
+
+2012-03-24 00:04  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java,
+	  src/java/org/lwjgl/opengl/Sync.java: Replace Display.sync(int
+	  fps) with an even better implementation, special thanks to Riven.
+
+2012-03-21 19:34  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Display.sync() fix
+	  excessive CPU using on windows
+
+2012-03-19 22:12  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: applying white
+	  border fix from dr_evil
+
+2012-03-18 16:25  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Fix the new accurate
+	  Display.sync() method to use less CPU on Mac.
+
+2012-03-04 13:41  kappa1
+
+	* src/java/org/lwjgl/opengl/ContextGL.java,
+	  src/java/org/lwjgl/opengl/ContextImplementation.java,
+	  src/java/org/lwjgl/opengl/LinuxContextImplementation.java,
+	  src/java/org/lwjgl/opengl/MacOSXContextImplementation.java,
+	  src/java/org/lwjgl/opengl/WindowsContextImplementation.java:
+	  Refactor so that the peer_info variable in ContextGL does not
+	  need to be static
+
+2012-03-04 03:50  kappa1
+
+	* src/native/linux/opengl/extgl_glx.c: add missing
+	  extgl_InitGLXEXTSwapControl()
+
+2012-03-04 03:45  kappa1
+
+	* src/native/linux/opengl/extgl_glx.h: add missing
+	  lwjgl_glXSwapIntervalEXT
+
+2012-03-04 03:40  kappa1
+
+	* src/java/org/lwjgl/opengl/ContextGL.java,
+	  src/java/org/lwjgl/opengl/ContextImplementation.java,
+	  src/java/org/lwjgl/opengl/LinuxContextImplementation.java,
+	  src/java/org/lwjgl/opengl/MacOSXContextImplementation.java,
+	  src/java/org/lwjgl/opengl/WindowsContextImplementation.java,
+	  src/native/linux/opengl/extgl_glx.c,
+	  src/native/linux/opengl/extgl_glx.h,
+	  src/native/linux/opengl/org_lwjgl_opengl_LinuxContextImplementation.c:
+	  Implement GLX_EXT_swap_control for Linux
+
+2012-03-01 22:34  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Tweak Display.sync()
+	  method a little to reduce the Thread.yield() time even further,
+	  now with a minimum of 0 yield time.
+
+2012-02-29 23:18  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Implement a much more
+	  accurate Display.sync() method that auto adapts to the systems
+	  timer resolution and load.
+
+2012-02-28 18:18  spasi
+
+	* src/java/org/lwjgl/MemoryUtil.java,
+	  src/native/common/org_lwjgl_opencl_CallbackUtil.c,
+	  src/templates/org/lwjgl/opencl/CL10.java: Fixed
+	  clEnqueueNativeKernel crash.
+
+2012-02-18 18:38  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: added win32
+	  display get x/y
+
+2012-02-18 16:30  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java,
+	  src/java/org/lwjgl/opengl/DisplayImplementation.java,
+	  src/java/org/lwjgl/opengl/LinuxDisplay.java,
+	  src/java/org/lwjgl/opengl/MacOSXDisplay.java,
+	  src/java/org/lwjgl/opengl/WindowsDisplay.java: Added the new
+	  public API's Display.getX() and Display.getY(). Currently
+	  implemented for Linux and Mac. Windows implementation pending.
+
+2012-02-18 01:49  kappa1
+
+	* src/java/org/lwjgl/opengl/LinuxDisplay.java,
+	  src/java/org/lwjgl/opengl/LinuxEvent.java,
+	  src/native/linux/opengl/org_lwjgl_opengl_Display.c,
+	  src/native/linux/opengles/org_lwjgl_opengl_Display.c: Implement
+	  the ability for the native Display window on Linux to get its x
+	  and y position. In preparation for adding the new Display.getX()
+	  & getY() API's.
+
+2012-02-06 20:35  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: applied dr_evil's
+	  maximized patch
+
+2012-02-06 19:26  spasi
+
+	* src/templates/org/lwjgl/opencl/AMD_media_ops2.java: Added support
+	  for AMD_media_ops2.
+
+2012-02-01 22:50  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: updated fix for
+	  resizable
+
+2012-02-01 21:33  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: applying suggested
+	  fix for resize issue
+
+2012-01-31 23:25  kappa1
+
+	* src/java/org/lwjgl/opengl/LinuxMouse.java: removed a tiny bit of
+	  dead debug code
+
+2012-01-31 23:24  kappa1
+
+	* src/java/org/lwjgl/opengl/LinuxMouse.java,
+	  src/native/linux/org_lwjgl_opengl_LinuxMouse.c: Linux Mouse:
+	  added support for using more than 3 buttons on a mouse, supports
+	  mice with upto 256 buttons.
+
+2012-01-29 20:35  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsMouse.java: limit mouse buttons
+	  to 5, since we can't read more at this time
+
+2012-01-29 20:26  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: support for 5
+	  buttons on windows
+
+2012-01-29 19:06  spasi
+
+	* src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/EXT_direct_state_access.java,
+	  src/templates/org/lwjgl/opengl/GL15.java,
+	  src/templates/org/lwjgl/opengles/GLES20.java: Removed @Check("1")
+	  from BufferData functions.
+
+2012-01-28 19:35  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java,
+	  src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/EXT_direct_state_access.java,
+	  src/templates/org/lwjgl/opengl/GL15.java,
+	  src/templates/org/lwjgl/opengles/GLES20.java: Added
+	  AMD_stencil_operation_extended.
+	  Reverted @Check("1") from SubData BO functions.
+
+2012-01-23 21:30  matzon
+
+	* platform_build/build-definitions.xml,
+	  src/java/org/lwjgl/Sys.java, www/changelogs/2.8.3-changelog.txt,
+	  www/changelogs/full-changelog.txt: bumping to 2.8.4 and adding
+	  changelogs
\ No newline at end of file

Modified: trunk/LWJGL/www/changelogs/full-changelog.txt
===================================================================
--- trunk/LWJGL/www/changelogs/full-changelog.txt	2012-06-03 18:54:24 UTC (rev 3777)
+++ trunk/LWJGL/www/changelogs/full-changelog.txt	2012-06-03 19:07:57 UTC (rev 3778)
@@ -1,3 +1,296 @@
+2012-05-21 20:39  kappa1
+
+	* libs/macosx/openal.dylib: Add OpenAL-Soft 1.14 for OS X
+
+2012-05-21 18:30  matzon
+
+	* libs/linux/libopenal.so, libs/linux/libopenal64.so,
+	  libs/solaris/libopenal.so, libs/solaris/libopenal64.so,
+	  libs/windows/OpenAL32.dll, libs/windows/OpenAL64.dll: updating
+	  OpenAL-soft to 1.14+
+
+2012-05-13 18:03  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Minor tweak to remove
+	  unused code
+
+2012-05-13 18:01  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Display.wasResized()
+	  should now work correctly when using Display.setParent()
+
+2012-05-13 13:50  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  fixed issue with applets on linux with Java 7 where the natives
+	  where LWJGL natives were failing to load.
+
+2012-05-13 12:11  kappa1
+
+	* src/java/org/lwjgl/input/Mouse.java: Fix Mouse.getDX() and
+	  Mouse.getDY() values when mouse moves outside Display window &
+	  clipping is on. Thanks to ra4king for patch.
+
+2012-05-09 12:33  jpilgrim
+
+	* eclipse-update/org.lwjgl.info/plugin.xml: LWJGL info and test
+	  view are now sorted into category "general" (otherwise they are
+	  not visible in Eclipse 4.2)
+
+2012-05-08 19:38  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  fix to ensure a jar file download is attempted 3 times even if it
+	  throws some download exception.
+
+2012-05-04 17:23  spasi
+
+	* src/templates/org/lwjgl/opengl/GL11.java,
+	  src/templates/org/lwjgl/opengl/GL13.java,
+	  src/templates/org/lwjgl/opengl/GL14.java,
+	  src/templates/org/lwjgl/opengl/GL31.java,
+	  src/templates/org/lwjgl/opengl/GL40.java,
+	  src/templates/org/lwjgl/opengl/GL41.java: GL spec 20120427
+	  updates.
+
+2012-04-26 18:08  jpilgrim
+
+	* eclipse-update/org.lwjgl.info/src/java/org/lwjgl/info/LWJGLInfoView.java:
+	  fixed problem with InfoView, also see
+	  https://bugs.eclipse.org/bugs/show_bug.cgi?id=367718
+
+2012-04-26 13:19  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  add further checks to prevent Java default caching
+
+2012-04-22 23:05  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  set all streams that are open to use try/finally blocks to close
+	  the streams
+
+2012-04-22 22:51  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  add try/finally block to ensure file is closed on exception in
+	  the downloadJars(), thx to MatthiasM for pointing it out.
+
+2012-04-22 22:21  kappa1
+
+	* src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+	  add extra urlconnections.setUseCaches(false) as an extra
+	  precaution to make sure caching is disabled.
+
+2012-04-18 16:50  spasi
+
+	* src/templates/org/lwjgl/opencl/INTEL_thread_local_exec.java:
+	  Added INTEL_thread_local_exec OpenCL extension.
+
+2012-04-14 18:55  kappa1
+
+	* src/java/org/lwjgl/opengl/MacOSXFrame.java: Fix
+	  Display.getWidth() and Display.getHeight() to return the correct
+	  values on OS X when the window has been resized.
+
+2012-04-10 13:23  kappa1
+
+	* src/java/org/lwjgl/input/Controller.java,
+	  src/java/org/lwjgl/input/JInputController.java,
+	  src/java/org/lwjgl/util/input/ControllerAdapter.java: Update
+	  ControllerAdapter in util package to reflect new changes in the
+	  Controller interface class (should fix broken build)
+
+2012-04-10 11:44  kappa1
+
+	* src/java/org/lwjgl/input/Controller.java,
+	  src/java/org/lwjgl/input/JInputController.java: Apply patch by
+	  OrangyTang to expose JInput's rumble functionality in LWJGL's
+	  Controller class.
+
+2012-03-27 13:12  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_vertex_shader_layer.java,
+	  src/templates/org/lwjgl/opengl/AMD_vertex_shader_viewport_index.java,
+	  src/templates/org/lwjgl/opengl/NV_bindless_texture.java,
+	  src/templates/org/lwjgl/opengl/NV_shader_atomic_float.java: Added
+	  support for: AMD_vertex_shader_viewport_index,
+	  AMD_vertex_shader_layer, NV_bindless_texture,
+	  NV_shader_atomic_float.
+
+2012-03-24 00:39  kappa1
+
+	* src/java/org/lwjgl/opengl/Sync.java: remove non-existing import.
+
+2012-03-24 00:20  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java,
+	  src/java/org/lwjgl/opengl/Sync.java: fix minor javadoc typo's
+
+2012-03-24 00:04  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java,
+	  src/java/org/lwjgl/opengl/Sync.java: Replace Display.sync(int
+	  fps) with an even better implementation, special thanks to Riven.
+
+2012-03-21 19:34  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Display.sync() fix
+	  excessive CPU using on windows
+
+2012-03-19 22:12  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: applying white
+	  border fix from dr_evil
+
+2012-03-18 16:25  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Fix the new accurate
+	  Display.sync() method to use less CPU on Mac.
+
+2012-03-04 13:41  kappa1
+
+	* src/java/org/lwjgl/opengl/ContextGL.java,
+	  src/java/org/lwjgl/opengl/ContextImplementation.java,
+	  src/java/org/lwjgl/opengl/LinuxContextImplementation.java,
+	  src/java/org/lwjgl/opengl/MacOSXContextImplementation.java,
+	  src/java/org/lwjgl/opengl/WindowsContextImplementation.java:
+	  Refactor so that the peer_info variable in ContextGL does not
+	  need to be static
+
+2012-03-04 03:50  kappa1
+
+	* src/native/linux/opengl/extgl_glx.c: add missing
+	  extgl_InitGLXEXTSwapControl()
+
+2012-03-04 03:45  kappa1
+
+	* src/native/linux/opengl/extgl_glx.h: add missing
+	  lwjgl_glXSwapIntervalEXT
+
+2012-03-04 03:40  kappa1
+
+	* src/java/org/lwjgl/opengl/ContextGL.java,
+	  src/java/org/lwjgl/opengl/ContextImplementation.java,
+	  src/java/org/lwjgl/opengl/LinuxContextImplementation.java,
+	  src/java/org/lwjgl/opengl/MacOSXContextImplementation.java,
+	  src/java/org/lwjgl/opengl/WindowsContextImplementation.java,
+	  src/native/linux/opengl/extgl_glx.c,
+	  src/native/linux/opengl/extgl_glx.h,
+	  src/native/linux/opengl/org_lwjgl_opengl_LinuxContextImplementation.c:
+	  Implement GLX_EXT_swap_control for Linux
+
+2012-03-01 22:34  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Tweak Display.sync()
+	  method a little to reduce the Thread.yield() time even further,
+	  now with a minimum of 0 yield time.
+
+2012-02-29 23:18  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java: Implement a much more
+	  accurate Display.sync() method that auto adapts to the systems
+	  timer resolution and load.
+
+2012-02-28 18:18  spasi
+
+	* src/java/org/lwjgl/MemoryUtil.java,
+	  src/native/common/org_lwjgl_opencl_CallbackUtil.c,
+	  src/templates/org/lwjgl/opencl/CL10.java: Fixed
+	  clEnqueueNativeKernel crash.
+
+2012-02-18 18:38  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: added win32
+	  display get x/y
+
+2012-02-18 16:30  kappa1
+
+	* src/java/org/lwjgl/opengl/Display.java,
+	  src/java/org/lwjgl/opengl/DisplayImplementation.java,
+	  src/java/org/lwjgl/opengl/LinuxDisplay.java,
+	  src/java/org/lwjgl/opengl/MacOSXDisplay.java,
+	  src/java/org/lwjgl/opengl/WindowsDisplay.java: Added the new
+	  public API's Display.getX() and Display.getY(). Currently
+	  implemented for Linux and Mac. Windows implementation pending.
+
+2012-02-18 01:49  kappa1
+
+	* src/java/org/lwjgl/opengl/LinuxDisplay.java,
+	  src/java/org/lwjgl/opengl/LinuxEvent.java,
+	  src/native/linux/opengl/org_lwjgl_opengl_Display.c,
+	  src/native/linux/opengles/org_lwjgl_opengl_Display.c: Implement
+	  the ability for the native Display window on Linux to get its x
+	  and y position. In preparation for adding the new Display.getX()
+	  & getY() API's.
+
+2012-02-06 20:35  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: applied dr_evil's
+	  maximized patch
+
+2012-02-06 19:26  spasi
+
+	* src/templates/org/lwjgl/opencl/AMD_media_ops2.java: Added support
+	  for AMD_media_ops2.
+
+2012-02-01 22:50  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: updated fix for
+	  resizable
+
+2012-02-01 21:33  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: applying suggested
+	  fix for resize issue
+
+2012-01-31 23:25  kappa1
+
+	* src/java/org/lwjgl/opengl/LinuxMouse.java: removed a tiny bit of
+	  dead debug code
+
+2012-01-31 23:24  kappa1
+
+	* src/java/org/lwjgl/opengl/LinuxMouse.java,
+	  src/native/linux/org_lwjgl_opengl_LinuxMouse.c: Linux Mouse:
+	  added support for using more than 3 buttons on a mouse, supports
+	  mice with upto 256 buttons.
+
+2012-01-29 20:35  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsMouse.java: limit mouse buttons
+	  to 5, since we can't read more at this time
+
+2012-01-29 20:26  matzon
+
+	* src/java/org/lwjgl/opengl/WindowsDisplay.java: support for 5
+	  buttons on windows
+
+2012-01-29 19:06  spasi
+
+	* src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/EXT_direct_state_access.java,
+	  src/templates/org/lwjgl/opengl/GL15.java,
+	  src/templates/org/lwjgl/opengles/GLES20.java: Removed @Check("1")
+	  from BufferData functions.
+
+2012-01-28 19:35  spasi
+
+	* src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java,
+	  src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+	  src/templates/org/lwjgl/opengl/EXT_direct_state_access.java,
+	  src/templates/org/lwjgl/opengl/GL15.java,
+	  src/templates/org/lwjgl/opengles/GLES20.java: Added
+	  AMD_stencil_operation_extended.
+	  Reverted @Check("1") from SubData BO functions.
+
+2012-01-23 21:30  matzon
+
+	* platform_build/build-definitions.xml,
+	  src/java/org/lwjgl/Sys.java, www/changelogs/2.8.3-changelog.txt,
+	  www/changelogs/full-changelog.txt: bumping to 2.8.4 and adding
+	  changelogs
+
 2012-01-22 20:16  kappa1
 
 	* src/java/org/lwjgl/opengl/LinuxDisplay.java: Small tweak to the

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

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

From: <ma...@us...> - 2012-06-03 18:54:30

Revision: 3777
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3777&view=rev
Author:   matzon
Date:     2012-06-03 18:54:24 +0000 (Sun, 03 Jun 2012)
Log Message:
-----------
tagging 2.8.4

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

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3776] trunk/LWJGL/libs/macosx/openal.dylib

From: <ka...@us...> - 2012-05-21 20:39:08

Revision: 3776
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3776&view=rev
Author:   kappa1
Date:     2012-05-21 20:39:02 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Add OpenAL-Soft 1.14 for OS X

Modified Paths:
--------------
    trunk/LWJGL/libs/macosx/openal.dylib

Modified: trunk/LWJGL/libs/macosx/openal.dylib
===================================================================
(Binary files differ)

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

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

From: <ma...@us...> - 2012-05-21 18:30:48

Revision: 3775
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3775&view=rev
Author:   matzon
Date:     2012-05-21 18:30:41 +0000 (Mon, 21 May 2012)
Log Message:
-----------
updating OpenAL-soft to 1.14+

Modified Paths:
--------------
    trunk/LWJGL/libs/linux/libopenal.so
    trunk/LWJGL/libs/linux/libopenal64.so
    trunk/LWJGL/libs/solaris/libopenal.so
    trunk/LWJGL/libs/solaris/libopenal64.so
    trunk/LWJGL/libs/windows/OpenAL32.dll
    trunk/LWJGL/libs/windows/OpenAL64.dll

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

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

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

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

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

Modified: trunk/LWJGL/libs/windows/OpenAL64.dll
===================================================================
(Binary files differ)

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

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

From: <ka...@us...> - 2012-05-13 18:03:11

Revision: 3774
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3774&view=rev
Author:   kappa1
Date:     2012-05-13 18:03:05 +0000 (Sun, 13 May 2012)
Log Message:
-----------
Minor tweak to remove unused code

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2012-05-13 18:01:12 UTC (rev 3773)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2012-05-13 18:03:05 UTC (rev 3774)
@@ -657,8 +657,6 @@
 				reshape();
 				parent_resized = false;
 				window_resized = true;
-				width = parent.getWidth();
-				height = parent.getHeight();
 			}
 
 			if ( processMessages )

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

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

From: <ka...@us...> - 2012-05-13 18:01:19

Revision: 3773
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3773&view=rev
Author:   kappa1
Date:     2012-05-13 18:01:12 +0000 (Sun, 13 May 2012)
Log Message:
-----------
Display.wasResized() should now work correctly when using Display.setParent()

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2012-05-13 13:50:52 UTC (rev 3772)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2012-05-13 18:01:12 UTC (rev 3773)
@@ -656,6 +656,9 @@
 			if ( parent_resized ) {
 				reshape();
 				parent_resized = false;
+				window_resized = true;
+				width = parent.getWidth();
+				height = parent.getHeight();
 			}
 
 			if ( processMessages )

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

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

From: <ka...@us...> - 2012-05-13 13:50:59

Revision: 3772
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3772&view=rev
Author:   kappa1
Date:     2012-05-13 13:50:52 +0000 (Sun, 13 May 2012)
Log Message:
-----------
AppletLoader: fixed issue with applets on linux with Java 7 where the natives where LWJGL natives were failing to load.

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	2012-05-13 12:11:12 UTC (rev 3771)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2012-05-13 13:50:52 UTC (rev 3772)
@@ -1222,7 +1222,13 @@
 			
 			// allow non lwjgl native to be found from cache directory
 			protected String findLibrary (String libname) {
-				return path + "natives" + File.separator + System.mapLibraryName(libname);
+				String libPath = path + "natives" + File.separator + System.mapLibraryName(libname);
+				
+				if (new File(libPath).exists()) {
+					return libPath;
+				}
+				
+				return super.findLibrary(libname);
 			}
 		};
 

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

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

From: <ka...@us...> - 2012-05-13 12:11:18

Revision: 3771
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3771&view=rev
Author:   kappa1
Date:     2012-05-13 12:11:12 +0000 (Sun, 13 May 2012)
Log Message:
-----------
Fix Mouse.getDX() and Mouse.getDY() values when mouse moves outside Display window & clipping is on. Thanks to ra4king for patch.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java

Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java	2012-05-09 12:33:16 UTC (rev 3770)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java	2012-05-13 12:11:12 UTC (rev 3771)
@@ -77,6 +77,12 @@
 
 	/** Mouse absolute Y position in pixels */
 	private static int				y;
+	
+	/** Mouse absolute X position in pixels without any clipping */
+	private static int				absolute_x;
+	
+	/** Mouse absolute Y position in pixels without any clipping */
+	private static int				absolute_y;
 
 	/** Buffer to hold the deltas dx, dy and dwheel */
 	private static IntBuffer	coord_buffer;
@@ -355,17 +361,21 @@
 				dy += poll_coord2;
 				x += poll_coord1;
 				y += poll_coord2;
+				absolute_x += poll_coord1;
+				absolute_y += poll_coord2;
 			} else {
-				dx = poll_coord1 - x;
-				dy = poll_coord2 - y;
-				x = poll_coord1;
-				y = poll_coord2;
+				dx = poll_coord1 - absolute_x;
+				dy = poll_coord2 - absolute_y;
+				absolute_x = x = poll_coord1;
+				absolute_y = y = poll_coord2;
 			}
-                        if(clipMouseCoordinatesToWindow) {
-                            x = Math.min(Display.getWidth() - 1, Math.max(0, x));
-                            y = Math.min(Display.getHeight() - 1, Math.max(0, y));
-                        }
-                        dwheel += poll_dwheel;
+                        
+			if(clipMouseCoordinatesToWindow) {
+				x = Math.min(Display.getWidth() - 1, Math.max(0, x));
+				y = Math.min(Display.getHeight() - 1, Math.max(0, y));
+			}
+			
+			dwheel += poll_dwheel;
 			read();
 		}
 	}

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3770] trunk/LWJGL/eclipse-update/org.lwjgl.info/ plugin.xml

From: <jpi...@us...> - 2012-05-09 12:33:27

Revision: 3770
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3770&view=rev
Author:   jpilgrim
Date:     2012-05-09 12:33:16 +0000 (Wed, 09 May 2012)
Log Message:
-----------
LWJGL info and test view are now sorted into category "general" (otherwise they are not visible in Eclipse 4.2)

Modified Paths:
--------------
    trunk/LWJGL/eclipse-update/org.lwjgl.info/plugin.xml

Modified: trunk/LWJGL/eclipse-update/org.lwjgl.info/plugin.xml
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.info/plugin.xml	2012-05-08 19:38:17 UTC (rev 3769)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.info/plugin.xml	2012-05-09 12:33:16 UTC (rev 3770)
@@ -3,6 +3,7 @@
 <plugin>
    <extension   point="org.eclipse.ui.views" >
       <view
+            category="org.eclipse.ui"
             class="org.lwjgl.info.LWJGLTestView"
             icon="icons/lwjgl_logo_16.gif"
             id="org.lwjgl.info.LWJGLTestView"
@@ -11,6 +12,7 @@
    
    <extension   point="org.eclipse.ui.views" >
       <view
+            category="org.eclipse.ui"
             class="org.lwjgl.info.LWJGLInfoView"
             icon="icons/lwjgl_logo_16.gif"
             id="org.lwjgl.info.LWJGLInfoView"

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

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

From: <ka...@us...> - 2012-05-08 19:38:24

Revision: 3769
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3769&view=rev
Author:   kappa1
Date:     2012-05-08 19:38:17 +0000 (Tue, 08 May 2012)
Log Message:
-----------
AppletLoader: fix to ensure a jar file download is attempted 3 times even if it throws some download exception.

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	2012-05-04 17:23:36 UTC (rev 3768)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2012-05-08 19:38:17 UTC (rev 3769)
@@ -211,11 +211,8 @@
 	/** used to calculate length of progress bar */
 	protected volatile int percentage;
 
-	/** current size of download in bytes */
-	protected int		currentSizeDownload;
-
 	/** total size of download in bytes */
-	protected int		totalSizeDownload;
+	protected int		totalDownloadSize;
 
 	/** current size of extracted in bytes */
 	protected int		currentSizeExtract;
@@ -1391,7 +1388,7 @@
 			 
 						if (fileSizes[i] >= 0) {
 							synchronized (sync) {
-								totalSizeDownload += fileSizes[i];
+								totalDownloadSize += fileSizes[i];
 							}
 						}
 
@@ -1438,6 +1435,7 @@
 		URLConnection urlconnection;
 
 		int initialPercentage = percentage = 15;
+		int amountDownloaded = 0;
 
 		// download each jar
 		byte buffer[] = new byte[65536];
@@ -1449,87 +1447,105 @@
 			int unsuccessfulAttempts = 0;
 			int maxUnsuccessfulAttempts = 3;
 			boolean downloadFile = true;
+			
+			String currentFile = getFileName(urlList[i]);
 
 			// download the jar a max of 3 times
 			while(downloadFile) {
 				downloadFile = false;
 
 				debug_sleep(2000);
-
-				urlconnection = urlList[i].openConnection();
-				urlconnection.setUseCaches(false);
-
-				if (urlconnection instanceof HttpURLConnection) {
-					urlconnection.setRequestProperty("Cache-Control", "no-store,max-age=0,no-cache");
-					urlconnection.connect();
-		        }
-
-				String currentFile = getFileName(urlList[i]);
-				InputStream inputstream = getJarInputStream(currentFile, urlconnection);
-				FileOutputStream fos = new FileOutputStream(path + currentFile);
 				
-				
-				int bufferSize;
-				long downloadStartTime = System.currentTimeMillis();
-				int downloadedAmount = 0;
-				int fileSize = 0;
-				String downloadSpeedMessage = "";
-				
-				try {	
-					while ((bufferSize = inputstream.read(buffer, 0, buffer.length)) != -1) {
-						debug_sleep(10);
-						fos.write(buffer, 0, bufferSize);
-						currentSizeDownload += bufferSize;
-						fileSize += bufferSize;
-						percentage = initialPercentage + ((currentSizeDownload * 45) / totalSizeDownload);
-						subtaskMessage = "Retrieving: " + currentFile + " " + ((currentSizeDownload * 100) / totalSizeDownload) + "%";
+				try {
+					urlconnection = urlList[i].openConnection();
+					urlconnection.setUseCaches(false);
 	
-						downloadedAmount += bufferSize;
-						long timeLapse = System.currentTimeMillis() - downloadStartTime;
-						// 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) downloadedAmount / timeLapse;
-							// round to two decimal places
-							downloadSpeed = ((int)(downloadSpeed*100))/100f;
-							// set current speed message
-							downloadSpeedMessage = " - " + downloadSpeed + " KB/sec";
-							// reset downloaded amount
-							downloadedAmount = 0;
-							// reset start time
-							downloadStartTime = System.currentTimeMillis();
+					if (urlconnection instanceof HttpURLConnection) {
+						urlconnection.setRequestProperty("Cache-Control", "no-store,max-age=0,no-cache");
+						urlconnection.connect();
+			        }
+	
+					
+					InputStream inputstream = getJarInputStream(currentFile, urlconnection);
+					FileOutputStream fos = new FileOutputStream(path + currentFile);
+					
+					
+					int bufferSize;
+					int currentDownload = 0;
+					
+					long downloadStartTime = System.currentTimeMillis();
+					int downloadedAmount = 0;
+					String downloadSpeedMessage = "";
+					
+					try {	
+						while ((bufferSize = inputstream.read(buffer, 0, buffer.length)) != -1) {
+							debug_sleep(10);
+							fos.write(buffer, 0, bufferSize);
+							currentDownload += bufferSize;
+							
+							int totalDownloaded = amountDownloaded + currentDownload;
+							percentage = initialPercentage + ((totalDownloaded * 45) / totalDownloadSize);
+							subtaskMessage = "Retrieving: " + currentFile + " " + ((totalDownloaded * 100) / totalDownloadSize) + "%";
+		
+							downloadedAmount += bufferSize;
+							long timeLapse = System.currentTimeMillis() - downloadStartTime;
+							// 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) downloadedAmount / timeLapse;
+								// round to two decimal places
+								downloadSpeed = ((int)(downloadSpeed*100))/100f;
+								// set current speed message
+								downloadSpeedMessage = " - " + downloadSpeed + " KB/sec";
+								// reset downloaded amount
+								downloadedAmount = 0;
+								// reset start time
+								downloadStartTime = System.currentTimeMillis();
+							}
+		
+							subtaskMessage += downloadSpeedMessage;
 						}
-	
-						subtaskMessage += downloadSpeedMessage;
+						
+					} finally {
+						inputstream.close();
+						fos.close();
 					}
 					
-				} finally {
-					inputstream.close();
-					fos.close();
+					// download complete, verify if it was successful
+					if (urlconnection instanceof HttpURLConnection) {
+		                if (currentDownload == fileSizes[i]) {
+		                	// successful download
+		                }
+		                else if (fileSizes[i] <= 0 && currentDownload != 0) {
+	                        // If contentLength for fileSizes[i] <= 0, we don't know if the download
+	                        // is complete. We're going to guess the download is complete.
+	                    }
+	                    else {
+	                    	throw new Exception("size mismatch on download of " + currentFile + 
+	                    						" expected " + fileSizes[i] + " got " + currentDownload);
+	                    }
+		            }
+					
+					// successful file download, update total amount downloaded
+					amountDownloaded += fileSizes[i];
+					
+				} catch (Exception e) {
+					e.printStackTrace(); // output exception to console
+					
+					// Failed to download the file
+					unsuccessfulAttempts++;
+	        		
+					// download failed try again
+	            	if (unsuccessfulAttempts < maxUnsuccessfulAttempts) {
+	            		downloadFile = true;
+	            		Thread.sleep(100); // wait a bit before retrying
+	            	}
+	            	else {
+	            		// retry attempts exhasted, download failed
+	            		throw new Exception("failed to download " + currentFile + 
+	            							" after " + maxUnsuccessfulAttempts + " attempts");
+	            	}
 				}
-				
-				// download complete, verify if it was successful
-				if (urlconnection instanceof HttpURLConnection) {
-	                if (fileSize == fileSizes[i]) {
-	                	// successful download
-	                }
-	                else if (fileSizes[i] <= 0) {
-                        // If contentLength for fileSizes[i] <= 0, we don't know if the download
-                        // is complete. We're going to guess the download is complete.
-                    }
-                    else {
-                    	unsuccessfulAttempts++;
-                		// download failed try again
-                    	if (unsuccessfulAttempts < maxUnsuccessfulAttempts) {
-                    		downloadFile = true;
-                    		currentSizeDownload -= fileSize; // reset progress bar
-                    	}
-                    	else {
-                    		// retry attempts exhasted, download failed
-                    		throw new Exception("failed to download " + currentFile);
-                    	}
-                    }
-	            }
 			}
 		}
 		subtaskMessage = "";

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

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

From: <sp...@us...> - 2012-05-04 17:23:43

Revision: 3768
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3768&view=rev
Author:   spasi
Date:     2012-05-04 17:23:36 +0000 (Fri, 04 May 2012)
Log Message:
-----------
GL spec 20120427 updates.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2012-05-04 17:23:36 UTC (rev 3768)
@@ -719,9 +719,9 @@
 	void glAccum(@GLenum int op, float value);
 
 	@DeprecatedGL
-	void glAlphaFunc(@GLenum int func, @GLclampf float ref);
+	void glAlphaFunc(@GLenum int func, float ref);
 
-	void glClearColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha);
+	void glClearColor(float red, float green, float blue, float alpha);
 
 	@DeprecatedGL
 	void glClearAccum(float red, float green, float blue, float alpha);
@@ -755,7 +755,7 @@
 	                          @GLuint IntBuffer textures,
 	                          @Const
 	                          @Check("textures.remaining()")
-	                          @GLclampf FloatBuffer priorities);
+	                          FloatBuffer priorities);
 
 	@DeprecatedGL
 	boolean glAreTexturesResident(@AutoSize("textures") @GLsizei int n,
@@ -776,7 +776,7 @@
 	@NoErrorCheck
 	void glArrayElement(int i);
 
-	void glClearDepth(@GLclampd double depth);
+	void glClearDepth(double depth);
 
 	@DeprecatedGL
 	void glDeleteLists(@GLuint int list, @GLsizei int range);
@@ -918,7 +918,7 @@
 
 	void glDrawArrays(@GLenum int mode, int first, @GLsizei int count);
 
-	void glDepthRange(@GLclampd double zNear, @GLclampd double zFar);
+	void glDepthRange(double zNear, double zFar);
 
 	void glDepthMask(boolean flag);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java	2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java	2012-05-04 17:23:36 UTC (rev 3768)
@@ -253,6 +253,6 @@
 	@DeprecatedGL
 	void glMultTransposeMatrixd(@Check("16") @Const DoubleBuffer m);
 
-	void glSampleCoverage(@GLclampf float value, boolean invert);
+	void glSampleCoverage(float value, boolean invert);
 }
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java	2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java	2012-05-04 17:23:36 UTC (rev 3768)
@@ -97,7 +97,7 @@
 
 	void glBlendEquation(@GLenum int mode);
 
-	void glBlendColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha);
+	void glBlendColor(float red, float green, float blue, float alpha);
 
 	@DeprecatedGL
 	void glFogCoordf(float coord);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2012-05-04 17:23:36 UTC (rev 3768)
@@ -76,9 +76,12 @@
 	// ----------------------[ EXT_copy_buffer ]----------------------
 	// ---------------------------------------------------------------
 
-	int GL_COPY_READ_BUFFER = 0x8F36;
-	int GL_COPY_WRITE_BUFFER = 0x8F37;
+	int GL_COPY_READ_BUFFER_BINDING = 0x8F36;
+	int GL_COPY_WRITE_BUFFER_BINDING = 0x8F37;
 
+	int GL_COPY_READ_BUFFER = GL_COPY_READ_BUFFER_BINDING;
+	int GL_COPY_WRITE_BUFFER = GL_COPY_WRITE_BUFFER_BINDING;
+
 	void glCopyBufferSubData(@GLenum int readtarget, @GLenum int writetarget, @GLintptr long readoffset, @GLintptr long writeoffset, @GLsizeiptr long size);
 
 	// --------------------------------------------------------------------

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java	2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java	2012-05-04 17:23:36 UTC (rev 3768)
@@ -184,7 +184,7 @@
 	 */
 	int GL_MIN_SAMPLE_SHADING_VALUE = 0x8C37;
 
-	void glMinSampleShading(@GLclampf float value);
+	void glMinSampleShading(float value);
 
 	// ---------------------------------------------------------------------
 	// ----------------------[ ARB_shader_subroutine ]----------------------
@@ -394,8 +394,10 @@
 	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev, GetIntegerv,
 	 * and GetFloatv:
 	 */
-	int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED = 0x8E23;
-	int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE = 0x8E24;
+	int GL_TRANSFORM_FEEDBACK_PAUSED = 0x8E23;
+	int GL_TRANSFORM_FEEDBACK_ACTIVE = 0x8E24;
+	int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED = GL_TRANSFORM_FEEDBACK_PAUSED;
+	int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE = GL_TRANSFORM_FEEDBACK_ACTIVE;
 	int GL_TRANSFORM_FEEDBACK_BINDING = 0x8E25;
 
 	void glBindTransformFeedback(@GLenum int target, @GLuint int id);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java	2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java	2012-05-04 17:23:36 UTC (rev 3768)
@@ -77,9 +77,9 @@
 	                                @OutParameter @Check("2") IntBuffer range,
 	                                @OutParameter @Check("1") IntBuffer precision);
 
-	void glDepthRangef(@GLclampf float n, @GLclampf float f);
+	void glDepthRangef(float n, float f);
 
-	void glClearDepthf(@GLclampf float d);
+	void glClearDepthf(float d);
 
 	// ----------------------------------------------------------------------
 	// ----------------------[ ARB_get_program_binary ]----------------------
@@ -447,9 +447,9 @@
 	void glScissorIndexedv(@GLuint int index, @Check("4") @Const IntBuffer v);
 
 	@StripPostfix("v")
-	void glDepthRangeArrayv(@GLuint int first, @AutoSize(value = "v", expression = " >> 1") @GLsizei int count, @Const @GLclampd DoubleBuffer v);
+	void glDepthRangeArrayv(@GLuint int first, @AutoSize(value = "v", expression = " >> 1") @GLsizei int count, @Const DoubleBuffer v);
 
-	void glDepthRangeIndexed(@GLuint int index, @GLclampd double n, @GLclampd double f);
+	void glDepthRangeIndexed(@GLuint int index, double n, double f);
 
 	@StripPostfix("data")
 	void glGetFloati_v(@GLenum int target, @GLuint int index, @Check @OutParameter FloatBuffer data);

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3767] trunk/LWJGL/eclipse-update/org.lwjgl.info/ src/java/org/lwjgl/info/LWJGLInfoView.java

From: <jpi...@us...> - 2012-04-26 18:08:21

Revision: 3767
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3767&view=rev
Author:   jpilgrim
Date:     2012-04-26 18:08:12 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
fixed problem with InfoView, also see https://bugs.eclipse.org/bugs/show_bug.cgi?id=367718

Modified Paths:
--------------
    trunk/LWJGL/eclipse-update/org.lwjgl.info/src/java/org/lwjgl/info/LWJGLInfoView.java

Modified: trunk/LWJGL/eclipse-update/org.lwjgl.info/src/java/org/lwjgl/info/LWJGLInfoView.java
===================================================================
--- trunk/LWJGL/eclipse-update/org.lwjgl.info/src/java/org/lwjgl/info/LWJGLInfoView.java	2012-04-26 13:19:18 UTC (rev 3766)
+++ trunk/LWJGL/eclipse-update/org.lwjgl.info/src/java/org/lwjgl/info/LWJGLInfoView.java	2012-04-26 18:08:12 UTC (rev 3767)
@@ -21,6 +21,8 @@
 import org.eclipse.core.runtime.IBundleGroupProvider;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.opengl.GLCanvas;
+import org.eclipse.swt.opengl.GLData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.part.ViewPart;
@@ -54,13 +56,23 @@
 	 */
 	@Override
 	public void createPartControl(Composite i_parent) {
-		
-		Text info = new Text(i_parent, SWT.READ_ONLY | SWT.LEFT | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL );
-		
+
+		Text info = new Text(i_parent, SWT.READ_ONLY | SWT.LEFT | SWT.MULTI
+				| SWT.H_SCROLL | SWT.V_SCROLL);
+
+		GLCanvas canvas = new GLCanvas(i_parent, SWT.NONE, new GLData());
+		canvas.setCurrent();
+		try {
+			GLContext.useContext(canvas);
+		} catch (LWJGLException ex) {
+			// TODO Implement catch block for LWJGLException
+			ex.printStackTrace();
+		}
+
 		String infoString = gatherInformation();
 		info.setText(infoString);
 	}
-	
+
 	static String getFeatureVersion(String myFeatureId) {
 		IBundleGroupProvider[] providers = Platform.getBundleGroupProviders();
 		if (providers != null) {
@@ -77,41 +89,36 @@
 	}
 
 	/**
+	 * @param i_canvas 
 	 * @return
 	 */
-	public static String gatherInformation() {
+	private static String gatherInformation() {
 		StringBuffer strb = new StringBuffer();
 
 		try {
-			Display.setFullscreen(false);
-			Display.create();
-		} catch (LWJGLException ex) {
-			warnNL(strb, "Error initializing OpenGL display: " + ex.getMessage());
-		}
-		
-		try {
-			infoNL(strb, "LWJGL feature version", getFeatureVersion("org.lwjgl"));
+			infoNL(strb, "LWJGL feature version",
+					getFeatureVersion("org.lwjgl"));
 		} catch (Exception ex) {
 			warnNL(strb, "Error retrieving feature version: " + ex.getMessage());
 		}
-		
-		infoNL(strb, "LWJGL version", Sys.getVersion() + (Sys.is64Bit() ? " (64bit)" : ""));
 
-		infoNL(strb, "Java", System.getProperty("java.version"), System
-				.getProperty("java.vendor"));
+		infoNL(strb, "LWJGL version", Sys.getVersion()
+				+ (Sys.is64Bit() ? " (64bit)" : ""));
+
+		infoNL(strb, "Java", System.getProperty("java.version"),
+				System.getProperty("java.vendor"));
 		infoNL(strb, "Platform", LWJGLUtil.getPlatformName());
 		infoNL(strb, "Graphics card", Display.getAdapter());
 		infoNL(strb, "Driver version", Display.getVersion());
 		infoNL(strb, "OpenGL driver version", GL11.glGetString(GL11.GL_VERSION));
 
 		infoNL(strb, "GLU version", Registry.gluGetString(GLU.GLU_VERSION));
-		infoNL(strb, "GLU extensions", Registry.gluGetString(GLU.GLU_EXTENSIONS));
-		
-		
-		
+		infoNL(strb, "GLU extensions",
+				Registry.gluGetString(GLU.GLU_EXTENSIONS));
+
 		ContextCapabilities caps = GLContext.getCapabilities();
 		openGLVersions(strb, caps);
-		
+
 		strb.append(NL).append("Capabilities").append(NL);
 		TreeMap<String, Boolean> capInfos = new TreeMap<String, Boolean>();
 		gatherCapabilities(caps, capInfos);
@@ -121,23 +128,37 @@
 
 		return strb.toString();
 	}
-	
+
 	static void openGLVersions(StringBuffer strb, ContextCapabilities caps) {
 		StringBuffer versions = new StringBuffer();
-		if (caps.OpenGL11) versions.append(", 1.1");
-		if (caps.OpenGL12) versions.append(", 1.2");
-		if (caps.OpenGL13) versions.append(", 1.3");
-		if (caps.OpenGL14) versions.append(", 1.4");
-		if (caps.OpenGL15) versions.append(", 1.5");
-		if (caps.OpenGL20) versions.append(", 2.0");
-		if (caps.OpenGL21) versions.append(", 2.1");
-		if (caps.OpenGL30) versions.append(", 3.0");
-		if (caps.OpenGL31) versions.append(", 3.1");
-		if (caps.OpenGL32) versions.append(", 3.2");
-		if (caps.OpenGL33) versions.append(", 3.3");
-		if (caps.OpenGL40) versions.append(", 4.0");
-		if (caps.OpenGL41) versions.append(", 4.1");
-		if (strb.length()>2) versions.delete(0, 2);
+		if (caps.OpenGL11)
+			versions.append(", 1.1");
+		if (caps.OpenGL12)
+			versions.append(", 1.2");
+		if (caps.OpenGL13)
+			versions.append(", 1.3");
+		if (caps.OpenGL14)
+			versions.append(", 1.4");
+		if (caps.OpenGL15)
+			versions.append(", 1.5");
+		if (caps.OpenGL20)
+			versions.append(", 2.0");
+		if (caps.OpenGL21)
+			versions.append(", 2.1");
+		if (caps.OpenGL30)
+			versions.append(", 3.0");
+		if (caps.OpenGL31)
+			versions.append(", 3.1");
+		if (caps.OpenGL32)
+			versions.append(", 3.2");
+		if (caps.OpenGL33)
+			versions.append(", 3.3");
+		if (caps.OpenGL40)
+			versions.append(", 4.0");
+		if (caps.OpenGL41)
+			versions.append(", 4.1");
+		if (strb.length() > 2)
+			versions.delete(0, 2);
 		infoNL(strb, "Supported OpenGL versions", versions.toString());
 	}
 
@@ -178,7 +199,7 @@
 			if (groupInfosSupported.isEmpty()) {
 				infoNL(strb, title, "n.a.");
 			} else {
-				
+
 				strb.append(title).append(": ");
 				for (int i = 0; i < TAB - title.length(); i++) {
 					strb.append(' ');
@@ -214,8 +235,7 @@
 		capInfos.put("AMD debug output", caps.GL_AMD_debug_output);
 		capInfos.put("AMD draw buffers blend", caps.GL_AMD_draw_buffers_blend);
 		capInfos.put("AMD name gen delete", caps.GL_AMD_name_gen_delete);
-		capInfos
-				.put("AMD performance monitor", caps.GL_AMD_performance_monitor);
+		capInfos.put("AMD performance monitor", caps.GL_AMD_performance_monitor);
 		capInfos.put("AMD seamless cubemap per texture",
 				caps.GL_AMD_seamless_cubemap_per_texture);
 		capInfos.put("AMD shader stencil export",
@@ -225,8 +245,7 @@
 				caps.GL_AMD_transform_feedback3_lines_triangles);
 		capInfos.put("AMD vertex shader tessellator",
 				caps.GL_AMD_vertex_shader_tessellator);
-		capInfos
-				.put("APPLE aux depth stencil", caps.GL_APPLE_aux_depth_stencil);
+		capInfos.put("APPLE aux depth stencil", caps.GL_APPLE_aux_depth_stencil);
 		capInfos.put("APPLE client storage", caps.GL_APPLE_client_storage);
 		capInfos.put("APPLE element array", caps.GL_APPLE_element_array);
 		capInfos.put("APPLE fence", caps.GL_APPLE_fence);
@@ -246,8 +265,7 @@
 				caps.GL_APPLE_vertex_program_evaluators);
 		capInfos.put("APPLE ycbcr 422", caps.GL_APPLE_ycbcr_422);
 		capInfos.put("ARB ES2 compatibility", caps.GL_ARB_ES2_compatibility);
-		capInfos
-				.put("ARB blend func extended", caps.GL_ARB_blend_func_extended);
+		capInfos.put("ARB blend func extended", caps.GL_ARB_blend_func_extended);
 		capInfos.put("ARB cl event", caps.GL_ARB_cl_event);
 		capInfos.put("ARB color buffer float", caps.GL_ARB_color_buffer_float);
 		capInfos.put("ARB compatibility", caps.GL_ARB_compatibility);
@@ -286,8 +304,7 @@
 		capInfos.put("ARB multitexture", caps.GL_ARB_multitexture);
 		capInfos.put("ARB occlusion query", caps.GL_ARB_occlusion_query);
 		capInfos.put("ARB occlusion query2", caps.GL_ARB_occlusion_query2);
-		capInfos
-				.put("ARB pixel buffer object", caps.GL_ARB_pixel_buffer_object);
+		capInfos.put("ARB pixel buffer object", caps.GL_ARB_pixel_buffer_object);
 		capInfos.put("ARB point parameters", caps.GL_ARB_point_parameters);
 		capInfos.put("ARB point sprite", caps.GL_ARB_point_sprite);
 		capInfos.put("ARB provoking vertex", caps.GL_ARB_provoking_vertex);
@@ -297,8 +314,7 @@
 		capInfos.put("ARB seamless cube map", caps.GL_ARB_seamless_cube_map);
 		capInfos.put("ARB separate shader objects",
 				caps.GL_ARB_separate_shader_objects);
-		capInfos
-				.put("ARB shader bit encoding", caps.GL_ARB_shader_bit_encoding);
+		capInfos.put("ARB shader bit encoding", caps.GL_ARB_shader_bit_encoding);
 		capInfos.put("ARB shader objects", caps.GL_ARB_shader_objects);
 		capInfos.put("ARB shader precision", caps.GL_ARB_shader_precision);
 		capInfos.put("ARB shader stencil export",
@@ -312,16 +328,14 @@
 		capInfos.put("ARB shadow", caps.GL_ARB_shadow);
 		capInfos.put("ARB shadow ambient", caps.GL_ARB_shadow_ambient);
 		capInfos.put("ARB sync", caps.GL_ARB_sync);
-		capInfos
-				.put("ARB tessellation shader", caps.GL_ARB_tessellation_shader);
+		capInfos.put("ARB tessellation shader", caps.GL_ARB_tessellation_shader);
 		capInfos.put("ARB texture border clamp",
 				caps.GL_ARB_texture_border_clamp);
 		capInfos.put("ARB texture buffer object",
 				caps.GL_ARB_texture_buffer_object);
 		capInfos.put("ARB texture buffer object rgb32",
 				caps.GL_ARB_texture_buffer_object_rgb32);
-		capInfos
-				.put("ARB texture compression", caps.GL_ARB_texture_compression);
+		capInfos.put("ARB texture compression", caps.GL_ARB_texture_compression);
 		capInfos.put("ARB texture compression bptc",
 				caps.GL_ARB_texture_compression_bptc);
 		capInfos.put("ARB texture compression rgtc",
@@ -330,8 +344,7 @@
 		capInfos.put("ARB texture cube map array",
 				caps.GL_ARB_texture_cube_map_array);
 		capInfos.put("ARB texture env add", caps.GL_ARB_texture_env_add);
-		capInfos
-				.put("ARB texture env combine", caps.GL_ARB_texture_env_combine);
+		capInfos.put("ARB texture env combine", caps.GL_ARB_texture_env_combine);
 		capInfos.put("ARB texture env crossbar",
 				caps.GL_ARB_texture_env_crossbar);
 		capInfos.put("ARB texture env dot3", caps.GL_ARB_texture_env_dot3);
@@ -339,8 +352,7 @@
 		capInfos.put("ARB texture gather", caps.GL_ARB_texture_gather);
 		capInfos.put("ARB texture mirrored repeat",
 				caps.GL_ARB_texture_mirrored_repeat);
-		capInfos
-				.put("ARB texture multisample", caps.GL_ARB_texture_multisample);
+		capInfos.put("ARB texture multisample", caps.GL_ARB_texture_multisample);
 		capInfos.put("ARB texture non power of two",
 				caps.GL_ARB_texture_non_power_of_two);
 		capInfos.put("ARB texture query lod", caps.GL_ARB_texture_query_lod);
@@ -349,18 +361,14 @@
 		capInfos.put("ARB texture rgb10 a2ui", caps.GL_ARB_texture_rgb10_a2ui);
 		capInfos.put("ARB texture swizzle", caps.GL_ARB_texture_swizzle);
 		capInfos.put("ARB timer query", caps.GL_ARB_timer_query);
-		capInfos
-				.put("ARB transform feedback2", caps.GL_ARB_transform_feedback2);
-		capInfos
-				.put("ARB transform feedback3", caps.GL_ARB_transform_feedback3);
+		capInfos.put("ARB transform feedback2", caps.GL_ARB_transform_feedback2);
+		capInfos.put("ARB transform feedback3", caps.GL_ARB_transform_feedback3);
 		capInfos.put("ARB transpose matrix", caps.GL_ARB_transpose_matrix);
 		capInfos.put("ARB uniform buffer object",
 				caps.GL_ARB_uniform_buffer_object);
 		capInfos.put("ARB vertex array bgra", caps.GL_ARB_vertex_array_bgra);
-		capInfos
-				.put("ARB vertex array object", caps.GL_ARB_vertex_array_object);
-		capInfos
-				.put("ARB vertex attrib 64bit", caps.GL_ARB_vertex_attrib_64bit);
+		capInfos.put("ARB vertex array object", caps.GL_ARB_vertex_array_object);
+		capInfos.put("ARB vertex attrib 64bit", caps.GL_ARB_vertex_attrib_64bit);
 		capInfos.put("ARB vertex blend", caps.GL_ARB_vertex_blend);
 		capInfos.put("ARB vertex buffer object",
 				caps.GL_ARB_vertex_buffer_object);
@@ -386,10 +394,8 @@
 		capInfos.put("ATI texture env combine3",
 				caps.GL_ATI_texture_env_combine3);
 		capInfos.put("ATI texture float", caps.GL_ATI_texture_float);
-		capInfos
-				.put("ATI texture mirror once", caps.GL_ATI_texture_mirror_once);
-		capInfos
-				.put("ATI vertex array object", caps.GL_ATI_vertex_array_object);
+		capInfos.put("ATI texture mirror once", caps.GL_ATI_texture_mirror_once);
+		capInfos.put("ATI vertex array object", caps.GL_ATI_vertex_array_object);
 		capInfos.put("ATI vertex attrib array object",
 				caps.GL_ATI_vertex_attrib_array_object);
 		capInfos.put("ATI vertex streams", caps.GL_ATI_vertex_streams);
@@ -399,20 +405,17 @@
 		capInfos.put("EXT blend color", caps.GL_EXT_blend_color);
 		capInfos.put("EXT blend equation separate",
 				caps.GL_EXT_blend_equation_separate);
-		capInfos
-				.put("EXT blend func separate", caps.GL_EXT_blend_func_separate);
+		capInfos.put("EXT blend func separate", caps.GL_EXT_blend_func_separate);
 		capInfos.put("EXT blend minmax", caps.GL_EXT_blend_minmax);
 		capInfos.put("EXT blend subtract", caps.GL_EXT_blend_subtract);
 		capInfos.put("EXT Cg shader", caps.GL_EXT_Cg_shader);
 		capInfos.put("EXT compiled vertex array",
 				caps.GL_EXT_compiled_vertex_array);
 		capInfos.put("EXT depth bounds test", caps.GL_EXT_depth_bounds_test);
-		capInfos
-				.put("EXT direct state access", caps.GL_EXT_direct_state_access);
+		capInfos.put("EXT direct state access", caps.GL_EXT_direct_state_access);
 		capInfos.put("EXT draw buffers2", caps.GL_EXT_draw_buffers2);
 		capInfos.put("EXT draw instanced", caps.GL_EXT_draw_instanced);
-		capInfos
-				.put("EXT draw range elements", caps.GL_EXT_draw_range_elements);
+		capInfos.put("EXT draw range elements", caps.GL_EXT_draw_range_elements);
 		capInfos.put("EXT fog coord", caps.GL_EXT_fog_coord);
 		capInfos.put("EXT framebuffer blit", caps.GL_EXT_framebuffer_blit);
 		capInfos.put("EXT framebuffer multisample",
@@ -429,8 +432,7 @@
 		capInfos.put("EXT packed float", caps.GL_EXT_packed_float);
 		capInfos.put("EXT packed pixels", caps.GL_EXT_packed_pixels);
 		capInfos.put("EXT paletted texture", caps.GL_EXT_paletted_texture);
-		capInfos
-				.put("EXT pixel buffer object", caps.GL_EXT_pixel_buffer_object);
+		capInfos.put("EXT pixel buffer object", caps.GL_EXT_pixel_buffer_object);
 		capInfos.put("EXT point parameters", caps.GL_EXT_point_parameters);
 		capInfos.put("EXT provoking vertex", caps.GL_EXT_provoking_vertex);
 		capInfos.put("EXT rescale normal", caps.GL_EXT_rescale_normal);
@@ -457,8 +459,7 @@
 				caps.GL_EXT_texture_compression_rgtc);
 		capInfos.put("EXT texture compression s3tc",
 				caps.GL_EXT_texture_compression_s3tc);
-		capInfos
-				.put("EXT texture env combine", caps.GL_EXT_texture_env_combine);
+		capInfos.put("EXT texture env combine", caps.GL_EXT_texture_env_combine);
 		capInfos.put("EXT texture env dot3", caps.GL_EXT_texture_env_dot3);
 		capInfos.put("EXT texture filter anisotropic",
 				caps.GL_EXT_texture_filter_anisotropic);
@@ -475,8 +476,7 @@
 		capInfos.put("EXT timer query", caps.GL_EXT_timer_query);
 		capInfos.put("EXT transform feedback", caps.GL_EXT_transform_feedback);
 		capInfos.put("EXT vertex array bgra", caps.GL_EXT_vertex_array_bgra);
-		capInfos
-				.put("EXT vertex attrib 64bit", caps.GL_EXT_vertex_attrib_64bit);
+		capInfos.put("EXT vertex attrib 64bit", caps.GL_EXT_vertex_attrib_64bit);
 		capInfos.put("EXT vertex shader", caps.GL_EXT_vertex_shader);
 		capInfos.put("EXT vertex weighting", caps.GL_EXT_vertex_weighting);
 
@@ -491,8 +491,7 @@
 		capInfos.put("NV depth buffer float", caps.GL_NV_depth_buffer_float);
 		capInfos.put("NV depth clamp", caps.GL_NV_depth_clamp);
 		capInfos.put("NV evaluators", caps.GL_NV_evaluators);
-		capInfos
-				.put("NV explicit multisample", caps.GL_NV_explicit_multisample);
+		capInfos.put("NV explicit multisample", caps.GL_NV_explicit_multisample);
 		capInfos.put("NV fence", caps.GL_NV_fence);
 		capInfos.put("NV float buffer", caps.GL_NV_float_buffer);
 		capInfos.put("NV fog distance", caps.GL_NV_fog_distance);
@@ -510,13 +509,11 @@
 		capInfos.put("NV gpu shader5", caps.GL_NV_gpu_shader5);
 		capInfos.put("NV half float", caps.GL_NV_half_float);
 		capInfos.put("NV light max exponent", caps.GL_NV_light_max_exponent);
-		capInfos
-				.put("NV multisample coverage", caps.GL_NV_multisample_coverage);
+		capInfos.put("NV multisample coverage", caps.GL_NV_multisample_coverage);
 		capInfos.put("NV multisample filter hint",
 				caps.GL_NV_multisample_filter_hint);
 		capInfos.put("NV occlusion query", caps.GL_NV_occlusion_query);
-		capInfos
-				.put("NV packed depth stencil", caps.GL_NV_packed_depth_stencil);
+		capInfos.put("NV packed depth stencil", caps.GL_NV_packed_depth_stencil);
 		capInfos.put("NV parameter buffer object",
 				caps.GL_NV_parameter_buffer_object);
 		capInfos.put("NV parameter buffer object2",
@@ -534,8 +531,7 @@
 		capInfos.put("NV texture barrier", caps.GL_NV_texture_barrier);
 		capInfos.put("NV texture compression vtc",
 				caps.GL_NV_texture_compression_vtc);
-		capInfos
-				.put("NV texture env combine4", caps.GL_NV_texture_env_combine4);
+		capInfos.put("NV texture env combine4", caps.GL_NV_texture_env_combine4);
 		capInfos.put("NV texture expand normal",
 				caps.GL_NV_texture_expand_normal);
 		capInfos.put("NV texture rectangle", caps.GL_NV_texture_rectangle);
@@ -591,7 +587,11 @@
 		io_strb.append(NL);
 	}
 
-	public static void main(String[] args) {
+	public static void main(String[] args) throws Exception {
+
+		Display.setFullscreen(false);
+		Display.create();
+
 		String s = gatherInformation();
 		System.out.println(s);
 	}

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

1095 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 2 3 4 5 .. 238 > >> (Page 3 of 238)