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

Restored (most of) the removed methods from the previous commit and added deprecation warnings.

This commit is contained in:
Ioannis Tsakpinis 2012-08-19 06:56:25 +00:00
parent e7edecf2ae
commit ad4f4c74eb
19 changed files with 323 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
View File

@ -258,7 +258,7 @@ public class JavaMethodsGenerator {
if ( has_result || method.getAnnotation(GLreturn.class) != null )
writer.print("return ");
writer.print(reuse_annotation.value() + "." + method_name + "(");
writer.print(reuse_annotation.value() + "." + (reuse_annotation.method().length() > 0 ? reuse_annotation.method() : method_name) + "(");
generateParametersJava(writer, method, typeinfos_instance, false, false, mode);
writer.println(");\n\t}");
return;

2
src/java/org/lwjgl/util/generator/Reuse.java
View File

@ -45,5 +45,5 @@ import java.lang.annotation.Target;
public @interface Reuse {
/** The extension Class that defines the method. */
String value();
String method() default "";
}

10
src/templates/org/lwjgl/opengl/ARB_buffer_object.java
View File

@ -142,10 +142,18 @@ public interface ARB_buffer_object {
@StripPostfix("params")
void glGetBufferParameterivARB(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetBufferParameteriARB} instead. */
@Alternate("glGetBufferParameterivARB")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "ARBBufferObject", method = "glGetBufferParameteriARB")
@Deprecated
void glGetBufferParameterivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetBufferParameterivARB")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetBufferParameterivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetBufferParameterivARB3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@StripPostfix("pointer")
@AutoSize("GLChecks.getBufferObjectSizeARB(caps, target)")

21
src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
View File

@ -220,11 +220,19 @@ public interface ARB_framebuffer_object {
@StripPostfix("params")
void glGetRenderbufferParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @OutParameter IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteri} instead. */
@Alternate("glGetRenderbufferParameteriv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "ARBFramebufferObject", method = "glGetRenderbufferParameteri")
@Deprecated
void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Reuse("GL30")
@Alternate("glGetRenderbufferParameteriv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Reuse("GL30")
boolean glIsFramebuffer(@GLuint int framebuffer);
@ -277,11 +285,20 @@ public interface ARB_framebuffer_object {
void glGetFramebufferAttachmentParameteriv(@GLenum int target, @GLenum int attachment,
@GLenum int pname, @Check("4") @OutParameter IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteri} instead. */
@Alternate("glGetFramebufferAttachmentParameteriv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL30", method = "glGetFramebufferAttachmentParameteri")
@Deprecated
void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment,
@GLenum int pname, @OutParameter IntBuffer params);
@Reuse("GL30")
@Alternate("glGetFramebufferAttachmentParameteriv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment,
void glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment,
@GLenum int pname, @OutParameter IntBuffer params);
@Reuse("GL30")

10
src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
View File

@ -79,10 +79,18 @@ public interface ARB_occlusion_query {
@StripPostfix("params")
void glGetQueryivARB(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryiARB} instead. */
@Alternate("glGetQueryivARB")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "ARBOcclusionQuery", method = "glGetQueryiARB")
@Deprecated
void glGetQueryivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetQueryivARB")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetQueryivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetQueryivARB3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@StripPostfix("params")
void glGetQueryObjectivARB(@GLuint int id, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);

10
src/templates/org/lwjgl/opengl/ARB_program.java
View File

@ -171,10 +171,18 @@ public interface ARB_program {
@StripPostfix("params")
void glGetProgramivARB(@GLenum int target, @GLenum int parameterName, @OutParameter @Check("4") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetProgramiARB} instead. */
@Alternate("glGetProgramivARB")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "ARBProgram", method = "glGetProgramiARB")
@Deprecated
void glGetProgramivARB2(@GLenum int target, @GLenum int parameterName, @OutParameter IntBuffer params);
@Alternate("glGetProgramivARB")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetProgramivARB2(@GLenum int target, @GLenum int parameterName, @OutParameter IntBuffer params);
void glGetProgramivARB3(@GLenum int target, @GLenum int parameterName, @OutParameter IntBuffer params);
void glGetProgramStringARB(@GLenum int target, @GLenum int parameterName, @OutParameter @Check @GLbyte Buffer paramString);

12
src/templates/org/lwjgl/opengl/ARB_sync.java
View File

@ -106,11 +106,21 @@ public interface ARB_sync {
@OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
@OutParameter IntBuffer values);
/** @deprecated Will be removed in 3.0. Use {@link #glGetSynci} instead. */
@Alternate("glGetSynciv")
@GLreturn("values")
@StripPostfix("values")
@Reuse(value = "GL32", method = "glGetSynci")
@Deprecated
void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("0L") IntBuffer length,
@OutParameter IntBuffer values);
@Reuse("GL32")
@Alternate("glGetSynciv")
@GLreturn("values")
@StripPostfix(value = "values", postfix = "v")
void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
void glGetSynciv3(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("0L") IntBuffer length,
@OutParameter IntBuffer values);
}

26
src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
View File

@ -118,15 +118,26 @@ public interface ARB_uniform_buffer_object {
@GLenum int pname,
@OutParameter @Check("uniformIndices.remaining()") @GLint IntBuffer params);
@Reuse("GL31")
/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveUniformsi} instead. */
@Alternate("glGetActiveUniformsiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
@StripPostfix("params")
@Reuse(value = "GL31", method = "glGetActiveUniformsi")
@Deprecated
void glGetActiveUniformsiv(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
@Constant(value = "params.put(1, uniformIndex), 1", keepParam = true) int uniformIndex, // Reuse params buffer
@GLenum int pname,
@OutParameter @GLint IntBuffer params);
@Reuse("GL31")
@Alternate("glGetActiveUniformsiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetActiveUniformsiv2(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
@Constant(value = "params.put(1, uniformIndex), 1", keepParam = true) int uniformIndex, // Reuse params buffer
@GLenum int pname,
@OutParameter @GLint IntBuffer params);
@Reuse("GL31")
void glGetActiveUniformName(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
@OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
@ -153,11 +164,20 @@ public interface ARB_uniform_buffer_object {
void glGetActiveUniformBlockiv(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
@OutParameter @Check(value = "16") @GLint IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveUniformBlocki} instead. */
@Alternate("glGetActiveUniformBlockiv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL31", method = "glGetActiveUniformBlocki")
@Deprecated
void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
@OutParameter @GLint IntBuffer params);
@Reuse("GL31")
@Alternate("glGetActiveUniformBlockiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
void glGetActiveUniformBlockiv3(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
@OutParameter @GLint IntBuffer params);
@Reuse("GL31")

20
src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
View File

@ -149,10 +149,18 @@ public interface EXT_framebuffer_object {
@StripPostfix("params")
void glGetRenderbufferParameterivEXT(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteriEXT} instead. */
@Alternate("glGetRenderbufferParameterivEXT")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "EXTFramebufferObject", method = "glGetRenderbufferParameteriEXT")
@Deprecated
void glGetRenderbufferParameterivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetRenderbufferParameterivEXT")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetRenderbufferParameterivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetRenderbufferParameterivEXT3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
boolean glIsFramebufferEXT(@GLuint int framebuffer);
@ -183,10 +191,18 @@ public interface EXT_framebuffer_object {
@StripPostfix("params")
void glGetFramebufferAttachmentParameterivEXT(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteriEXT} instead. */
@Alternate("glGetFramebufferAttachmentParameterivEXT")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "EXTFramebufferObject", method = "glGetFramebufferAttachmentParameteriEXT")
@Deprecated
void glGetFramebufferAttachmentParameterivEXT2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetFramebufferAttachmentParameterivEXT")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetFramebufferAttachmentParameterivEXT2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
void glGetFramebufferAttachmentParameterivEXT3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
void glGenerateMipmapEXT(@GLenum int target);
}

21
src/templates/org/lwjgl/opengl/GL15.java
View File

@ -32,7 +32,6 @@
package org.lwjgl.opengl;
import org.lwjgl.util.generator.*;
import org.lwjgl.util.generator.Alternate;
import org.lwjgl.util.generator.opengl.*;
import java.nio.Buffer;
@ -167,10 +166,18 @@ public interface GL15 {
@StripPostfix("params")
void glGetBufferParameteriv(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetBufferParameteri} instead. */
@Alternate("glGetBufferParameteriv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL15", method = "glGetBufferParameteri")
@Deprecated
void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetBufferParameteriv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@StripPostfix("pointer")
@AutoSize("GLChecks.getBufferObjectSize(caps, target)")
@ -217,10 +224,18 @@ public interface GL15 {
@StripPostfix("params")
void glGetQueryiv(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryi} instead. */
@Alternate("glGetQueryiv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL15", method = "glGetQueryi")
@Deprecated
void glGetQueryiv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetQueryiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetQueryiv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetQueryiv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@StripPostfix("params")
void glGetQueryObjectiv(@GLenum int id, @GLenum int pname, @OutParameter @Check("1") @GLint IntBuffer params);

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

@ -189,18 +189,34 @@ public interface GL20 {
@StripPostfix("params")
void glGetShaderiv(@GLuint int shader, @GLenum int pname, @OutParameter @Check IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetShaderi} instead. */
@Alternate("glGetShaderiv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL20", method = "glGetShaderi")
@Deprecated
void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetShaderiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
void glGetShaderiv3(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
@StripPostfix("params")
void glGetProgramiv(@GLuint int program, @GLenum int pname, @OutParameter @Check IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetProgrami} instead. */
@Alternate("glGetProgramiv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL20", method = "glGetProgrami")
@Deprecated
void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetProgramiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
void glGetProgramiv3(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int maxLength,
@OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,

20
src/templates/org/lwjgl/opengl/GL30.java
View File

@ -541,10 +541,18 @@ public interface GL30 {
@StripPostfix("params")
void glGetRenderbufferParameteriv(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteri} instead. */
@Alternate("glGetRenderbufferParameteriv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL30", method = "glGetRenderbufferParameteri")
@Deprecated
void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetRenderbufferParameteriv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
boolean glIsFramebuffer(@GLuint int framebuffer);
@ -575,10 +583,18 @@ public interface GL30 {
@StripPostfix("params")
void glGetFramebufferAttachmentParameteriv(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteri} instead. */
@Alternate("glGetFramebufferAttachmentParameteriv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL30", method = "glGetFramebufferAttachmentParameteri")
@Deprecated
void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetFramebufferAttachmentParameteriv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
void glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
void glGenerateMipmap(@GLenum int target);

24
src/templates/org/lwjgl/opengl/GL31.java
View File

@ -251,14 +251,25 @@ public interface GL31 {
@GLenum int pname,
@OutParameter @Check("uniformIndices.remaining()") @GLint IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveUniformsi} instead. */
@Alternate("glGetActiveUniformsiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
@StripPostfix("params")
@Reuse(value = "GL31", method = "glGetActiveUniformsi")
@Deprecated
void glGetActiveUniformsiv(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
@Constant(value = "MemoryUtil.getAddress(params.put(1, uniformIndex), 1)", keepParam = true) int uniformIndex, // Reuse params buffer
@GLenum int pname,
@OutParameter @GLint IntBuffer params);
@Alternate("glGetActiveUniformsiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetActiveUniformsiv2(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
@Constant(value = "MemoryUtil.getAddress(params.put(1, uniformIndex), 1)", keepParam = true) int uniformIndex, // Reuse params buffer
@GLenum int pname,
@OutParameter @GLint IntBuffer params);
void glGetActiveUniformName(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
@OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
@OutParameter @GLchar ByteBuffer uniformName);
@ -280,10 +291,19 @@ public interface GL31 {
void glGetActiveUniformBlockiv(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
@OutParameter @Check(value = "16") @GLint IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveUniformBlocki} instead. */
@Alternate("glGetActiveUniformBlockiv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL31", method = "glGetActiveUniformBlocki")
@Deprecated
void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
@OutParameter @GLint IntBuffer params);
@Alternate("glGetActiveUniformBlockiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
void glGetActiveUniformBlockiv3(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
@OutParameter @GLint IntBuffer params);
void glGetActiveUniformBlockName(@GLuint int program, @GLuint int uniformBlockIndex, @AutoSize("uniformBlockName") @GLsizei int bufSize,

22
src/templates/org/lwjgl/opengl/GL32.java
View File

@ -57,10 +57,18 @@ public interface GL32 {
@StripPostfix("params")
void glGetBufferParameteri64v(@GLenum int target, @GLenum int pname, @OutParameter @Check("4") LongBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetBufferParameteri64} instead. */
@Alternate("glGetBufferParameteri64v")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL32", method = "glGetBufferParameteri64")
@Deprecated
void glGetBufferParameteri64v2(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
@Alternate("glGetBufferParameteri64v")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetBufferParameteri64v2(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
void glGetBufferParameteri64v3(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
// ---------------------------------------------------------------------
// ----------------------[ ARB_vertex_array_bgra ]----------------------
@ -336,10 +344,20 @@ public interface GL32 {
@OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
@OutParameter IntBuffer values);
/** @deprecated Will be removed in 3.0. Use {@link #glGetSynci} instead. */
@Alternate("glGetSynciv")
@GLreturn("values")
@StripPostfix(value = "values", postfix = "v")
@StripPostfix("values")
@Reuse(value = "GL32", method = "glGetSynci")
@Deprecated
void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("0L") IntBuffer length,
@OutParameter IntBuffer values);
@Alternate("glGetSynciv")
@GLreturn("values")
@StripPostfix(value = "values", postfix = "v")
void glGetSynciv3(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("0L") IntBuffer length,
@OutParameter IntBuffer values);
}

20
src/templates/org/lwjgl/opengl/GL33.java
View File

@ -209,18 +209,34 @@ public interface GL33 {
@StripPostfix("params")
void glGetQueryObjecti64v(@GLuint int id, @GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryObjecti64} instead. */
@Alternate("glGetQueryObjecti64v")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL33", method = "glGetQueryObjecti64")
@Deprecated
void glGetQueryObjecti64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params);
@Alternate("glGetQueryObjecti64v")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetQueryObjecti64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params);
void glGetQueryObjecti64v3(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params);
@StripPostfix("params")
void glGetQueryObjectui64v(@GLuint int id, @GLenum int pname, @OutParameter @Check("1") @GLuint64 LongBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryObjectui64} instead. */
@Alternate("glGetQueryObjectui64v")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL33", method = "glGetQueryObjectui64")
@Deprecated
void glGetQueryObjectui64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params);
@Alternate("glGetQueryObjectui64v")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetQueryObjectui64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params);
void glGetQueryObjectui64v3(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params);
// --------------------------------------------------------------------
// ----------------------[ ARB_instanced_arrays ]----------------------

41
src/templates/org/lwjgl/opengl/GL40.java
View File

@ -225,10 +225,19 @@ public interface GL40 {
void glGetActiveSubroutineUniformiv(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
@OutParameter @Check("1") IntBuffer values);
/** @deprecated Will be removed in 3.0. Use {@link #glGetActiveSubroutineUniformi} instead. */
@Alternate("glGetActiveSubroutineUniformiv")
@GLreturn("values")
@StripPostfix("values")
@Reuse(value = "GL40", method = "glGetActiveSubroutineUniformi")
@Deprecated
void glGetActiveSubroutineUniformiv2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
@OutParameter IntBuffer values);
@Alternate("glGetActiveSubroutineUniformiv")
@GLreturn("values")
@StripPostfix(value = "values", postfix = "v")
void glGetActiveSubroutineUniformiv2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
void glGetActiveSubroutineUniformiv3(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
@OutParameter IntBuffer values);
void glGetActiveSubroutineUniformName(@GLuint int program, @GLenum int shadertype, @GLuint int index, @AutoSize("name") @GLsizei int bufsize,
@ -257,18 +266,34 @@ public interface GL40 {
@StripPostfix("params")
void glGetUniformSubroutineuiv(@GLenum int shadertype, int location, @Check("1") @OutParameter @GLuint IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetUniformSubroutineui} instead. */
@Alternate("glGetUniformSubroutineuiv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL40", method = "glGetUniformSubroutineui")
@Deprecated
void glGetUniformSubroutineuiv2(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params);
@Alternate("glGetUniformSubroutineuiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetUniformSubroutineuiv2(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params);
void glGetUniformSubroutineuiv3(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params);
@StripPostfix("values")
void glGetProgramStageiv(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @Check("1") @OutParameter IntBuffer values);
/** @deprecated Will be removed in 3.0. Use {@link #glGetProgramStagei} instead. */
@Alternate("glGetProgramStageiv")
@GLreturn("values")
@StripPostfix("values")
@Reuse(value = "GL40", method = "glGetProgramStagei")
@Deprecated
void glGetProgramStageiv2(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
@Alternate("glGetProgramStageiv")
@GLreturn("values")
@StripPostfix(value = "values", postfix = "v")
void glGetProgramStageiv2(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
void glGetProgramStageiv3(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
// -----------------------------------------------------------------------
// ----------------------[ ARB_tessellation_shader ]----------------------
@ -446,9 +471,17 @@ public interface GL40 {
@StripPostfix("params")
void glGetQueryIndexediv(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetQueryIndexedi} instead. */
@Alternate("glGetQueryIndexediv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GL40", method = "glGetQueryIndexedi")
@Deprecated
void glGetQueryIndexediv2(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetQueryIndexediv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetQueryIndexediv2(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params);
void glGetQueryIndexediv3(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params);
}

10
src/templates/org/lwjgl/opengl/NV_program.java
View File

@ -80,10 +80,18 @@ public interface NV_program {
@StripPostfix("params")
void glGetProgramivNV(@GLuint int programID, @GLenum int parameterName, @OutParameter @Check @GLint IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetProgramiNV} instead. */
@Alternate("glGetProgramivNV")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "NVProgram", method = "glGetProgramiNV")
@Deprecated
void glGetProgramivNV2(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLint IntBuffer params);
@Alternate("glGetProgramivNV")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetProgramivNV2(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLint IntBuffer params);
void glGetProgramivNV3(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLint IntBuffer params);
void glGetProgramStringNV(@GLuint int programID, @GLenum int parameterName, @OutParameter @Check @GLubyte Buffer paramString);

50
src/templates/org/lwjgl/opengles/GLES20.java
View File

@ -699,10 +699,18 @@ public interface GLES20 {
@StripPostfix("params")
void glGetBufferParameteriv(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetBufferParameteri} instead. */
@Alternate("glGetBufferParameteriv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GLES20", method = "glGetBufferParameteri")
@Deprecated
void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetBufferParameteriv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@NoErrorCheck
@GLenum
@ -719,10 +727,18 @@ public interface GLES20 {
@StripPostfix("params")
void glGetFramebufferAttachmentParameteriv(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteri} instead. */
@Alternate("glGetFramebufferAttachmentParameteriv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GLES20", method = "glGetFramebufferAttachmentParameteri")
@Deprecated
void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetFramebufferAttachmentParameteriv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
void glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
@StripPostfix("params")
void glGetIntegerv(@GLenum int pname, @OutParameter @Check("1") IntBuffer params);
@ -735,10 +751,18 @@ public interface GLES20 {
@StripPostfix("params")
void glGetProgramiv(@GLuint int program, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetProgrami} instead. */
@Alternate("glGetProgramiv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GLES20", method = "glGetProgrami")
@Deprecated
void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetProgramiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
void glGetProgramiv3(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int bufsize,
@OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
@ -753,18 +777,34 @@ public interface GLES20 {
@StripPostfix("params")
void glGetRenderbufferParameteriv(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteri} instead. */
@Alternate("glGetRenderbufferParameteriv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GLES20", method = "glGetRenderbufferParameteri")
@Deprecated
void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetRenderbufferParameteriv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@StripPostfix("params")
void glGetShaderiv(@GLuint int shader, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetShaderi} instead. */
@Alternate("glGetShaderiv")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "GLES20", method = "glGetShaderi")
@Deprecated
void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetShaderiv")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
void glGetShaderiv3(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int bufsize,
@OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,

20
src/templates/org/lwjgl/opengles/OES_framebuffer_object.java
View File

@ -142,10 +142,18 @@ public interface OES_framebuffer_object {
@StripPostfix("params")
void glGetRenderbufferParameterivOES(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetRenderbufferParameteriOES} instead. */
@Alternate("glGetRenderbufferParameterivOES")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "OESFramebufferObject", method = "glGetRenderbufferParameteriOES")
@Deprecated
void glGetRenderbufferParameterivOES2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetRenderbufferParameterivOES")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetRenderbufferParameterivOES2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
void glGetRenderbufferParameterivOES3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
boolean glIsFramebufferOES(@GLuint int framebuffer);
@ -172,10 +180,18 @@ public interface OES_framebuffer_object {
@StripPostfix("params")
void glGetFramebufferAttachmentParameterivOES(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
/** @deprecated Will be removed in 3.0. Use {@link #glGetFramebufferAttachmentParameteriOES} instead. */
@Alternate("glGetFramebufferAttachmentParameterivOES")
@GLreturn("params")
@StripPostfix("params")
@Reuse(value = "OESFramebufferObject", method = "glGetFramebufferAttachmentParameteriOES")
@Deprecated
void glGetFramebufferAttachmentParameterivOES2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
@Alternate("glGetFramebufferAttachmentParameterivOES")
@GLreturn("params")
@StripPostfix(value = "params", postfix = "v")
void glGetFramebufferAttachmentParameterivOES2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
void glGetFramebufferAttachmentParameterivOES3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
void glGenerateMipmapOES(@GLenum int target);