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

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

Revision: 3300
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3300&view=rev
Author:   spasi
Date:     2010-03-31 20:56:07 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
Added yet another glGetActiveUniform alternative.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java

Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2010-03-31 15:46:16 UTC (rev 3299)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2010-03-31 20:56:07 UTC (rev 3300)
@@ -45,7 +45,7 @@
  * $Id$
  */
 final class WindowsSysImplementation extends DefaultSysImplementation {
-	private final static int JNI_VERSION = 22;
+	private final static int JNI_VERSION = 22; 
 
 	static {
 		Sys.initialize();

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2010-03-31 15:46:16 UTC (rev 3299)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2010-03-31 20:56:07 UTC (rev 3300)
@@ -227,6 +227,16 @@
 	                            @OutParameter @GLenum @Check("1") IntBuffer type,
 	                            @OutParameter @GLcharARB ByteBuffer name);
 
+	/** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
+	@Alternate("glGetActiveUniformARB")
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveUniformARB3(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
+	                            @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
+	                            @OutParameter @Check("2") IntBuffer sizeType,
+	                            @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
+	                            @OutParameter @GLcharARB ByteBuffer name);
+
+	/** This version returns only the uniform size. */
 	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveUniformSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@@ -235,6 +245,7 @@
 	                               @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
 	                               @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
+	/** This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveUniformTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-03-31 15:46:16 UTC (rev 3299)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-03-31 20:56:07 UTC (rev 3300)
@@ -250,6 +250,16 @@
 	                         @OutParameter @GLenum @Check("1") IntBuffer type,
 	                         @OutParameter @GLchar ByteBuffer name);
 
+	/** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
+	@Alternate("glGetActiveUniformARB")
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveUniform3(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
+	                         @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
+	                         @OutParameter @Check("2") IntBuffer sizeType,
+	                         @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
+	                         @OutParameter @GLchar ByteBuffer name);
+
+	/** This version returns only the uniform size. */
 	@Alternate(value = "glGetActiveUniform", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveUniformSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@@ -258,6 +268,7 @@
 	                            @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
 	                            @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
+	/** This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveUniform", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveUniformType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,


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