Added yet another glGetActiveUniform alternative.
This commit is contained in:
parent
6e738cc2b6
commit
37489e8c94
|
@ -45,7 +45,7 @@ import org.lwjgl.opengl.Display;
|
||||||
* $Id$
|
* $Id$
|
||||||
*/
|
*/
|
||||||
final class WindowsSysImplementation extends DefaultSysImplementation {
|
final class WindowsSysImplementation extends DefaultSysImplementation {
|
||||||
private final static int JNI_VERSION = 22;
|
private final static int JNI_VERSION = 22;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
Sys.initialize();
|
Sys.initialize();
|
||||||
|
|
|
@ -227,6 +227,16 @@ 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);
|
||||||
|
|
||||||
|
/** 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)
|
@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,
|
||||||
|
@ -235,6 +245,7 @@ public interface ARB_shader_objects {
|
||||||
@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);
|
@GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
|
||||||
|
|
||||||
|
/** 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,
|
||||||
|
|
|
@ -250,6 +250,16 @@ public interface GL20 {
|
||||||
@OutParameter @GLenum @Check("1") IntBuffer type,
|
@OutParameter @GLenum @Check("1") IntBuffer type,
|
||||||
@OutParameter @GLchar ByteBuffer name);
|
@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)
|
@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,
|
||||||
|
@ -258,6 +268,7 @@ public interface GL20 {
|
||||||
@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);
|
@GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
|
||||||
|
|
||||||
|
/** 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,
|
||||||
|
|
Loading…
Reference in New Issue