Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3838] trunk/LWJGL/src
|
From: <sp...@us...> - 2013-01-25 15:39:22
|
Revision: 3838
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3838&view=rev
Author: spasi
Date: 2013-01-25 15:39:08 +0000 (Fri, 25 Jan 2013)
Log Message:
-----------
Sync with recent Git changes.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/AMDDebugOutputCallback.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ARBDebugOutputCallback.java
trunk/LWJGL/src/java/org/lwjgl/opengl/KHRDebugCallback.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c
trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java
trunk/LWJGL/src/templates/org/lwjgl/opencl/CL12.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_ES2_compatibility.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_indirect.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multi_draw_indirect.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_storage.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_64bit.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.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_gpu_shader5.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AMDDebugOutputCallback.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AMDDebugOutputCallback.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AMDDebugOutputCallback.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -110,7 +110,7 @@
description = "OTHER";
break;
default:
- description = "Unknown (" + Integer.toHexString(category) + ")";
+ description = printUnknownToken(category);
}
System.err.println("\tCategory: " + description);
@@ -125,12 +125,16 @@
description = "LOW";
break;
default:
- description = "Unknown (" + Integer.toHexString(category) + ")";
+ description = printUnknownToken(severity);
}
System.err.println("\tSeverity: " + description);
System.err.println("\tMessage: " + message);
}
+
+ private String printUnknownToken(final int token) {
+ return "Unknown (0x" + Integer.toHexString(token).toUpperCase() + ")";
+ }
});
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ARBDebugOutputCallback.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ARBDebugOutputCallback.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ARBDebugOutputCallback.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -113,7 +113,7 @@
description = "OTHER";
break;
default:
- description = "Unknown (" + Integer.toHexString(source) + ")";
+ description = printUnknownToken(source);
}
System.err.println("\tSource: " + description);
@@ -137,7 +137,7 @@
description = "OTHER";
break;
default:
- description = "Unknown (" + Integer.toHexString(source) + ")";
+ description = printUnknownToken(type);
}
System.err.println("\tType: " + description);
@@ -152,12 +152,16 @@
description = "LOW";
break;
default:
- description = "Unknown (" + Integer.toHexString(source) + ")";
+ description = printUnknownToken(severity);
}
System.err.println("\tSeverity: " + description);
System.err.println("\tMessage: " + message);
}
+
+ private String printUnknownToken(final int token) {
+ return "Unknown (0x" + Integer.toHexString(token).toUpperCase() + ")";
+ }
});
}
@@ -184,9 +188,9 @@
/**
* 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 id the message ID
* @param severity the message severity
* @param message the string representation of the message.
*/
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/KHRDebugCallback.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/KHRDebugCallback.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/KHRDebugCallback.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -115,7 +115,7 @@
description = "OTHER";
break;
default:
- description = "Unknown (" + Integer.toHexString(source) + ")";
+ description = printUnknownToken(source);
}
System.err.println("\tSource: " + description);
@@ -142,7 +142,7 @@
description = "MARKER";
break;
default:
- description = "Unknown (" + Integer.toHexString(source) + ")";
+ description = printUnknownToken(type);
}
System.err.println("\tType: " + description);
@@ -160,12 +160,16 @@
description = "NOTIFICATION";
break;
default:
- description = "Unknown (" + Integer.toHexString(source) + ")";
+ description = printUnknownToken(severity);
}
System.err.println("\tSeverity: " + description);
System.err.println("\tMessage: " + message);
}
+
+ private String printUnknownToken(final int token) {
+ return "Unknown (0x" + Integer.toHexString(token).toUpperCase() + ")";
+ }
});
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -39,7 +39,6 @@
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
-import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.input.Keyboard;
@@ -97,8 +96,8 @@
private static native int ToUnicode(int wVirtKey, int wScanCode, ByteBuffer lpKeyState, CharBuffer pwszBuff, int cchBuff, int flags);
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 static native short GetKeyState(int virt_key);
+ private static native short GetAsyncKeyState(int virt_key);
private void putEvent(int keycode, byte state, int ch, long millis, boolean repeat) {
tmp_event.clear();
@@ -154,10 +153,6 @@
return (state & 1) == 1;
}
- private static boolean isKeyPressedAsync(int state) {
- return (state >>> 31) == 1;
- }
-
public void handleKey(int virt_key, int scan_code, boolean extended, byte event_state, long millis, boolean repeat) {
virt_key = translateExtended(virt_key, scan_code, event_state, extended);
if ( !repeat && isKeyPressed(event_state) == isKeyPressed(virt_key_down_buffer[virt_key]) )
@@ -180,7 +175,7 @@
public void fireLostKeyEvents() {
for ( int i = 0; i < virt_key_down_buffer.length; i++ ) {
- if ( isKeyPressed(virt_key_down_buffer[i]) && !isKeyPressedAsync(GetAsyncKeyState(i)) )
+ if ( isKeyPressed(virt_key_down_buffer[i]) && (GetAsyncKeyState(i) & 0x8000) == 0 )
handleKey(i, 0, false, (byte)0, System.currentTimeMillis(), false);
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VersionTest.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -120,6 +120,7 @@
boolean deprecated = false;
try {
glVertex3f(0.0f, 0.0f, 0.0f);
+ Util.checkGLError();
deprecated = true;
} catch (Throwable t) {}
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -233,6 +233,10 @@
}
public static String getQualifiedNativeMethodName(String qualified_class_name, String method_name) {
+ // Escape '_' in method name
+ if ( method_name.indexOf('_') != -1 )
+ method_name = method_name.replace("_", "_1");
+
return "Java_" + getNativeQualifiedName(qualified_class_name) + "_" + method_name;
}
Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsKeyboard.c 2013-01-25 15:39:08 UTC (rev 3838)
@@ -41,11 +41,11 @@
#include <jni.h>
#include "org_lwjgl_opengl_WindowsKeyboard.h"
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsKeyboard_GetKeyState(JNIEnv *env, jclass unused, jint virt_key) {
+JNIEXPORT jshort JNICALL Java_org_lwjgl_opengl_WindowsKeyboard_GetKeyState(JNIEnv *env, jclass unused, jint virt_key) {
return GetKeyState(virt_key);
}
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_WindowsKeyboard_GetAsyncKeyState(JNIEnv *env, jclass unused, jint virt_key) {
+JNIEXPORT jshort JNICALL Java_org_lwjgl_opengl_WindowsKeyboard_GetAsyncKeyState(JNIEnv *env, jclass unused, jint virt_key) {
return GetAsyncKeyState(virt_key);
}
Modified: trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -1149,11 +1149,11 @@
@Private
@PointerWrapper("void *")
- CLFunctionAddress clGetExtensionFunctionAddress(@Check("1") @Const @cl_char ByteBuffer func_name);
+ CLFunctionAddress clGetExtensionFunctionAddress(@NullTerminated @Const @cl_char ByteBuffer func_name);
@Alternate("clGetExtensionFunctionAddress")
@Private
@PointerWrapper("void *")
- CLFunctionAddress clGetExtensionFunctionAddress(CharSequence func_name);
+ CLFunctionAddress clGetExtensionFunctionAddress(@NullTerminated CharSequence func_name);
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opencl/CL12.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/CL12.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/CL12.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -435,12 +435,12 @@
@Private
@PointerWrapper("void *")
CLFunctionAddress clGetExtensionFunctionAddressForPlatform(@PointerWrapper("cl_platform_id") CLPlatform platform,
- @Check("1") @Const @cl_char ByteBuffer func_name);
+ @NullTerminated @Const @cl_char ByteBuffer func_name);
@Alternate("clGetExtensionFunctionAddressForPlatform")
@Private
@PointerWrapper("void *")
CLFunctionAddress clGetExtensionFunctionAddressForPlatform(@PointerWrapper("cl_platform_id") CLPlatform platform,
- CharSequence func_name);
+ @NullTerminated CharSequence func_name);
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_multi_draw_indirect.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -44,26 +44,26 @@
public interface AMD_multi_draw_indirect {
void glMultiDrawArraysIndirectAMD(@GLenum int mode,
- @BufferObject(BufferKind.IndirectBO) @Check("4 * primcount") @Const @GLvoid ByteBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 4 * 4 : stride) * primcount") @Const @GLvoid ByteBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
@Alternate("glMultiDrawArraysIndirectAMD")
void glMultiDrawArraysIndirectAMD(@GLenum int mode,
- @BufferObject(BufferKind.IndirectBO) @Check("4 * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 4 : stride >> 2) * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
void glMultiDrawElementsIndirectAMD(@GLenum int mode,
@GLenum int type,
- @BufferObject(BufferKind.IndirectBO) @Check("5 * primcount") @Const @GLvoid ByteBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 5 * 4 : stride) * primcount") @Const @GLvoid ByteBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
@Alternate("glMultiDrawElementsIndirectAMD")
void glMultiDrawElementsIndirectAMD(@GLenum int mode,
@GLenum int type,
- @BufferObject(BufferKind.IndirectBO) @Check("5 * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 5 : stride >> 2) * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_ES2_compatibility.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_ES2_compatibility.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_ES2_compatibility.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -65,6 +65,9 @@
GL_MEDIUM_INT = 0x8DF4,
GL_HIGH_INT = 0x8DF5;
+ /** Accepted by the <format> parameter of most commands taking sized internal formats: */
+ int GL_RGB565 = 0x8D62;
+
@Reuse("GL41")
void glReleaseShaderCompiler();
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_indirect.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_indirect.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_indirect.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -58,17 +58,17 @@
int GL_DRAW_INDIRECT_BUFFER_BINDING = 0x8F43;
@Reuse("GL40")
- void glDrawArraysIndirect(@GLenum int mode, @BufferObject(BufferKind.IndirectBO) @Check("4") @NullTerminated @Const @GLvoid ByteBuffer indirect);
+ void glDrawArraysIndirect(@GLenum int mode, @BufferObject(BufferKind.IndirectBO) @Check("4 * 4") @Const @GLvoid ByteBuffer indirect);
@Reuse("GL40")
@Alternate("glDrawArraysIndirect")
- void glDrawArraysIndirect(@GLenum int mode, @BufferObject(BufferKind.IndirectBO) @Check("4") @NullTerminated @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect);
+ void glDrawArraysIndirect(@GLenum int mode, @BufferObject(BufferKind.IndirectBO) @Check("4") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect);
@Reuse("GL40")
- void glDrawElementsIndirect(@GLenum int mode, @GLenum int type, @BufferObject(BufferKind.IndirectBO) @Check("5") @NullTerminated @Const @GLvoid ByteBuffer indirect);
+ void glDrawElementsIndirect(@GLenum int mode, @GLenum int type, @BufferObject(BufferKind.IndirectBO) @Check("5 * 4") @Const @GLvoid ByteBuffer indirect);
@Reuse("GL40")
@Alternate("glDrawElementsIndirect")
- void glDrawElementsIndirect(@GLenum int mode, @GLenum int type, @BufferObject(BufferKind.IndirectBO) @Check("5") @NullTerminated @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect);
+ void glDrawElementsIndirect(@GLenum int mode, @GLenum int type, @BufferObject(BufferKind.IndirectBO) @Check("5") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect);
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multi_draw_indirect.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multi_draw_indirect.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_multi_draw_indirect.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -45,21 +45,21 @@
@Reuse("GL43")
void glMultiDrawArraysIndirect(@GLenum int mode,
- @BufferObject(BufferKind.IndirectBO) @Check("4 * 4 * primcount") @Const @GLvoid ByteBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 4 * 4 : stride) * primcount") @Const @GLvoid ByteBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
@Reuse("GL43")
@Alternate("glMultiDrawArraysIndirect")
void glMultiDrawArraysIndirect(@GLenum int mode,
- @BufferObject(BufferKind.IndirectBO) @Check("4 * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 4 : stride >> 2) * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
@Reuse("GL43")
void glMultiDrawElementsIndirect(@GLenum int mode,
@GLenum int type,
- @BufferObject(BufferKind.IndirectBO) @Check("5 * primcount") @Const @GLvoid ByteBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 5 * 4 : stride) * primcount") @Const @GLvoid ByteBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
@@ -67,7 +67,7 @@
@Alternate("glMultiDrawElementsIndirect")
void glMultiDrawElementsIndirect(@GLenum int mode,
@GLenum int type,
- @BufferObject(BufferKind.IndirectBO) @Check("5 * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 5 : stride >> 2) * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -41,9 +41,9 @@
* CopyTexImage2D, and CompressedTexImage2D and the <format> parameter
* of CompressedTexSubImage2D:
*/
- int GL_COMPRESSED_RED_RGTC1 = 0x8DBB;
- int GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC;
- int GL_COMPRESSED_RED_GREEN_RGTC2 = 0x8DBD;
- int GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2 = 0x8DBE;
+ int GL_COMPRESSED_RED_RGTC1 = 0x8DBB,
+ GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC,
+ GL_COMPRESSED_RG_RGTC2 = 0x8DBD,
+ GL_COMPRESSED_SIGNED_RG_RGTC2 = 0x8DBE;
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_storage.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_storage.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_storage.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -60,17 +60,17 @@
@GLenum int internalformat,
@GLsizei int width, @GLsizei int height, @GLsizei int depth);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glTextureStorage1DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels,
@GLenum int internalformat,
@GLsizei int width);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glTextureStorage2DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels,
@GLenum int internalformat,
@GLsizei int width, @GLsizei int height);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glTextureStorage3DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels,
@GLenum int internalformat,
@GLsizei int width, @GLsizei int height, @GLsizei int depth);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_64bit.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_64bit.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_64bit.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -93,7 +93,7 @@
@StripPostfix("params")
void glGetVertexAttribLdv(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") DoubleBuffer params);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glVertexArrayVertexAttribLOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLuint int index, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -1353,13 +1353,13 @@
framebuffer"
*/
- @Dependent("GL_EXT_geometry_shader4,NV_geometry_program4")
+ @Dependent("GL_EXT_geometry_shader4,GL_NV_geometry_program4")
void glNamedFramebufferTextureEXT(@GLuint int framebuffer, @GLenum int attachment, @GLuint int texture, int level);
- @Dependent("GL_EXT_geometry_shader4,NV_geometry_program4")
+ @Dependent("GL_EXT_geometry_shader4,GL_NV_geometry_program4")
void glNamedFramebufferTextureLayerEXT(@GLuint int framebuffer, @GLenum int attachment, @GLuint int texture, int level, int layer);
- @Dependent("GL_EXT_geometry_shader4,NV_geometry_program4")
+ @Dependent("GL_EXT_geometry_shader4,GL_NV_geometry_program4")
void glNamedFramebufferTextureFaceEXT(@GLuint int framebuffer, @GLenum int attachment, @GLuint int texture, int level, @GLenum int face);
/*
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -83,7 +83,7 @@
void glGetVertexAttribLdvEXT(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") DoubleBuffer params);
@Reuse("ARBVertexAttrib64bit")
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glVertexArrayVertexAttribLOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLuint int index, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
}
\ 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-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -319,7 +319,7 @@
void glClampColor(@GLenum int target, @GLenum int clamp);
// ----------------------------------------------------------------------
- // ----------------------[ NV_depth_buffer_float ]----------------------
+ // ----------------------[ ARB_depth_buffer_float ]----------------------
// ----------------------------------------------------------------------
/**
@@ -328,8 +328,8 @@
* and returned in the <data> parameter of GetTexLevelParameter and
* GetRenderbufferParameterivEXT:
*/
- int GL_DEPTH_COMPONENT32F = 0x8DAB;
- int GL_DEPTH32F_STENCIL8 = 0x8DAC;
+ int GL_DEPTH_COMPONENT32F = 0x8CAC;
+ int GL_DEPTH32F_STENCIL8 = 0x8CAD;
/**
* Accepted by the <type> parameter of DrawPixels, ReadPixels, TexImage1D,
@@ -876,10 +876,10 @@
* CopyTexImage2D, and CompressedTexImage2D and the <format> parameter
* of CompressedTexSubImage2D:
*/
- int GL_COMPRESSED_RED_RGTC1 = 0x8DBB;
- int GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC;
- int GL_COMPRESSED_RED_GREEN_RGTC2 = 0x8DBD;
- int GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2 = 0x8DBE;
+ int GL_COMPRESSED_RED_RGTC1 = 0x8DBB,
+ GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC,
+ GL_COMPRESSED_RG_RGTC2 = 0x8DBD,
+ GL_COMPRESSED_SIGNED_RG_RGTC2 = 0x8DBE;
// --------------------------------------------------------------
// ----------------------[ ARB_texture_rg ]----------------------
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -75,15 +75,15 @@
*/
int GL_DRAW_INDIRECT_BUFFER_BINDING = 0x8F43;
- void glDrawArraysIndirect(@GLenum int mode, @BufferObject(BufferKind.IndirectBO) @Check("4") @NullTerminated @Const @GLvoid ByteBuffer indirect);
+ void glDrawArraysIndirect(@GLenum int mode, @BufferObject(BufferKind.IndirectBO) @Check("4 * 4") @Const @GLvoid ByteBuffer indirect);
@Alternate("glDrawArraysIndirect")
- void glDrawArraysIndirect(@GLenum int mode, @BufferObject(BufferKind.IndirectBO) @Check("4") @NullTerminated @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect);
+ void glDrawArraysIndirect(@GLenum int mode, @BufferObject(BufferKind.IndirectBO) @Check("4") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect);
- void glDrawElementsIndirect(@GLenum int mode, @GLenum int type, @BufferObject(BufferKind.IndirectBO) @Check("5") @NullTerminated @Const @GLvoid ByteBuffer indirect);
+ void glDrawElementsIndirect(@GLenum int mode, @GLenum int type, @BufferObject(BufferKind.IndirectBO) @Check("5 * 4") @Const @GLvoid ByteBuffer indirect);
@Alternate("glDrawElementsIndirect")
- void glDrawElementsIndirect(@GLenum int mode, @GLenum int type, @BufferObject(BufferKind.IndirectBO) @Check("5") @NullTerminated @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect);
+ void glDrawElementsIndirect(@GLenum int mode, @GLenum int type, @BufferObject(BufferKind.IndirectBO) @Check("5") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect);
// ---------------------------------------------------------------
// ----------------------[ ARB_gpu_shader5 ]----------------------
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -68,6 +68,9 @@
GL_MEDIUM_INT = 0x8DF4,
GL_HIGH_INT = 0x8DF5;
+ /** Accepted by the <format> parameter of most commands taking sized internal formats: */
+ int GL_RGB565 = 0x8D62;
+
void glReleaseShaderCompiler();
void glShaderBinary(@AutoSize("shaders") @GLsizei int count, @Const @GLuint IntBuffer shaders,
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -568,26 +568,26 @@
// -----------------------------------------------------------------------
void glMultiDrawArraysIndirect(@GLenum int mode,
- @BufferObject(BufferKind.IndirectBO) @Check("4 * 4 * primcount") @Const @GLvoid ByteBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 4 * 4 : stride) * primcount") @Const @GLvoid ByteBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
@Alternate("glMultiDrawArraysIndirect")
void glMultiDrawArraysIndirect(@GLenum int mode,
- @BufferObject(BufferKind.IndirectBO) @Check("4 * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 4 : stride >> 2) * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
void glMultiDrawElementsIndirect(@GLenum int mode,
@GLenum int type,
- @BufferObject(BufferKind.IndirectBO) @Check("5 * primcount") @Const @GLvoid ByteBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 5 * 4 : stride) * primcount") @Const @GLvoid ByteBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
@Alternate("glMultiDrawElementsIndirect")
void glMultiDrawElementsIndirect(@GLenum int mode,
@GLenum int type,
- @BufferObject(BufferKind.IndirectBO) @Check("5 * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
+ @BufferObject(BufferKind.IndirectBO) @Check("(stride == 0 ? 5 : stride >> 2) * primcount") @Const @GLvoid(PrimitiveType.Kind.INT) IntBuffer indirect,
@GLsizei int primcount,
@GLsizei int stride);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -127,59 +127,59 @@
// -------------
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glProgramUniform1i64NV(@GLuint int program, int location, @GLint64EXT long x);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glProgramUniform2i64NV(@GLuint int program, int location, @GLint64EXT long x, @GLint64EXT long y);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glProgramUniform3i64NV(@GLuint int program, int location, @GLint64EXT long x, @GLint64EXT long y, @GLint64EXT long z);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glProgramUniform4i64NV(@GLuint int program, int location, @GLint64EXT long x, @GLint64EXT long y, @GLint64EXT long z, @GLint64EXT long w);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
@StripPostfix("value")
void glProgramUniform1i64vNV(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @Const @GLint64EXT LongBuffer value);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
@StripPostfix("value")
void glProgramUniform2i64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 1") @GLsizei int count, @Const @GLint64EXT LongBuffer value);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
@StripPostfix("value")
void glProgramUniform3i64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " / 3") @GLsizei int count, @Const @GLint64EXT LongBuffer value);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
@StripPostfix("value")
void glProgramUniform4i64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, @Const @GLint64EXT LongBuffer value);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glProgramUniform1ui64NV(@GLuint int program, int location, @GLuint64EXT long x);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glProgramUniform2ui64NV(@GLuint int program, int location, @GLuint64EXT long x, @GLuint64EXT long y);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glProgramUniform3ui64NV(@GLuint int program, int location, @GLuint64EXT long x, @GLuint64EXT long y, @GLuint64EXT long z);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
void glProgramUniform4ui64NV(@GLuint int program, int location, @GLuint64EXT long x, @GLuint64EXT long y, @GLuint64EXT long z, @GLuint64EXT long w);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
@StripPostfix("value")
void glProgramUniform1ui64vNV(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @Const @GLuint64EXT LongBuffer value);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
@StripPostfix("value")
void glProgramUniform2ui64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 1") @GLsizei int count, @Const @GLuint64EXT LongBuffer value);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
@StripPostfix("value")
void glProgramUniform3ui64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " / 3") @GLsizei int count, @Const @GLuint64EXT LongBuffer value);
- @Dependent("EXT_direct_state_access")
+ @Dependent("GL_EXT_direct_state_access")
@StripPostfix("value")
void glProgramUniform4ui64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, @Const @GLuint64EXT LongBuffer value);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java 2012-12-19 12:38:50 UTC (rev 3837)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java 2013-01-25 15:39:08 UTC (rev 3838)
@@ -92,7 +92,7 @@
@StripPostfix("params")
void glGetVertexAttribLui64vNV(@GLuint int index, @GLenum int pname, @OutParameter @GLuint64EXT @Check("4") LongBuffer params);
- @Dependent("NV_vertex_buffer_unified_memory")
+ @Dependent("GL_NV_vertex_buffer_unified_memory")
void glVertexAttribLFormatNV(@GLuint int index, int size, @GLenum int type, @GLsizei int stride);
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
