From: <sp...@us...> - 2012-08-19 06:56:33
|
Revision: 3788 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3788&view=rev Author: spasi Date: 2012-08-19 06:56:25 +0000 (Sun, 19 Aug 2012) Log Message: ----------- Restored (most of) the removed methods from the previous commit and added deprecation warnings. Modified Paths: -------------- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java trunk/LWJGL/src/java/org/lwjgl/util/generator/Reuse.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -258,7 +258,7 @@ 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; Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/Reuse.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/util/generator/Reuse.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/java/org/lwjgl/util/generator/Reuse.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -45,5 +45,5 @@ public @interface Reuse { /** The extension Class that defines the method. */ String value(); - + String method() default ""; } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -142,11 +142,19 @@ @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(value = "params", postfix = "v") + @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 glGetBufferParameterivARB3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); + @StripPostfix("pointer") @AutoSize("GLChecks.getBufferObjectSizeARB(caps, target)") void glGetBufferPointervARB(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -220,11 +220,19 @@ @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 @@ 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") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -79,11 +79,19 @@ @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(value = "params", postfix = "v") + @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 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); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -171,11 +171,19 @@ @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(value = "params", postfix = "v") + @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 glGetProgramivARB3(@GLenum int target, @GLenum int parameterName, @OutParameter IntBuffer params); + void glGetProgramStringARB(@GLenum int target, @GLenum int parameterName, @OutParameter @Check @GLbyte Buffer paramString); @Alternate("glGetProgramStringARB") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -106,11 +106,21 @@ @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); } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -118,16 +118,27 @@ @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, @OutParameter @GLchar ByteBuffer uniformName); @@ -153,11 +164,20 @@ 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") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -149,11 +149,19 @@ @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(value = "params", postfix = "v") + @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 glGetRenderbufferParameterivEXT3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); + boolean glIsFramebufferEXT(@GLuint int framebuffer); void glBindFramebufferEXT(@GLenum int target, @GLuint int framebuffer); @@ -183,10 +191,18 @@ @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(value = "params", postfix = "v") + @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 glGetFramebufferAttachmentParameterivEXT3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params); + void glGenerateMipmapEXT(@GLenum int target); } Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -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,11 +166,19 @@ @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(value = "params", postfix = "v") + @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 glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); + @StripPostfix("pointer") @AutoSize("GLChecks.getBufferObjectSize(caps, target)") void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer pointer); @@ -217,11 +224,19 @@ @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(value = "params", postfix = "v") + @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 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); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -189,19 +189,35 @@ @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(value = "params", postfix = "v") + @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 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(value = "params", postfix = "v") + @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 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, @OutParameter @GLchar ByteBuffer infoLog); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -541,11 +541,19 @@ @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(value = "params", postfix = "v") + @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 glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); + boolean glIsFramebuffer(@GLuint int framebuffer); void glBindFramebuffer(@GLenum int target, @GLuint int framebuffer); @@ -575,11 +583,19 @@ @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(value = "params", postfix = "v") + @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 glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params); + void glGenerateMipmap(@GLenum int target); // -------------------------------------------------------------------------------------------- Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -251,14 +251,25 @@ @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,12 +291,21 @@ 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(value = "params", postfix = "v") + @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 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, @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length, @OutParameter @GLchar ByteBuffer uniformBlockName); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -57,11 +57,19 @@ @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(value = "params", postfix = "v") + @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 glGetBufferParameteri64v3(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params); + // --------------------------------------------------------------------- // ----------------------[ ARB_vertex_array_bgra ]---------------------- // --------------------------------------------------------------------- @@ -336,10 +344,20 @@ @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); } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -209,19 +209,35 @@ @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(value = "params", postfix = "v") + @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 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(value = "params", postfix = "v") + @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 glGetQueryObjectui64v3(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params); + // -------------------------------------------------------------------- // ----------------------[ ARB_instanced_arrays ]---------------------- // -------------------------------------------------------------------- Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -225,12 +225,21 @@ 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(value = "values", postfix = "v") + @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 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, @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length, @OutParameter @GLchar ByteBuffer name); @@ -257,19 +266,35 @@ @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(value = "params", postfix = "v") + @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 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(value = "values", postfix = "v") + @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 glGetProgramStageiv3(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values); + // ----------------------------------------------------------------------- // ----------------------[ ARB_tessellation_shader ]---------------------- // ----------------------------------------------------------------------- @@ -446,9 +471,17 @@ @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(value = "params", postfix = "v") + @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 glGetQueryIndexediv3(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params); + } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -80,11 +80,19 @@ @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(value = "params", postfix = "v") + @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 glGetProgramivNV3(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLint IntBuffer params); + void glGetProgramStringNV(@GLuint int programID, @GLenum int parameterName, @OutParameter @Check @GLubyte Buffer paramString); @Alternate("glGetProgramStringNV") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -699,11 +699,19 @@ @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(value = "params", postfix = "v") + @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 glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); + @NoErrorCheck @GLenum int glGetError(); @@ -719,11 +727,19 @@ @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(value = "params", postfix = "v") + @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 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,11 +751,19 @@ @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(value = "params", postfix = "v") + @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 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, @OutParameter @GLchar ByteBuffer infoLog); @@ -753,19 +777,35 @@ @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(value = "params", postfix = "v") + @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 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(value = "params", postfix = "v") + @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 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, @OutParameter @GLchar ByteBuffer infoLog); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java 2012-08-18 14:00:45 UTC (rev 3787) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java 2012-08-19 06:56:25 UTC (rev 3788) @@ -142,11 +142,19 @@ @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(value = "params", postfix = "v") + @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 glGetRenderbufferParameterivOES3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); + boolean glIsFramebufferOES(@GLuint int framebuffer); void glBindFramebufferOES(@GLenum int target, @GLuint int framebuffer); @@ -172,11 +180,19 @@ @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(value = "params", postfix = "v") + @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 glGetFramebufferAttachmentParameterivOES3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params); + void glGenerateMipmapOES(@GLenum int target); } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |