From: <sp...@us...> - 2012-01-05 11:24:22
|
Revision: 3720 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3720&view=rev Author: spasi Date: 2012-01-05 11:24:13 +0000 (Thu, 05 Jan 2012) Log Message: ----------- Added new OpenGL ES extensions. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java Added Paths: ----------- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_label.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_marker.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_robustness.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_sRGB.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_rg.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_storage.java trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-01-02 22:06:12 UTC (rev 3719) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -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.ByteBuffer; @@ -41,53 +40,52 @@ public interface AMD_performance_monitor { /** Accepted by the <pame> parameter of GetPerfMonitorCounterInfoAMD */ - int GL_COUNTER_TYPE_AMD = 0x8BC0; - int GL_COUNTER_RANGE_AMD = 0x8BC1; + int GL_COUNTER_TYPE_AMD = 0x8BC0, + GL_COUNTER_RANGE_AMD = 0x8BC1; /** * Returned as a valid value in <data> parameter of * GetPerfMonitorCounterInfoAMD if <pname> = COUNTER_TYPE_AMD */ - int GL_UNSIGNED_INT = 0x1405; - int GL_FLOAT = 0x1406; - int GL_UNSIGNED_INT64_AMD = 0x8BC2; - int GL_PERCENTAGE_AMD = 0x8BC3; + int GL_UNSIGNED_INT = 0x1405, + GL_FLOAT = 0x1406, + GL_UNSIGNED_INT64_AMD = 0x8BC2, + GL_PERCENTAGE_AMD = 0x8BC3; /** Accepted by the <pname> parameter of GetPerfMonitorCounterDataAMD */ + int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4, + GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5, + GL_PERFMON_RESULT_AMD = 0x8BC6; - int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4; - int GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5; - int GL_PERFMON_RESULT_AMD = 0x8BC6; - void glGetPerfMonitorGroupsAMD(@OutParameter @Check(value = "1", canBeNull = true) @GLint IntBuffer numGroups, @AutoSize("groups") @GLsizei int groupsSize, @GLuint IntBuffer groups); void glGetPerfMonitorCountersAMD(@GLuint int group, @OutParameter @Check(value = "1") @GLint IntBuffer numCounters, @OutParameter @Check(value = "1") @GLint IntBuffer maxActiveCounters, - @AutoSize("counters") @GLsizei int countersSize, - @GLuint IntBuffer counters); + @AutoSize(value = "counters", canBeNull = true) @GLsizei int countersSize, + @Check(canBeNull = true) @GLuint IntBuffer counters); void glGetPerfMonitorGroupStringAMD(@GLuint int group, - @AutoSize("groupString") @GLsizei int bufSize, + @AutoSize(value = "groupString", canBeNull = true) @GLsizei int bufSize, @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length, - @OutParameter @GLchar ByteBuffer groupString); + @Check(canBeNull = true) @OutParameter @GLchar ByteBuffer groupString); @Alternate("glGetPerfMonitorGroupStringAMD") @GLreturn(value = "groupString", maxLength = "bufSize") void glGetPerfMonitorGroupStringAMD2(@GLuint int group, @GLsizei int bufSize, - @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(groupString_length)") IntBuffer length, - @OutParameter @GLchar ByteBuffer groupString); + @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(groupString_length)") IntBuffer length, + @OutParameter @GLchar ByteBuffer groupString); - void glGetPerfMonitorCounterStringAMD(@GLuint int group, @GLuint int counter, @AutoSize("counterString") @GLsizei int bufSize, + void glGetPerfMonitorCounterStringAMD(@GLuint int group, @GLuint int counter, @AutoSize(value = "counterString", canBeNull = true) @GLsizei int bufSize, @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length, - @OutParameter @GLchar ByteBuffer counterString); + @Check(canBeNull = true) @OutParameter @GLchar ByteBuffer counterString); @Alternate("glGetPerfMonitorCounterStringAMD") @GLreturn(value = "counterString", maxLength = "bufSize") void glGetPerfMonitorCounterStringAMD2(@GLuint int group, @GLuint int counter, @GLsizei int bufSize, - @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(counterString_length)") IntBuffer length, - @OutParameter @GLchar ByteBuffer counterString); + @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(counterString_length)") IntBuffer length, + @OutParameter @GLchar ByteBuffer counterString); void glGetPerfMonitorCounterInfoAMD(@GLuint int group, @GLuint int counter, @GLenum int pname, @Check(value = "16") @GLvoid ByteBuffer data); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java 2012-01-02 22:06:12 UTC (rev 3719) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -345,7 +345,7 @@ @Alternate("glGetProgramPipelineInfoLog") @GLreturn(value = "infoLog", maxLength = "bufSize") void glGetProgramPipelineInfoLog2(@GLuint int pipeline, @GLsizei int bufSize, - @OutParameter @GLsizei @Constant("infoLog_length, 0") IntBuffer length, + @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(infoLog_length)") IntBuffer length, @OutParameter @GLchar ByteBuffer infoLog); } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-01-02 22:06:12 UTC (rev 3719) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -89,7 +89,7 @@ @Alternate("glGetActiveSubroutineUniformName") @GLreturn(value = "name", maxLength = "bufsize") void glGetActiveSubroutineUniformName2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLsizei int bufsize, - @OutParameter @Constant("name_length, 0") @GLsizei IntBuffer length, + @OutParameter @Constant("MemoryUtil.getAddress0(name_length)") @GLsizei IntBuffer length, @OutParameter @GLchar ByteBuffer name); @Reuse("GL40") @@ -101,7 +101,7 @@ @Alternate("glGetActiveSubroutineName") @GLreturn(value = "name", maxLength = "bufsize") void glGetActiveSubroutineName2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLsizei int bufsize, - @OutParameter @Constant("name_length, 0") @GLsizei IntBuffer length, + @OutParameter @Constant("MemoryUtil.getAddress0(name_length)") @GLsizei IntBuffer length, @OutParameter @GLchar ByteBuffer name); @Reuse("GL40") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-01-02 22:06:12 UTC (rev 3719) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -111,6 +111,6 @@ @GLreturn("values") @StripPostfix("values") void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize, - @OutParameter @GLsizei @Constant("null, 0") IntBuffer length, + @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-01-02 22:06:12 UTC (rev 3719) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -136,7 +136,7 @@ @Alternate("glGetActiveUniformName") @GLreturn(value = "uniformName", maxLength = "bufSize") void glGetActiveUniformName2(@GLuint int program, @GLuint int uniformIndex, @GLsizei int bufSize, - @OutParameter @GLsizei @Constant("uniformName_length, 0") IntBuffer length, + @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(uniformName_length)") IntBuffer length, @OutParameter @GLchar ByteBuffer uniformName); @Reuse("GL31") @@ -169,7 +169,7 @@ @Alternate("glGetActiveUniformBlockName") @GLreturn(value = "uniformBlockName", maxLength = "bufSize") void glGetActiveUniformBlockName2(@GLuint int program, @GLuint int uniformBlockIndex, @GLsizei int bufSize, - @OutParameter @GLsizei @Constant("uniformBlockName_length, 0") IntBuffer length, + @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(uniformBlockName_length)") IntBuffer length, @OutParameter @GLchar ByteBuffer uniformBlockName); @Reuse("GL30") Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2002-2011 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +public interface EXT_color_buffer_half_float { + + /** + * Accepted by the <internalformat> parameter of RenderbufferStorage and + * RenderbufferStorageMultisampleAPPLE: + */ + int GL_RGBA16F_EXT = 0x881A, + GL_RGB16F_EXT = 0x881B, + GL_RG16F_EXT = 0x822F, + GL_R16F_EXT = 0x822D; + + /** Accepted by the <pname> parameter of GetFramebufferAttachmentParameteriv: */ + int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT = 0x8211; + + /** Returned in <params> by GetFramebufferAttachmentParameteriv: */ + int GL_UNSIGNED_NORMALIZED_EXT = 0x8C17; + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_label.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_label.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_label.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2002-2011 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +import org.lwjgl.util.generator.*; +import org.lwjgl.util.generator.opengl.*; + +import java.nio.ByteBuffer; +import java.nio.IntBuffer; + +public interface EXT_debug_label { + + /** + * Accepted by the <type> parameter of LabelObjectEXT and + * GetObjectLabelEXT: + */ + int GL_BUFFER_OBJECT_EXT = 0x9151, + GL_SHADER_OBJECT_EXT = 0x8B48, + GL_PROGRAM_OBJECT_EXT = 0x8B40, + GL_VERTEX_ARRAY_OBJECT_EXT = 0x9154, + GL_QUERY_OBJECT_EXT = 0x9153, + GL_PROGRAM_PIPELINE_OBJECT_EXT = 0x8A4F; + + void glLabelObjectEXT(@GLenum int type, @GLuint int object, + @AutoSize("label") @GLsizei int length, + @Const @GLchar ByteBuffer label); + + @Alternate("glLabelObjectEXT") + void glLabelObjectEXT(@GLenum int type, @GLuint int object, + @Constant("label.length()") @GLsizei int length, + CharSequence label); + + void glGetObjectLabelEXT(@GLenum int type, @GLuint int object, + @AutoSize(value = "label", canBeNull = true) @GLsizei int bufSize, + @Check(value = "1", canBeNull = true) @OutParameter @GLsizei IntBuffer length, + @Check(canBeNull = true) @OutParameter @GLchar ByteBuffer label); + + @Alternate("glGetObjectLabelEXT") + @GLreturn(value = "label", maxLength = "bufSize") + void glGetObjectLabelEXT2(@GLenum int type, @GLuint int object, + @GLsizei int bufSize, + @Constant("MemoryUtil.getAddress0(label_length)") @OutParameter @GLsizei IntBuffer length, + @OutParameter @GLchar ByteBuffer label); + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_marker.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_marker.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_marker.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2002-2011 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +import org.lwjgl.util.generator.Alternate; +import org.lwjgl.util.generator.AutoSize; +import org.lwjgl.util.generator.Const; +import org.lwjgl.util.generator.Constant; +import org.lwjgl.util.generator.opengl.GLchar; +import org.lwjgl.util.generator.opengl.GLsizei; + +import java.nio.ByteBuffer; + +public interface EXT_debug_marker { + + void glInsertEventMarkerEXT(@AutoSize("marker") @GLsizei int length, @Const @GLchar ByteBuffer marker); + + @Alternate("glInsertEventMarkerEXT") + void glInsertEventMarkerEXT(@Constant("marker.length()") @GLsizei int length, CharSequence marker); + + void glPushGroupMarkerEXT(@AutoSize("marker") @GLsizei int length, @Const @GLchar ByteBuffer marker); + + @Alternate("glPushGroupMarkerEXT") + void glPushGroupMarkerEXT(@Constant("marker.length()") @GLsizei int length, CharSequence marker); + + void glPopGroupMarkerEXT(); + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2002-2011 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +import org.lwjgl.util.generator.opengl.GLenum; +import org.lwjgl.util.generator.opengl.GLsizei; +import org.lwjgl.util.generator.opengl.GLuint; + +public interface EXT_multisampled_render_to_texture { + + /** Accepted by the <pname> parameter of GetRenderbufferParameteriv: */ + int GL_RENDERBUFFER_SAMPLES_EXT = 0x9133; + + /** Returned by CheckFramebufferStatus: */ + int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT = 0x9134; + + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * and GetFloatv: + */ + int GL_MAX_SAMPLES_EXT = 0x9135; + + /** Accepted by the <pname> parameter of GetFramebufferAttachmentParameteriv: */ + int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT = 0x8D6C; + + void glRenderbufferStorageMultisampleEXT( + @GLenum int target, @GLsizei int samples, + @GLenum int internalformat, + @GLsizei int width, @GLsizei int height); + + void glFramebufferTexture2DMultisampleEXT( + @GLenum int target, @GLenum int attachment, + @GLenum int textarget, @GLuint int texture, + int level, @GLsizei int samples); + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2002-2011 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +import org.lwjgl.util.generator.*; +import org.lwjgl.util.generator.opengl.GLenum; +import org.lwjgl.util.generator.opengl.GLreturn; +import org.lwjgl.util.generator.opengl.GLsizei; +import org.lwjgl.util.generator.opengl.GLuint; + +import java.nio.IntBuffer; + +public interface EXT_occlusion_query_boolean { + + /** + * Accepted by the <target> parameter of BeginQueryEXT, EndQueryEXT, + * and GetQueryivEXT: + */ + int GL_ANY_SAMPLES_PASSED_EXT = 0x8C2F, + GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT = 0x8D6A; + + /** Accepted by the <pname> parameter of GetQueryivEXT: */ + int GL_CURRENT_QUERY_EXT = 0x8865; + + /** + * Accepted by the <pname> parameter of GetQueryObjectivEXT and + * GetQueryObjectuivEXT: + */ + int GL_QUERY_RESULT_EXT = 0x8866, + GL_QUERY_RESULT_AVAILABLE_EXT = 0x8867; + + void glGenQueriesEXT(@AutoSize("ids") @GLsizei int n, @OutParameter @GLuint IntBuffer ids); + + @Alternate("glGenQueriesEXT") + @GLreturn("ids") + void glGenQueriesEXT2(@Constant("1") @GLsizei int n, @OutParameter @GLuint IntBuffer ids); + + void glDeleteQueriesEXT(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); + + @Alternate("glDeleteQueriesEXT") + void glDeleteQueriesEXT(@Constant("1") @GLsizei int n, @Constant(value = "APIUtil.getInt(id)", keepParam = true) int id); + + boolean glIsQueryEXT(@GLuint int id); + + void glBeginQueryEXT(@GLenum int target, @GLuint int id); + + void glEndQueryEXT(@GLenum int target); + + @StripPostfix("params") + void glGetQueryivEXT(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params); + + @Alternate("glGetQueryivEXT") + @GLreturn("params") + @StripPostfix("params") + void glGetQueryivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); + + @StripPostfix("params") + void glGetQueryObjectuivEXT(@GLuint int id, @GLenum int pname, @OutParameter @Check("1") IntBuffer params); + + @Alternate("glGetQueryObjectuivEXT") + @GLreturn("params") + @StripPostfix(value = "params", postfix = "v") + void glGetQueryObjectuivEXT2(@GLuint int id, @GLenum int pname, @OutParameter IntBuffer params); + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_robustness.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_robustness.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_robustness.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2002-2011 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +import org.lwjgl.util.generator.AutoSize; +import org.lwjgl.util.generator.OutParameter; +import org.lwjgl.util.generator.StripPostfix; +import org.lwjgl.util.generator.opengl.*; + +import java.nio.Buffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; + +public interface EXT_robustness { + + /** Returned by GetGraphicsResetStatusEXT: */ + int GL_NO_ERROR = 0x0000, + GL_GUILTY_CONTEXT_RESET_EXT = 0x8253, + GL_INNOCENT_CONTEXT_RESET_EXT = 0x8254, + GL_UNKNOWN_CONTEXT_RESET_EXT = 0x8255; + + /** + * Accepted by the <value> parameter of GetBooleanv, GetIntegerv, + * and GetFloatv: + */ + int GL_CONTEXT_ROBUST_ACCESS_EXT = 0x90F3, + GL_RESET_NOTIFICATION_STRATEGY_EXT = 0x8256; + + /** + * Returned by GetIntegerv and related simple queries when <value> is + * RESET_NOTIFICATION_STRATEGY_EXT : + */ + int GL_LOSE_CONTEXT_ON_RESET_EXT = 0x8252, + GL_NO_RESET_NOTIFICATION_EXT = 0x8261; + + @GLenum + int glGetGraphicsResetStatusEXT(); + + void glReadnPixelsEXT(int x, int y, @GLsizei int width, @GLsizei int height, + @GLenum int format, @GLenum int type, @AutoSize("data") @GLsizei int bufSize, + @OutParameter @GLbyte @GLshort @GLint @GLfloat Buffer data); + + @StripPostfix("params") + void glGetnUniformfvEXT(@GLuint int program, int location, @AutoSize("params") @GLsizei int bufSize, @OutParameter FloatBuffer params); + + @StripPostfix("params") + void glGetnUniformivEXT(@GLuint int program, int location, @AutoSize("params") @GLsizei int bufSize, @OutParameter IntBuffer params); + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_sRGB.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_sRGB.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_sRGB.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2002-2011 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +public interface EXT_sRGB { + + /** + * Accepted by the <format> and <internalformat> parameter of TexImage2D, and + * TexImage3DOES. These are also accepted by <format> parameter of + * TexSubImage2D and TexSubImage3DOES: + */ + int GL_SRGB_EXT = 0x8C40, + GL_SRGB_ALPHA_EXT = 0x8C42; + + /** Accepted by the <internalformat> parameter of RenderbufferStorage: */ + int GL_SRGB8_ALPHA8_EXT = 0x8C43; + + /** Accepted by the <pname> parameter of GetFramebufferAttachmentParameteriv: */ + int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT = 0x8210; + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,180 @@ +/* + * Copyright (c) 2002-2008 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +import org.lwjgl.util.generator.*; +import org.lwjgl.util.generator.opengl.*; + +import java.nio.ByteBuffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; + +public interface EXT_separate_shader_objects { + + /** Accepted by <stages> parameter to UseProgramStagesEXT: */ + int GL_VERTEX_SHADER_BIT_EXT = 0x00000001, + GL_FRAGMENT_SHADER_BIT_EXT = 0x00000002, + GL_ALL_SHADER_BITS_EXT = 0xFFFFFFFF; + + /** + * Accepted by the <pname> parameter of ProgramParameteriEXT and + * GetProgramiv: + */ + int GL_PROGRAM_SEPARABLE_EXT = 0x8258; + + /** Accepted by <type> parameter to GetProgramPipelineivEXT: */ + int GL_ACTIVE_PROGRAM_EXT = 0x8259; + + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, and + * GetFloatv: + */ + int GL_PROGRAM_PIPELINE_BINDING_EXT = 0x825A; + + void glUseProgramStagesEXT(@GLuint int pipeline, @GLbitfield int stages, @GLuint int program); + + void glActiveShaderProgramEXT(@GLuint int pipeline, @GLuint int program); + + /** Single null-terminated source code string. */ + @StripPostfix(value = "string", postfix = "v") + @GLuint + int glCreateShaderProgramvEXT(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated @Check @Const @Indirect @GLchar ByteBuffer string); + + /** Multiple null-terminated source code strings, one after the other. */ + @Alternate(value = "glCreateShaderProgramvEXT", nativeAlt = true) + @StripPostfix(value = "strings", postfix = "v") + @GLuint + int glCreateShaderProgramvEXT2(@GLenum int type, @GLsizei int count, @NullTerminated("count") @Check @Const @Indirect @GLchar @PointerArray("count") ByteBuffer strings); + + @Alternate(value = "glCreateShaderProgramvEXT", nativeAlt = true) + @StripPostfix(value = "strings", postfix = "v") + @GLuint + int glCreateShaderProgramvEXT3(@GLenum int type, @Constant("strings.length") @GLsizei int count, @NullTerminated @Check("1") @PointerArray(value = "count") @Const @NativeType("GLchar") ByteBuffer[] strings); + + @Alternate("glCreateShaderProgramvEXT") + @StripPostfix(value = "string", postfix = "v") + @GLuint + int glCreateShaderProgramvEXT(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated CharSequence string); + + @Alternate(value = "glCreateShaderProgramvEXT", nativeAlt = true, skipNative = true) + @StripPostfix(value = "strings", postfix = "v") + @GLuint + int glCreateShaderProgramvEXT2(@GLenum int type, @Constant("strings.length") @GLsizei int count, + @Const @NullTerminated @PointerArray(value = "count") CharSequence[] strings); + + void glBindProgramPipelineEXT(@GLuint int pipeline); + + void glDeleteProgramPipelinesEXT(@AutoSize("pipelines") @GLsizei int n, @Const @GLuint IntBuffer pipelines); + + @Alternate("glDeleteProgramPipelinesEXT") + void glDeleteProgramPipelinesEXT(@Constant("1") @GLsizei int n, @Constant(value = "APIUtil.getInt(pipeline)", keepParam = true) int pipeline); + + void glGenProgramPipelinesEXT(@AutoSize("pipelines") @GLsizei int n, @OutParameter @GLuint IntBuffer pipelines); + + @Alternate("glGenProgramPipelinesEXT") + @GLreturn("pipelines") + void glGenProgramPipelinesEXT2(@Constant("1") @GLsizei int n, @OutParameter @GLuint IntBuffer pipelines); + + boolean glIsProgramPipelineEXT(@GLuint int pipeline); + + void glProgramParameteriEXT(@GLuint int program, @GLenum int pname, int value); + + @StripPostfix("params") + void glGetProgramPipelineivEXT(@GLuint int pipeline, @GLenum int pname, @OutParameter @Check("1") IntBuffer params); + + @Alternate("glGetProgramPipelineivEXT") + @GLreturn("params") + @StripPostfix("params") + void glGetProgramPipelineivEXT2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params); + + void glProgramUniform1iEXT(@GLuint int program, int location, int v0); + + void glProgramUniform2iEXT(@GLuint int program, int location, int v0, int v1); + + void glProgramUniform3iEXT(@GLuint int program, int location, int v0, int v1, int v2); + + void glProgramUniform4iEXT(@GLuint int program, int location, int v0, int v1, int v2, int v3); + + void glProgramUniform1fEXT(@GLuint int program, int location, float v0); + + void glProgramUniform2fEXT(@GLuint int program, int location, float v0, float v1); + + void glProgramUniform3fEXT(@GLuint int program, int location, float v0, float v1, float v2); + + void glProgramUniform4fEXT(@GLuint int program, int location, float v0, float v1, float v2, float v3); + + @StripPostfix("value") + void glProgramUniform1ivEXT(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @Const IntBuffer value); + + @StripPostfix("value") + void glProgramUniform2ivEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 1") @GLsizei int count, @Const IntBuffer value); + + @StripPostfix("value") + void glProgramUniform3ivEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " / 3") @GLsizei int count, @Const IntBuffer value); + + @StripPostfix("value") + void glProgramUniform4ivEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, @Const IntBuffer value); + + @StripPostfix("value") + void glProgramUniform1fvEXT(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @Const FloatBuffer value); + + @StripPostfix("value") + void glProgramUniform2fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 1") @GLsizei int count, @Const FloatBuffer value); + + @StripPostfix("value") + void glProgramUniform3fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " / 3") @GLsizei int count, @Const FloatBuffer value); + + @StripPostfix("value") + void glProgramUniform4fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, @Const FloatBuffer value); + + @StripPostfix("value") + void glProgramUniformMatrix2fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, boolean transpose, @Const FloatBuffer value); + + @StripPostfix("value") + void glProgramUniformMatrix3fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " / (3 * 3)") @GLsizei int count, boolean transpose, @Const FloatBuffer value); + + @StripPostfix("value") + void glProgramUniformMatrix4fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 4") @GLsizei int count, boolean transpose, @Const FloatBuffer value); + + void glValidateProgramPipelineEXT(@GLuint int pipeline); + + void glGetProgramPipelineInfoLogEXT(@GLuint int pipeline, @AutoSize("infoLog") @GLsizei int bufSize, + @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length, + @OutParameter @GLchar ByteBuffer infoLog); + + @Alternate("glGetProgramPipelineInfoLogEXT") + @GLreturn(value = "infoLog", maxLength = "bufSize") + void glGetProgramPipelineInfoLogEXT2(@GLuint int pipeline, @GLsizei int bufSize, + @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(infoLog_length)") IntBuffer length, + @OutParameter @GLchar ByteBuffer infoLog); + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2002-2008 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +public interface EXT_shadow_samplers { + + /** + * Accepted by the <pname> parameter of TexParameterf, TexParameteri, + * TexParameterfv, TexParameteriv, GetTexParameterfv, and GetTexParameteriv: + */ + int GL_TEXTURE_COMPARE_MODE_EXT = 0x884C, + GL_TEXTURE_COMPARE_FUNC_EXT = 0x884D; + + /** + * Accepted by the <param> parameter of TexParameterf, TexParameteri, + * TexParameterfv, and TexParameteriv when the <pname> parameter is + * TEXTURE_COMPARE_MODE_EXT: + */ + int GL_COMPARE_REF_TO_TEXTURE_EXT = 0x884E; + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_rg.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_rg.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_rg.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2002-2008 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +public interface EXT_texture_rg { + + /** + * Accepted by the <internalformat> parameter of TexImage2D and CopyTexImage2D, + * and the <format> parameter of TexImage2D, TexSubImage2D, and ReadPixels: + */ + int GL_RED_EXT = 0x1903, + GL_RG_EXT = 0x8227; + + /** + * Accepted by the <internalformat> parameter of RenderbufferStorage and + * RenderbufferStorageMultisampleAPPLE: + */ + int GL_R8_EXT = 0x8229, + GL_RG8_EXT = 0x822B; + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_storage.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_storage.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_storage.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2002-2011 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +import org.lwjgl.util.generator.opengl.GLenum; +import org.lwjgl.util.generator.opengl.GLsizei; +import org.lwjgl.util.generator.opengl.GLuint; + +public interface EXT_texture_storage { + + /** Accepted by the <value> parameter of GetTexParameter{if}v: */ + + int GL_TEXTURE_IMMUTABLE_FORMAT_EXT = 0x912F; + /** + * Accepted by the <internalformat> parameter of TexStorage* when + * implemented on OpenGL ES: + */ + int GL_ALPHA8_EXT = 0x803C, + GL_LUMINANCE8_EXT = 0x8040, + GL_LUMINANCE8_ALPHA8_EXT = 0x8045, + GL_RGBA32F_EXT = 0x8814, + GL_RGB32F_EXT = 0x8815, + GL_ALPHA32F_EXT = 0x8816, + GL_LUMINANCE32F_EXT = 0x8818, + GL_LUMINANCE_ALPHA32F_EXT = 0x8819, + GL_RGBA16F_EXT = 0x881A, + GL_RGB16F_EXT = 0x881B, + GL_ALPHA16F_EXT = 0x881C, + GL_LUMINANCE16F_EXT = 0x881E, + GL_LUMINANCE_ALPHA16F_EXT = 0x881F, + GL_RGB10_A2_EXT = 0x8059, + GL_RGB10_EXT = 0x8052, + GL_BGRA8_EXT = 0x93A1; + + void glTexStorage1DEXT(@GLenum int target, @GLsizei int levels, + @GLenum int internalformat, + @GLsizei int width); + + void glTexStorage2DEXT(@GLenum int target, @GLsizei int levels, + @GLenum int internalformat, + @GLsizei int width, @GLsizei int height); + + void glTexStorage3DEXT(@GLenum int target, @GLsizei int levels, + @GLenum int internalformat, + @GLsizei int width, @GLsizei int height, @GLsizei int depth); + + void glTextureStorage1DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels, + @GLenum int internalformat, + @GLsizei int width); + + void glTextureStorage2DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels, + @GLenum int internalformat, + @GLsizei int width, @GLsizei int height); + + void glTextureStorage3DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels, + @GLenum int internalformat, + @GLsizei int width, @GLsizei int height, @GLsizei int depth); + +} \ No newline at end of file Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java 2012-01-05 11:24:13 UTC (rev 3720) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2002-2008 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengles; + +public interface NV_EGL_stream_consumer_external { + + /** Accepted as a target in the <target> parameter of BindTexture: */ + int GL_TEXTURE_EXTERNAL_OES = 0x8D65; + + /** Returned in the <type> parameter of GetActiveUniform: */ + int GL_SAMPLER_EXTERNAL_OES = 0x8D66; + + /** Accepted as <value> in GetIntegerv() and GetFloatv() queries: */ + int GL_TEXTURE_BINDING_EXTERNAL_OES = 0x8D67; + + /** Accepted as <value> in GetTexParameter*() queries: */ + int GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES = 0x8D68; + +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2012-01-18 12:19:58
|
Revision: 3727 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3727&view=rev Author: spasi Date: 2012-01-18 12:19:52 +0000 (Wed, 18 Jan 2012) Log Message: ----------- Require at least 1 element remaining in BO data params. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-17 21:05:13 UTC (rev 3726) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-18 12:19:52 UTC (rev 3727) @@ -83,6 +83,7 @@ @GenerateAutos void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB long size, + @Check("1") @Const @GLbyte @GLshort @@ -91,7 +92,7 @@ @GLdouble Buffer data, @GLenum int usage); void glBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size, - @Check + @Check("1") @Const @GLbyte @GLshort @@ -101,7 +102,7 @@ void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size, @OutParameter - @Check + @Check("1") @GLbyte @GLshort @GLint Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-17 21:05:13 UTC (rev 3726) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-18 12:19:52 UTC (rev 3727) @@ -862,6 +862,7 @@ @Dependent("OpenGL15") @GenerateAutos void glNamedBufferDataEXT(@GLuint int buffer, @AutoSize("data") @GLsizeiptr long size, + @Check("1") @Const @GLbyte @GLshort @@ -871,7 +872,7 @@ @Dependent("OpenGL15") void glNamedBufferSubDataEXT(@GLuint int buffer, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, - @Check + @Check("1") @Const @GLbyte @GLshort @@ -929,7 +930,7 @@ @Dependent("OpenGL15") void glGetNamedBufferSubDataEXT(@GLuint int buffer, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, @OutParameter - @Check + @Check("1") @GLbyte @GLshort @GLint Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-17 21:05:13 UTC (rev 3726) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-18 12:19:52 UTC (rev 3727) @@ -109,6 +109,7 @@ @GenerateAutos void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size, + @Check("1") @Const @GLbyte @GLshort @@ -117,7 +118,7 @@ @GLdouble Buffer data, @GLenum int usage); void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, - @Check + @Check("1") @Const @GLbyte @GLshort @@ -127,7 +128,7 @@ void glGetBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, @OutParameter - @Check + @Check("1") @GLbyte @GLshort @GLint Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-17 21:05:13 UTC (rev 3726) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-18 12:19:52 UTC (rev 3727) @@ -480,10 +480,10 @@ @GenerateAutos void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size, - @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage); + @Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage); void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, - @Check @Const @GLbyte @GLshort @GLint @GLfloat Buffer data); + @Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data); @GLenum int glCheckFramebufferStatus(@GLenum int target); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2012-01-28 19:35:23
|
Revision: 3732 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3732&view=rev Author: spasi Date: 2012-01-28 19:35:16 +0000 (Sat, 28 Jan 2012) Log Message: ----------- Added AMD_stencil_operation_extended. Reverted @Check("1") from SubData BO functions. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java Added Paths: ----------- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java 2012-01-28 19:35:16 UTC (rev 3732) @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2002-2012 LWJGL Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.opengl; + +import org.lwjgl.util.generator.opengl.GLenum; +import org.lwjgl.util.generator.opengl.GLuint; + +public interface AMD_stencil_operation_extended { + + /** + * Accepted by the <sfail>, <dpfail> and <dppass> parameters of StencilOp + * and StencilOpSeparate: + */ + int GL_SET_AMD = 0x874A, + GL_AND = 0x1501, + GL_XOR = 0x1506, + GL_OR = 0x1507, + GL_NOR = 0x1508, + GL_EQUIV = 0x1509, + GL_NAND = 0x150E, + GL_REPLACE_VALUE_AMD = 0x874B; + + /** + * Accepted by the <param> parameter of GetIntegerv, GetFloatv, GetBooleanv + * GetDoublev and GetInteger64v: + */ + int GL_STENCIL_OP_VALUE_AMD = 0x874C, + GL_STENCIL_BACK_OP_VALUE_AMD = 0x874D; + + void glStencilOpValueAMD(@GLenum int face, @GLuint int value); + +} \ 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-01-23 21:30:46 UTC (rev 3731) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-28 19:35:16 UTC (rev 3732) @@ -92,7 +92,7 @@ @GLdouble Buffer data, @GLenum int usage); void glBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size, - @Check("1") + @Check @Const @GLbyte @GLshort @@ -102,7 +102,7 @@ void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size, @OutParameter - @Check("1") + @Check @GLbyte @GLshort @GLint Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-23 21:30:46 UTC (rev 3731) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-28 19:35:16 UTC (rev 3732) @@ -872,7 +872,7 @@ @Dependent("OpenGL15") void glNamedBufferSubDataEXT(@GLuint int buffer, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, - @Check("1") + @Check @Const @GLbyte @GLshort @@ -930,7 +930,7 @@ @Dependent("OpenGL15") void glGetNamedBufferSubDataEXT(@GLuint int buffer, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, @OutParameter - @Check("1") + @Check @GLbyte @GLshort @GLint Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-23 21:30:46 UTC (rev 3731) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-28 19:35:16 UTC (rev 3732) @@ -118,7 +118,7 @@ @GLdouble Buffer data, @GLenum int usage); void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, - @Check("1") + @Check @Const @GLbyte @GLshort @@ -128,7 +128,7 @@ void glGetBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, @OutParameter - @Check("1") + @Check @GLbyte @GLshort @GLint Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-23 21:30:46 UTC (rev 3731) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-28 19:35:16 UTC (rev 3732) @@ -483,7 +483,7 @@ @Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage); void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, - @Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data); + @Check @Const @GLbyte @GLshort @GLint @GLfloat Buffer data); @GLenum int glCheckFramebufferStatus(@GLenum int target); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2012-01-29 19:06:19
|
Revision: 3733 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3733&view=rev Author: spasi Date: 2012-01-29 19:06:13 +0000 (Sun, 29 Jan 2012) Log Message: ----------- Removed @Check("1") from BufferData functions. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-28 19:35:16 UTC (rev 3732) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-29 19:06:13 UTC (rev 3733) @@ -83,7 +83,7 @@ @GenerateAutos void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB long size, - @Check("1") + @Check @Const @GLbyte @GLshort Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-28 19:35:16 UTC (rev 3732) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-29 19:06:13 UTC (rev 3733) @@ -862,7 +862,7 @@ @Dependent("OpenGL15") @GenerateAutos void glNamedBufferDataEXT(@GLuint int buffer, @AutoSize("data") @GLsizeiptr long size, - @Check("1") + @Check @Const @GLbyte @GLshort Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-28 19:35:16 UTC (rev 3732) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-29 19:06:13 UTC (rev 3733) @@ -109,7 +109,7 @@ @GenerateAutos void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size, - @Check("1") + @Check @Const @GLbyte @GLshort Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-28 19:35:16 UTC (rev 3732) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-29 19:06:13 UTC (rev 3733) @@ -480,7 +480,7 @@ @GenerateAutos void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size, - @Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage); + @Check @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage); void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, @Check @Const @GLbyte @GLshort @GLint @GLfloat Buffer data); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2012-08-18 11:46:33
|
Revision: 3786 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3786&view=rev Author: spasi Date: 2012-08-18 11:46:25 +0000 (Sat, 18 Aug 2012) Log Message: ----------- Keep type postfix on alternative functions that return primitive values. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.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_program_interface_query.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_timer_query.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_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/GL41.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES30.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -75,7 +75,7 @@ @Alternate("glGetObjectParameterivAPPLE") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetObjectParameterivAPPLE2(@GLenum int objectType, @GLuint int name, @GLenum int pname, @OutParameter IntBuffer params); } \ 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-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -144,7 +144,7 @@ @Alternate("glGetBufferParameterivARB") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetBufferParameterivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("pointer") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -72,7 +72,7 @@ @Reuse("GL43") @Alternate("glGetFramebufferParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetFramebufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @Dependent("GL_EXT_direct_state_access") 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-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -223,7 +223,7 @@ @Reuse("GL30") @Alternate("glGetRenderbufferParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @Reuse("GL30") @@ -280,7 +280,7 @@ @Reuse("GL30") @Alternate("glGetFramebufferAttachmentParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -180,7 +180,7 @@ @Reuse("GL43") @Alternate("glGetInternalformati64v") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetInternalformati64v2(@GLenum int target, @GLenum int internalformat, @GLenum int pname, @Constant("1") @GLsizei int bufSize, @OutParameter @GLint64 LongBuffer params); 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-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -81,7 +81,7 @@ @Alternate("glGetQueryivARB") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryivARB2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("params") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -173,13 +173,13 @@ @Alternate("glGetProgramivARB") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetProgramivARB2(@GLenum int target, @GLenum int parameterName, @OutParameter IntBuffer params); void glGetProgramStringARB(@GLenum int target, @GLenum int parameterName, @OutParameter @Check @GLbyte Buffer paramString); @Alternate("glGetProgramStringARB") - @Code("\t\tint programLength = glGetProgramARB(target, GL_PROGRAM_LENGTH_ARB);") + @Code("\t\tint programLength = glGetProgramiARB(target, GL_PROGRAM_LENGTH_ARB);") @GLreturn(value="paramString", maxLength = "programLength", forceMaxLength = true) void glGetProgramStringARB2(@GLenum int target, @GLenum int parameterName, @OutParameter @GLchar ByteBuffer paramString); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -105,7 +105,7 @@ @Reuse("GL43") @Alternate("glGetProgramInterfaceiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetProgramInterfaceiv2(@GLuint int program, @GLenum int programInterface, @GLenum int pname, @OutParameter IntBuffer params); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -134,7 +134,7 @@ @Reuse("GL41") @Alternate("glGetProgramPipelineiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetProgramPipelineiv2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params); @Reuse("GL41") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -115,7 +115,7 @@ @Reuse("GL40") @Alternate("glGetUniformSubroutineuiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetUniformSubroutineuiv2(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params); @Reuse("GL40") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -97,7 +97,7 @@ @Reuse("GL32") @Alternate("glGetInteger64v") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetInteger64v2(@GLenum int pname, @OutParameter @GLint64 LongBuffer params); @Reuse("GL32") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_timer_query.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_timer_query.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_timer_query.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -63,7 +63,7 @@ @Reuse("GL33") @Alternate("glGetQueryObjecti64v") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryObjecti64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params); @Reuse("GL33") @@ -73,7 +73,7 @@ @Reuse("GL33") @Alternate("glGetQueryObjectui64v") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryObjectui64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params); } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -65,7 +65,7 @@ @Reuse("GL40") @Alternate("glGetQueryIndexediv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryIndexediv2(@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/ARB_uniform_buffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -121,7 +121,7 @@ @Reuse("GL31") @Alternate("glGetActiveUniformsiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") 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, @@ -156,7 +156,7 @@ @Reuse("GL31") @Alternate("glGetActiveUniformBlockiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname, @OutParameter @GLint IntBuffer params); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -75,7 +75,7 @@ @Alternate("glGetObjectBufferivATI") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetObjectBufferivATI2(@GLuint int buffer, @GLenum int pname, @OutParameter IntBuffer params); void glFreeObjectBufferATI(@GLuint int buffer); 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-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -151,7 +151,7 @@ @Alternate("glGetRenderbufferParameterivEXT") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetRenderbufferParameterivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); boolean glIsFramebufferEXT(@GLuint int framebuffer); @@ -185,7 +185,7 @@ @Alternate("glGetFramebufferAttachmentParameterivEXT") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetFramebufferAttachmentParameterivEXT2(@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-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -169,7 +169,7 @@ @Alternate("glGetBufferParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("pointer") @@ -219,7 +219,7 @@ @Alternate("glGetQueryiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryiv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("params") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -191,7 +191,7 @@ @Alternate("glGetShaderiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("params") @@ -199,7 +199,7 @@ @Alternate("glGetProgramiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params); void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int maxLength, Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -543,7 +543,7 @@ @Alternate("glGetRenderbufferParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); boolean glIsFramebuffer(@GLuint int framebuffer); @@ -577,7 +577,7 @@ @Alternate("glGetFramebufferAttachmentParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetFramebufferAttachmentParameteriv2(@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-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -253,7 +253,7 @@ @Alternate("glGetActiveUniformsiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") 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, @@ -282,7 +282,7 @@ @Alternate("glGetActiveUniformBlockiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname, @OutParameter @GLint IntBuffer params); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -59,7 +59,7 @@ @Alternate("glGetBufferParameteri64v") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetBufferParameteri64v2(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params); // --------------------------------------------------------------------- @@ -338,7 +338,7 @@ @Alternate("glGetSynciv") @GLreturn("values") - @StripPostfix("values") + @StripPostfix(value = "values", postfix = "v") void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize, @OutParameter @GLsizei @Constant("0L") IntBuffer length, @OutParameter IntBuffer values); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL33.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -211,7 +211,7 @@ @Alternate("glGetQueryObjecti64v") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryObjecti64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params); @StripPostfix("params") @@ -219,7 +219,7 @@ @Alternate("glGetQueryObjectui64v") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryObjectui64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params); // -------------------------------------------------------------------- Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -227,7 +227,7 @@ @Alternate("glGetActiveSubroutineUniformiv") @GLreturn("values") - @StripPostfix("values") + @StripPostfix(value = "values", postfix = "v") void glGetActiveSubroutineUniformiv2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer values); @@ -259,7 +259,7 @@ @Alternate("glGetUniformSubroutineuiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetUniformSubroutineuiv2(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params); @StripPostfix("values") @@ -267,7 +267,7 @@ @Alternate("glGetProgramStageiv") @GLreturn("values") - @StripPostfix("values") + @StripPostfix(value = "values", postfix = "v") void glGetProgramStageiv2(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values); // ----------------------------------------------------------------------- @@ -448,7 +448,7 @@ @Alternate("glGetQueryIndexediv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryIndexediv2(@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/GL41.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -188,7 +188,7 @@ @Alternate("glGetProgramPipelineiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetProgramPipelineiv2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params); void glProgramUniform1i(@GLuint int program, int location, int v0); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL43.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -393,7 +393,7 @@ @Alternate("glGetFramebufferParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetFramebufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); // ----------------------------------------------------------------------------- @@ -536,7 +536,7 @@ @Alternate("glGetInternalformati64v") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetInternalformati64v2(@GLenum int target, @GLenum int internalformat, @GLenum int pname, @Constant("1") @GLsizei int bufSize, @OutParameter @GLint64 LongBuffer params); @@ -658,7 +658,7 @@ @Alternate("glGetProgramInterfaceiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetProgramInterfaceiv2(@GLuint int program, @GLenum int programInterface, @GLenum int pname, @OutParameter IntBuffer params); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_present_video.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -86,7 +86,7 @@ @Alternate("glGetVideoivNV") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetVideoivNV2(@GLuint int video_slot, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("params") @@ -94,7 +94,7 @@ @Alternate("glGetVideouivNV") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetVideouivNV2(@GLuint int video_slot, @GLenum int pname, @OutParameter @GLuint IntBuffer params); @StripPostfix("params") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_program.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -82,13 +82,13 @@ @Alternate("glGetProgramivNV") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetProgramivNV2(@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") - @Code("\t\tint programLength = glGetProgramNV(programID, GL_PROGRAM_LENGTH_NV);") + @Code("\t\tint programLength = glGetProgramiNV(programID, GL_PROGRAM_LENGTH_NV);") @GLreturn(value="paramString", maxLength = "programLength", forceMaxLength = true) void glGetProgramStringNV2(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLchar ByteBuffer paramString); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -68,7 +68,7 @@ @Alternate("glGetBufferParameterui64vNV") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetBufferParameterui64vNV2(@GLenum int target, @GLenum int pname, @OutParameter @GLuint64EXT LongBuffer params); @StripPostfix("params") @@ -76,7 +76,7 @@ @Alternate("glGetNamedBufferParameterui64vNV") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetNamedBufferParameterui64vNV2(@GLuint int buffer, @GLenum int pname, @OutParameter @GLuint64EXT LongBuffer params); @StripPostfix("result") @@ -84,7 +84,7 @@ @Alternate("glGetIntegerui64vNV") @GLreturn("result") - @StripPostfix("result") + @StripPostfix(value = "result", postfix = "v") void glGetIntegerui64vNV2(@GLenum int value, @OutParameter @GLuint64EXT LongBuffer result); void glUniformui64NV(int location, @GLuint64EXT long value); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -107,7 +107,7 @@ @Alternate("glGetIntegerui64i_vNV") @GLreturn("result") - @StripPostfix("result") + @StripPostfix(value = "result", postfix = "i_v") void glGetIntegerui64i_vNV2(@GLenum int value, @GLuint int index, @OutParameter @GLuint64EXT LongBuffer result); } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_video_capture.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -145,7 +145,7 @@ @Alternate("glGetVideoCaptureivNV") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetVideoCaptureivNV2(@GLuint int video_capture_slot, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("params") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -80,7 +80,7 @@ @Alternate("glGetQueryivEXT") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("params") Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -113,7 +113,7 @@ @Alternate("glGetProgramPipelineivEXT") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetProgramPipelineivEXT2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params); void glProgramUniform1iEXT(@GLuint int program, int location, int v0); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -701,7 +701,7 @@ @Alternate("glGetBufferParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetBufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @NoErrorCheck @@ -721,7 +721,7 @@ @Alternate("glGetFramebufferAttachmentParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetFramebufferAttachmentParameteriv2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("params") @@ -737,7 +737,7 @@ @Alternate("glGetProgramiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetProgramiv2(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params); void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int bufsize, @@ -755,7 +755,7 @@ @Alternate("glGetRenderbufferParameteriv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetRenderbufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("params") @@ -763,7 +763,7 @@ @Alternate("glGetShaderiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetShaderiv2(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params); void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int bufsize, Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES30.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES30.java 2012-08-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES30.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -413,7 +413,7 @@ @Alternate("glGetQueryiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetQueryiv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); @StripPostfix("params") @@ -662,7 +662,7 @@ @Alternate("glGetActiveUniformsiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") 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, @@ -681,7 +681,7 @@ @Alternate("glGetActiveUniformBlockiv") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname, @OutParameter @GLint IntBuffer params); @@ -742,7 +742,7 @@ @Alternate("glGetSynciv") @GLreturn("values") - @StripPostfix("values") + @StripPostfix(value = "values", postfix = "v") void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize, @OutParameter @GLsizei @Constant("0L") IntBuffer length, @OutParameter IntBuffer values); @@ -752,7 +752,7 @@ @Alternate("glGetBufferParameteri64v") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetBufferParameteri64v2(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params); void glGenSamplers(@AutoSize("samplers") @GLsizei int count, @OutParameter @GLuint IntBuffer samplers); 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-16 18:58:41 UTC (rev 3785) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java 2012-08-18 11:46:25 UTC (rev 3786) @@ -144,7 +144,7 @@ @Alternate("glGetRenderbufferParameterivOES") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetRenderbufferParameterivOES2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params); boolean glIsFramebufferOES(@GLuint int framebuffer); @@ -174,7 +174,7 @@ @Alternate("glGetFramebufferAttachmentParameterivOES") @GLreturn("params") - @StripPostfix("params") + @StripPostfix(value = "params", postfix = "v") void glGetFramebufferAttachmentParameterivOES2(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params); void glGenerateMipmapOES(@GLenum int target); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2012-09-03 19:47:12
|
Revision: 3793 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3793&view=rev Author: spasi Date: 2012-09-03 19:47:05 +0000 (Mon, 03 Sep 2012) Log Message: ----------- Removed some re-defined GL11 enums. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -47,9 +47,7 @@ * Returned as a valid value in <data> parameter of * GetPerfMonitorCounterInfoAMD if <pname> = COUNTER_TYPE_AMD */ - int GL_UNSIGNED_INT = 0x1405, - GL_FLOAT = 0x1406, - GL_UNSIGNED_INT64_AMD = 0x8BC2, + int GL_UNSIGNED_INT64_AMD = 0x8BC2, GL_PERCENTAGE_AMD = 0x8BC3; /** Accepted by the <pname> parameter of GetPerfMonitorCounterDataAMD */ Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -61,11 +61,9 @@ int GL_SHADER_OBJECT_ARB = 0x8B48; /** Returned by the <type> parameter of GetActiveUniformARB: */ - int GL_FLOAT = 0x1406; int GL_FLOAT_VEC2_ARB = 0x8B50; int GL_FLOAT_VEC3_ARB = 0x8B51; int GL_FLOAT_VEC4_ARB = 0x8B52; - int GL_INT = 0x1404; int GL_INT_VEC2_ARB = 0x8B53; int GL_INT_VEC3_ARB = 0x8B54; int GL_INT_VEC4_ARB = 0x8B55; Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -71,10 +71,4 @@ int GL_RG = 0x8227; int GL_RG_INTEGER = 0x8228; - /** - * Accepted by the <param> parameter of the TexParameter{if}* - * functions when <pname> is DEPTH_TEXTURE_MODE: - */ - int GL_RED = 0x1903; - } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -81,7 +81,6 @@ int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; /** Returned by the <type> parameter of GetActiveAttribARB: */ - int GL_FLOAT = 0x1406; int GL_FLOAT_VEC2_ARB = 0x8B50; int GL_FLOAT_VEC3_ARB = 0x8B51; int GL_FLOAT_VEC4_ARB = 0x8B52; Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -57,7 +57,6 @@ int GL_SAMPLER_1D_ARRAY_SHADOW_EXT = 0x8DC3; int GL_SAMPLER_2D_ARRAY_SHADOW_EXT = 0x8DC4; int GL_SAMPLER_CUBE_SHADOW_EXT = 0x8DC5; - int GL_UNSIGNED_INT = 0x1405; int GL_UNSIGNED_INT_VEC2_EXT = 0x8DC6; int GL_UNSIGNED_INT_VEC3_EXT = 0x8DC7; int GL_UNSIGNED_INT_VEC4_EXT = 0x8DC8; Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -47,8 +47,6 @@ * Returned as a valid value in <data> parameter of * GetPerfMonitorCounterInfoAMD if <pname> = COUNTER_TYPE_AMD */ - int GL_UNSIGNED_INT = 0x1405; - int GL_FLOAT = 0x1406; int GL_UNSIGNED_INT64_AMD = 0x8BC2; int GL_PERCENTAGE_AMD = 0x8BC3; Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -32,11 +32,4 @@ package org.lwjgl.opengles; public interface OES_texture_float { - - /** - * Accepted by the <type> parameter of TexImage2D, TexSubImage2D, - * TexImage3D, and TexSubImage3D: - */ - int GL_FLOAT = 0x1406; - } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |