michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More glGetActive changes.

This commit is contained in:
Ioannis Tsakpinis 2010-04-07 11:59:33 +00:00
parent ea45359a98
commit 8c2a7b5d03
4 changed files with 66 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/templates/org/lwjgl/opengl/ARB_shader_objects.java
View File

@ -219,40 +219,39 @@ public interface ARB_shader_objects {
@OutParameter @GLenum @Check("1") IntBuffer type, @OutParameter @GLenum @Check("1") IntBuffer type,
@OutParameter @GLcharARB ByteBuffer name); @OutParameter @GLcharARB ByteBuffer name);
/** Overloads glGetActiveUniformARB. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
@Alternate("glGetActiveUniformARB") @Alternate("glGetActiveUniformARB")
@GLreturn(value = "name", maxLength = "maxLength") @GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveUniformARB2(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength, void glGetActiveUniformARB2(@GLhandleARB int programObj, @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 @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 @GLsizei @Constant("name_length, 0") IntBuffer length,
@OutParameter @Check("2") IntBuffer sizeType, @OutParameter @Check("2") IntBuffer sizeType,
@OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type, @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLcharARB ByteBuffer name); @OutParameter @GLcharARB ByteBuffer name);
/** This version returns only the uniform size. */ /** Overloads glGetActiveUniformARB. This version returns only the uniform name. */
@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
@GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveUniformARB(@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 glGetActiveUniformARB. This version returns only the uniform size. */
@Alternate(value = "glGetActiveUniformARB", javaAlt = true) @Alternate(value = "glGetActiveUniformARB", javaAlt = true)
@GLreturn(value = "size") @GLreturn(value = "size")
void glGetActiveUniformSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength, void glGetActiveUniformSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length, @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter IntBuffer size, @OutParameter IntBuffer size,
@OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
@GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name); @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
/** This version returns only the uniform type. */ /** Overloads glGetActiveUniformARB. This version returns only the uniform type. */
@Alternate(value = "glGetActiveUniformARB", javaAlt = true) @Alternate(value = "glGetActiveUniformARB", javaAlt = true)
@GLreturn(value = "type") @GLreturn(value = "type")
void glGetActiveUniformTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength, void glGetActiveUniformTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length, @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
@OutParameter @GLenum IntBuffer type, @OutParameter @GLenum IntBuffer type,
@GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name); @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
@StripPostfix("params") @StripPostfix("params")
void glGetUniformfvARB(@GLhandleARB int programObj, int location, @OutParameter @Check FloatBuffer params); void glGetUniformfvARB(@GLhandleARB int programObj, int location, @OutParameter @Check FloatBuffer params);

18
src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
View File

@ -142,29 +142,39 @@ public interface ARB_vertex_shader {
@OutParameter @GLenum @Check("1") IntBuffer type, @OutParameter @GLenum @Check("1") IntBuffer type,
@OutParameter @GLcharARB ByteBuffer name); @OutParameter @GLcharARB ByteBuffer name);
/** Overloads glGetActiveAttribARB. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
@Alternate("glGetActiveAttribARB") @Alternate("glGetActiveAttribARB")
@GLreturn(value = "name", maxLength = "maxLength") @GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveAttribARB2(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength, void glGetActiveAttribARB2(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length, @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
@OutParameter @Check("1") IntBuffer size, @OutParameter @Check("2") IntBuffer sizeType,
@OutParameter @GLenum @Check("1") IntBuffer type, @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLcharARB ByteBuffer name); @OutParameter @GLcharARB ByteBuffer name);
/** Overloads glGetActiveAttribARB. This version returns only the uniform 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. */
@Alternate(value = "glGetActiveAttribARB", javaAlt = true) @Alternate(value = "glGetActiveAttribARB", javaAlt = true)
@GLreturn(value = "size") @GLreturn(value = "size")
void glGetActiveAttribSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength, void glGetActiveAttribSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length, @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter IntBuffer size, @OutParameter IntBuffer size,
@OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
@GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name); @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
/** Overloads glGetActiveAttribARB. This version returns only the uniform type. */
@Alternate(value = "glGetActiveAttribARB", javaAlt = true) @Alternate(value = "glGetActiveAttribARB", javaAlt = true)
@GLreturn(value = "type") @GLreturn(value = "type")
void glGetActiveAttribTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength, void glGetActiveAttribTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length, @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
@OutParameter @GLenum IntBuffer type, @OutParameter @GLenum IntBuffer type,
@GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name); @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
int glGetAttribLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name); int glGetAttribLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name);

25
src/templates/org/lwjgl/opengl/GL20.java
View File

@ -242,40 +242,39 @@ public interface GL20 {
@OutParameter @GLenum @Check("1") IntBuffer type, @OutParameter @GLenum @Check("1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name); @OutParameter @GLchar ByteBuffer name);
/** Overloads glGetActiveUniform. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
@Alternate("glGetActiveUniform") @Alternate("glGetActiveUniform")
@GLreturn(value = "name", maxLength = "maxLength") @GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveUniform2(@GLuint int program, @GLuint int index, @GLsizei int maxLength, void glGetActiveUniform2(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
@OutParameter @GLsizei @Check("1") IntBuffer size,
@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("glGetActiveUniform")
@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 @GLsizei @Constant("name_length, 0") IntBuffer length,
@OutParameter @Check("2") IntBuffer sizeType, @OutParameter @Check("2") IntBuffer sizeType,
@OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type, @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name); @OutParameter @GLchar ByteBuffer name);
/** This version returns only the uniform size. */ /** Overloads glGetActiveUniformARB. This version returns only the uniform name. */
@Alternate(value = "glGetActiveUniform", javaAlt = true)
@GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveUniform(@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 glGetActiveUniform. This version returns only the uniform size. */
@Alternate(value = "glGetActiveUniform", javaAlt = true) @Alternate(value = "glGetActiveUniform", javaAlt = true)
@GLreturn(value = "size") @GLreturn(value = "size")
void glGetActiveUniformSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength, void glGetActiveUniformSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length, @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter IntBuffer size, @OutParameter IntBuffer size,
@OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore @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);
/** This version returns only the uniform type. */ /** Overloads glGetActiveUniform. This version returns only the uniform type. */
@Alternate(value = "glGetActiveUniform", javaAlt = true) @Alternate(value = "glGetActiveUniform", javaAlt = true)
@GLreturn(value = "type") @GLreturn(value = "type")
void glGetActiveUniformType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength, void glGetActiveUniformType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length, @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
@OutParameter @GLenum IntBuffer type, @OutParameter @GLenum IntBuffer type,
@GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name); @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
@StripPostfix("params") @StripPostfix("params")
void glGetUniformfv(@GLuint int program, int location, @OutParameter @Check FloatBuffer params); void glGetUniformfv(@GLuint int program, int location, @OutParameter @Check FloatBuffer params);

30
src/templates/org/lwjgl/opengl/NV_transform_feedback.java
View File

@ -137,14 +137,40 @@ public interface NV_transform_feedback {
@OutParameter @GLenum @Check("1") IntBuffer type, @OutParameter @GLenum @Check("1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name); @OutParameter @GLchar ByteBuffer name);
/** Overloads glGetActiveVaryingNV. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
@Alternate("glGetActiveVaryingNV") @Alternate("glGetActiveVaryingNV")
@GLreturn(value = "name", maxLength = "bufSize") @GLreturn(value = "name", maxLength = "bufSize")
void glGetActiveVaryingNV2(@GLuint int program, @GLuint int index, @GLsizei int bufSize, void glGetActiveVaryingNV2(@GLuint int program, @GLuint int index, @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length, @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
@OutParameter @GLsizei @Check("1") IntBuffer size, @OutParameter @Check("2") IntBuffer sizeType,
@OutParameter @GLenum @Check("1") IntBuffer type, @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name); @OutParameter @GLchar ByteBuffer name);
/** Overloads glGetActiveVaryingNV. This version returns only the varying name. */
@Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
@GLreturn(value = "name", maxLength = "bufSize")
void glGetActiveVaryingNV(@GLuint int program, @GLuint int index, @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
@OutParameter @GLchar ByteBuffer name);
/** Overloads glGetActiveVaryingNV. This version returns only the varying size. */
@Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
@GLreturn(value = "size")
void glGetActiveVaryingSizeNV(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter IntBuffer size,
@OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
@OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
/** Overloads glGetActiveVaryingNV. This version returns only the varying type. */
@Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
@GLreturn(value = "type")
void glGetActiveVaryingTypeNV(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
@OutParameter @GLenum IntBuffer type,
@OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
void glActiveVaryingNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name); void glActiveVaryingNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
@Alternate("glActiveVaryingNV") @Alternate("glActiveVaryingNV")