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

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

Revision: 3313
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3313&view=rev
Author:   spasi
Date:     2010-04-07 12:06:10 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
More glGetActive changes.

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

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-07 11:59:33 UTC (rev 3312)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-07 12:06:10 UTC (rev 3313)
@@ -151,14 +151,14 @@
 	                           @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                           @OutParameter @GLcharARB ByteBuffer name);
 
-	/** Overloads glGetActiveAttribARB. This version returns only the uniform name. */
+	/** Overloads glGetActiveAttribARB. This version returns only the attrib name. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveAttribARB(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
 	                          @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
 	                          @OutParameter @GLcharARB ByteBuffer name);
 
-	/** Overloads glGetActiveAttribARB. This version returns only the uniform size. */
+	/** Overloads glGetActiveAttribARB. This version returns only the attrib size. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveAttribSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@@ -167,7 +167,7 @@
 	                              @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
 	                              @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
-	/** Overloads glGetActiveAttribARB. This version returns only the uniform type. */
+	/** Overloads glGetActiveAttribARB. This version returns only the attrib type. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveAttribTypeARB(@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-04-07 11:59:33 UTC (rev 3312)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-04-07 12:06:10 UTC (rev 3313)
@@ -404,29 +404,39 @@
 	                       @OutParameter @GLenum @Check("1") IntBuffer type,
 	                       @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveAttrib. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveAttrib")
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveAttrib2(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
 	                        @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                        @OutParameter @Check("1") IntBuffer size,
-	                        @OutParameter @GLenum @Check("1") IntBuffer type,
+	                        @OutParameter @Check("2") IntBuffer sizeType,
+	                        @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                        @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveAttrib. This version returns only the attrib name. */
 	@Alternate(value = "glGetActiveAttrib", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveAttrib(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
+	                       @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                       @OutParameter @GLchar ByteBuffer name);
+
+	/** Overloads glGetActiveAttribARB. This version returns only the attrib size. */
+	@Alternate(value = "glGetActiveAttrib", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveAttribSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                           @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                           @OutParameter IntBuffer size,
 	                           @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
-	                           @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                           @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
+	/** Overloads glGetActiveAttrib. This version returns only the attrib type. */
 	@Alternate(value = "glGetActiveAttrib", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveAttribType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                           @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                           @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
 	                           @OutParameter @GLenum IntBuffer type,
-	                           @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                           @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
 	int glGetAttribLocation(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
 


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