From: <eli...@us...> - 2006-11-19 22:01:58
|
Revision: 2667 http://svn.sourceforge.net/java-game-lib/?rev=2667&view=rev Author: elias_naur Date: 2006-11-19 14:01:56 -0800 (Sun, 19 Nov 2006) Log Message: ----------- Renamed NV_transform_feeback.java to NV_transform_feedback.java Added Paths: ----------- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java Removed Paths: ------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java 2006-11-19 21:49:10 UTC (rev 2666) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java 2006-11-19 22:01:56 UTC (rev 2667) @@ -1,139 +0,0 @@ -/* - * Copyright (c) 2002-2004 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.*; - -import java.nio.IntBuffer; -import java.nio.ByteBuffer; - -public interface NV_transform_feeback { - - /** - * Accepted by the <target> parameters of BindBuffer, BufferData, - * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, - * GetBufferPointerv, BindBufferRangeNV, BindBufferOffsetNV and - * BindBufferBaseNV: - */ - int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8C8E; - - /** - * Accepted by the <param> parameter of GetIntegerIndexedvEXT and - * GetBooleanIndexedvEXT: - */ - int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8C84; - int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8C85; - int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8C86; - - /** - * Accepted by the <param> parameter of GetIntegerIndexedvEXT and - * GetBooleanIndexedvEXT, and by the <pname> parameter of GetBooleanv, - * GetDoublev, GetIntegerv, and GetFloatv: - */ - int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8C8F; - - /** - * Accepted by the <bufferMode> parameter of TransformFeedbackAttribsNV and - * TransformFeedbackVaryingsNV: - */ - int GL_INTERLEAVED_ATTRIBS_NV = 0x8C8C; - int GL_SEPARATE_ATTRIBS_NV = 0x8C8D; - - /** - * Accepted by the <target> parameter of BeginQuery, EndQuery, and - * GetQueryiv: - */ - int GL_PRIMITIVES_GENERATED_NV = 0x8C87; - int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8C88; - - /** - * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, and by - * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and - * GetDoublev: - */ - int GL_RASTERIZER_DISCARD_NV = 0x8C89; - - /** - * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv, - * and GetFloatv: - */ - int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8C8A; - int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8C8B; - int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8C80; - int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8C7E; - - /** Accepted by the <pname> parameter of GetProgramiv: */ - int GL_ACTIVE_VARYINGS_NV = 0x8C81; - int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8C82; - int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8C83; - - /** - * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv, - * GetFloatv, and GetProgramiv: - */ - int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8C7F; - - /** Accepted by the <attribs> parameter of TransformFeedbackAttribsNV: */ - int GL_BACK_PRIMARY_COLOR_NV = 0x8C77; - int GL_BACK_SECONDARY_COLOR_NV = 0x8C78; - int GL_TEXTURE_COORD_NV = 0x8C79; - int GL_CLIP_DISTANCE_NV = 0x8C7A; - int GL_VERTEX_ID_NV = 0x8C7B; - int GL_PRIMITIVE_ID_NV = 0x8C7C; - int GL_GENERIC_ATTRIB_NV = 0x8C7D; - - void glBindBufferRangeNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset, @GLsizeiptr long size); - - void glBindBufferOffsetNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset); - - void glBindBufferBaseNV(@GLenum int target, @GLuint int index, @GLuint int buffer); - - void glTransformFeedbackAttribsNV(@AutoSize("attribs") @GLsizei int count, @Const IntBuffer attribs, @GLenum int bufferMode); - - void glTransformFeedbackVaryingsNV(@GLuint int program, @AutoSize("locations") @GLsizei int count, @Const IntBuffer locations, @GLenum int bufferMode); - - void glBeginTransformFeedbackNV(@GLenum int primitiveMode); - - void glEndTransformFeedbackNV(); - - int glGetVaryingLocationNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name); - - void glGetActiveVaryingNV(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int bufSize, - @Check("1") @GLsizei IntBuffer length, - @Check("1") @GLsizei IntBuffer size, - @Check("1") @GLenum IntBuffer type, @GLchar ByteBuffer name); - - void glActiveVaryingNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name); - - void glGetTransformFeedbackVaryingNV(@GLuint int program, @GLuint int index, @Check("1") IntBuffer location); - -} \ No newline at end of file Copied: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java (from rev 2666, trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java) =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java (rev 0) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java 2006-11-19 22:01:56 UTC (rev 2667) @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2002-2004 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.*; + +import java.nio.IntBuffer; +import java.nio.ByteBuffer; + +public interface NV_transform_feedback { + + /** + * Accepted by the <target> parameters of BindBuffer, BufferData, + * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, + * GetBufferPointerv, BindBufferRangeNV, BindBufferOffsetNV and + * BindBufferBaseNV: + */ + int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8C8E; + + /** + * Accepted by the <param> parameter of GetIntegerIndexedvEXT and + * GetBooleanIndexedvEXT: + */ + int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8C84; + int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8C85; + int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8C86; + + /** + * Accepted by the <param> parameter of GetIntegerIndexedvEXT and + * GetBooleanIndexedvEXT, and by the <pname> parameter of GetBooleanv, + * GetDoublev, GetIntegerv, and GetFloatv: + */ + int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8C8F; + + /** + * Accepted by the <bufferMode> parameter of TransformFeedbackAttribsNV and + * TransformFeedbackVaryingsNV: + */ + int GL_INTERLEAVED_ATTRIBS_NV = 0x8C8C; + int GL_SEPARATE_ATTRIBS_NV = 0x8C8D; + + /** + * Accepted by the <target> parameter of BeginQuery, EndQuery, and + * GetQueryiv: + */ + int GL_PRIMITIVES_GENERATED_NV = 0x8C87; + int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8C88; + + /** + * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, and by + * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and + * GetDoublev: + */ + int GL_RASTERIZER_DISCARD_NV = 0x8C89; + + /** + * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv, + * and GetFloatv: + */ + int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8C8A; + int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8C8B; + int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8C80; + int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8C7E; + + /** Accepted by the <pname> parameter of GetProgramiv: */ + int GL_ACTIVE_VARYINGS_NV = 0x8C81; + int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8C82; + int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8C83; + + /** + * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv, + * GetFloatv, and GetProgramiv: + */ + int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8C7F; + + /** Accepted by the <attribs> parameter of TransformFeedbackAttribsNV: */ + int GL_BACK_PRIMARY_COLOR_NV = 0x8C77; + int GL_BACK_SECONDARY_COLOR_NV = 0x8C78; + int GL_TEXTURE_COORD_NV = 0x8C79; + int GL_CLIP_DISTANCE_NV = 0x8C7A; + int GL_VERTEX_ID_NV = 0x8C7B; + int GL_PRIMITIVE_ID_NV = 0x8C7C; + int GL_GENERIC_ATTRIB_NV = 0x8C7D; + + void glBindBufferRangeNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset, @GLsizeiptr long size); + + void glBindBufferOffsetNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset); + + void glBindBufferBaseNV(@GLenum int target, @GLuint int index, @GLuint int buffer); + + void glTransformFeedbackAttribsNV(@AutoSize("attribs") @GLsizei int count, @Const IntBuffer attribs, @GLenum int bufferMode); + + void glTransformFeedbackVaryingsNV(@GLuint int program, @AutoSize("locations") @GLsizei int count, @Const IntBuffer locations, @GLenum int bufferMode); + + void glBeginTransformFeedbackNV(@GLenum int primitiveMode); + + void glEndTransformFeedbackNV(); + + int glGetVaryingLocationNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name); + + void glGetActiveVaryingNV(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int bufSize, + @Check("1") @GLsizei IntBuffer length, + @Check("1") @GLsizei IntBuffer size, + @Check("1") @GLenum IntBuffer type, @GLchar ByteBuffer name); + + void glActiveVaryingNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name); + + void glGetTransformFeedbackVaryingNV(@GLuint int program, @GLuint int index, @Check("1") IntBuffer location); + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eli...@us...> - 2006-12-20 19:21:36
|
Revision: 2698 http://svn.sourceforge.net/java-game-lib/?rev=2698&view=rev Author: elias_naur Date: 2006-12-20 11:21:35 -0800 (Wed, 20 Dec 2006) Log Message: ----------- Make glGetBufferPointer and glMapBuffer in GL15 and ARB_buffer_object compute result_size automatically. Change NV_vertes_array_range to use the new AutoResultSize syntax. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-20 19:19:56 UTC (rev 2697) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-20 19:21:35 UTC (rev 2698) @@ -116,6 +116,7 @@ */ @CachedResult @GLvoid + @AutoResultSize("GLChecks.getBufferObjectSizeARB(caps, target)") ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access); boolean glUnmapBufferARB(@GLenum int target); @@ -124,5 +125,6 @@ void glGetBufferParameterivARB(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("pointer") + @AutoResultSize("GLChecks.getBufferObjectSizeARB(caps, target)") void glGetBufferPointervARB(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer); } Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-20 19:19:56 UTC (rev 2697) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-20 19:21:35 UTC (rev 2698) @@ -123,6 +123,7 @@ */ @CachedResult @GLvoid + @AutoResultSize("GLChecks.getBufferObjectSize(caps, target)") ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access); boolean glUnmapBuffer(@GLenum int target); @@ -131,6 +132,7 @@ void glGetBufferParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("pointer") + @AutoResultSize("GLChecks.getBufferObjectSize(caps, target)") void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer); // ----------------------------------------------------------------- Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java 2006-12-20 19:19:56 UTC (rev 2697) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java 2006-12-20 19:21:35 UTC (rev 2698) @@ -54,7 +54,8 @@ @PlatformDependent({Platform.WGL, Platform.GLX}) @GLvoid - ByteBuffer glAllocateMemoryNV(@AutoResultSize int size, float readFrequency, float writeFrequency, float priority); + @AutoResultSize("size") + ByteBuffer glAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority); @PlatformDependent({Platform.WGL, Platform.GLX}) void glFreeMemoryNV(@Check @GLbyte Buffer pointer); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eli...@us...> - 2006-12-21 08:10:25
|
Revision: 2702 http://svn.sourceforge.net/java-game-lib/?rev=2702&view=rev Author: elias_naur Date: 2006-12-21 00:10:23 -0800 (Thu, 21 Dec 2006) Log Message: ----------- Update javadoc for glMapBuffer Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-20 19:24:25 UTC (rev 2701) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-21 08:10:23 UTC (rev 2702) @@ -109,7 +109,6 @@ * <p/> * ByteBuffer mapped_buffer; mapped_buffer = glMapBufferARB(..., ..., ..., null); ... // Another map on the same buffer mapped_buffer = glMapBufferARB(..., ..., ..., mapped_buffer); * - * @param result_size The size of the buffer area. * @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no new buffer will be created. * * @return A ByteBuffer representing the mapped buffer memory. Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-20 19:24:25 UTC (rev 2701) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-21 08:10:23 UTC (rev 2702) @@ -115,7 +115,6 @@ * ByteBuffer mapped_buffer; mapped_buffer = glMapBuffer(..., ..., ..., null); ... // Another map on the same buffer * mapped_buffer = glMapBuffer(..., ..., ..., mapped_buffer); * - * @param result_size The size of the buffer area. * @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no * new buffer will be created. * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2007-09-19 14:10:52
|
Revision: 2897 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2897&view=rev Author: spasi Date: 2007-09-19 07:10:48 -0700 (Wed, 19 Sep 2007) Log Message: ----------- Extension updates and fixes. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_imaging.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL12.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java trunk/LWJGL/src/templates/org/lwjgl/opengl/GL21.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_texture_shader.java Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_imaging.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_imaging.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_imaging.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -122,6 +122,7 @@ int GL_MINMAX = 0x802E; int GL_MINMAX_FORMAT = 0x802F; int GL_MINMAX_SINK = 0x8030; + int GL_TABLE_TOO_LARGE = 0x8031; void glColorTable(@GLenum int target, @GLenum int internalFormat, @GLsizei int width, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -43,7 +43,7 @@ int GL_COMPRESSED_RGB_ARB = 0x84ED; int GL_COMPRESSED_RGBA_ARB = 0x84EE; int GL_TEXTURE_COMPRESSION_HINT_ARB = 0x84EF; - int GL_TEXTURE_IMAGE_SIZE_ARB = 0x86A0; + int GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB = 0x86A0; int GL_TEXTURE_COMPRESSED_ARB = 0x86A1; int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2; int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3; Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -33,24 +33,31 @@ public interface ARB_texture_env_combine { int GL_COMBINE_ARB = 0x8570; + int GL_COMBINE_RGB_ARB = 0x8571; int GL_COMBINE_ALPHA_ARB = 0x8572; - int GL_RGB_SCALE_ARB = 0x8573; - int GL_ADD_SIGNED_ARB = 0x8574; - int GL_INTERPOLATE_ARB = 0x8575; - int GL_CONSTANT_ARB = 0x8576; - int GL_PRIMARY_COLOR_ARB = 0x8577; - int GL_PREVIOUS_ARB = 0x8578; + int GL_SOURCE0_RGB_ARB = 0x8580; int GL_SOURCE1_RGB_ARB = 0x8581; int GL_SOURCE2_RGB_ARB = 0x8582; int GL_SOURCE0_ALPHA_ARB = 0x8588; int GL_SOURCE1_ALPHA_ARB = 0x8589; int GL_SOURCE2_ALPHA_ARB = 0x858A; + int GL_OPERAND0_RGB_ARB = 0x8590; int GL_OPERAND1_RGB_ARB = 0x8591; int GL_OPERAND2_RGB_ARB = 0x8592; int GL_OPERAND0_ALPHA_ARB = 0x8598; int GL_OPERAND1_ALPHA_ARB = 0x8599; int GL_OPERAND2_ALPHA_ARB = 0x859A; + + int GL_RGB_SCALE_ARB = 0x8573; + + int GL_ADD_SIGNED_ARB = 0x8574; + int GL_INTERPOLATE_ARB = 0x8575; + int GL_SUBTRACT_ARB = 0x84E7; + + int GL_CONSTANT_ARB = 0x8576; + int GL_PRIMARY_COLOR_ARB = 0x8577; + int GL_PREVIOUS_ARB = 0x8578; } Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -31,21 +31,29 @@ */ package org.lwjgl.opengl; -import org.lwjgl.util.generator.*; +import org.lwjgl.util.generator.GLenum; +import org.lwjgl.util.generator.GLsizei; public interface EXT_framebuffer_multisample { + /** Accepted by the <pname> parameter of GetRenderbufferParameterivEXT. */ + int GL_RENDERBUFFER_SAMPLES_EXT = 0x8CAB; + + /** Returned by CheckFramebufferStatusEXT. */ + int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT = 0x8D56; + /** - Accepted by the <pname> parameter of GetRenderbufferParameterivEXT. + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev. */ - int GL_RENDERBUFFER_SAMPLES_EXT = 0x8CAB; + int GL_MAX_SAMPLES_EXT = 0x8D57; /** - Establishes the data storage, format, dimensions, and number of - samples of a renderbuffer object's image. + * Establishes the data storage, format, dimensions, and number of + * samples of a renderbuffer object's image. */ void glRenderbufferStorageMultisampleEXT( @GLenum int target, @GLsizei int samples, - @GLenum int internalformat, - @GLsizei int width, @GLsizei int height); + @GLenum int internalformat, + @GLsizei int width, @GLsizei int height); } Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL12.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL12.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL12.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -33,7 +33,7 @@ import org.lwjgl.util.generator.*; -import java.nio.*; +import java.nio.Buffer; /** * <p/> @@ -41,14 +41,12 @@ * * @author cix_foo <ci...@us...> * @version $Revision$ - * $Id$ + * $Id$ */ public interface GL12 { - /* Error codes */ - int GL_TABLE_TOO_LARGE = 0x8031; - /* Enums */ + int GL_TEXTURE_BINDING_3D = 0x806A; int GL_PACK_SKIP_IMAGES = 0x806B; int GL_PACK_IMAGE_HEIGHT = 0x806C; int GL_UNPACK_SKIP_IMAGES = 0x806D; @@ -86,6 +84,11 @@ int GL_ALIASED_POINT_SIZE_RANGE = 0x846D; int GL_ALIASED_LINE_WIDTH_RANGE = 0x846E; + int GL_SMOOTH_POINT_SIZE_RANGE = 0x0B12; + int GL_SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13; + int GL_SMOOTH_LINE_WIDTH_RANGE = 0x0B22; + int GL_SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23; + void glDrawRangeElements(@GLenum int mode, @GLuint int start, @GLuint int end, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type, @@ -116,5 +119,4 @@ @GLdouble Buffer pixels); void glCopyTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, @GLsizei int width, @GLsizei int height); -} - +} \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -82,7 +82,7 @@ int GL_TEXTURE_FILTER_CONTROL = 0x8500; int GL_TEXTURE_LOD_BIAS = 0x8501; int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD; - int GL_GL_MIRRORED_REPEAT = 0x8370; + int GL_MIRRORED_REPEAT = 0x8370; void glBlendEquation(@GLenum int mode); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -72,6 +72,21 @@ int GL_BUFFER_MAPPED = 0x88BC; int GL_BUFFER_MAP_POINTER = 0x88BD; + int FOG_COORD_SRC = GL14.GL_FOG_COORDINATE_SOURCE; + int GL_FOG_COORD = GL14.GL_FOG_COORDINATE; + int GL_CURRENT_FOG_COORD = GL14.GL_CURRENT_FOG_COORDINATE; + int GL_FOG_COORD_ARRAY_TYPE = GL14.GL_FOG_COORDINATE_ARRAY_TYPE; + int GL_FOG_COORD_ARRAY_STRIDE = GL14.GL_FOG_COORDINATE_ARRAY_STRIDE; + int GL_FOG_COORD_ARRAY_POINTER = GL14.GL_FOG_COORDINATE_ARRAY_POINTER; + int GL_FOG_COORD_ARRAY = GL14.GL_FOG_COORDINATE_ARRAY; + int GL_FOG_COORD_ARRAY_BUFFER_BINDING = GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING; + int GL_SRC0_RGB = GL13.GL_SOURCE0_RGB; + int GL_SRC1_RGB = GL13.GL_SOURCE1_RGB; + int GL_SRC2_RGB = GL13.GL_SOURCE2_RGB; + int GL_SRC0_ALPHA = GL13.GL_SOURCE0_ALPHA; + int GL_SRC1_ALPHA = GL13.GL_SOURCE1_ALPHA; + int GL_SRC2_ALPHA = GL13.GL_SOURCE2_ALPHA; + @Code(" StateTracker.bindBuffer(caps, target, buffer);") void glBindBuffer(@GLenum int target, @GLuint int buffer); Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL21.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL21.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL21.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -31,9 +31,11 @@ */ package org.lwjgl.opengl; -import org.lwjgl.util.generator.*; +import org.lwjgl.util.generator.AutoSize; +import org.lwjgl.util.generator.GLsizei; +import org.lwjgl.util.generator.StripPostfix; -import java.nio.*; +import java.nio.FloatBuffer; public interface GL21 { @@ -41,29 +43,37 @@ // --------------------------[ GLSL 1.20 ]--------------------------- // ------------------------------------------------------------------ + /** Returned by the <type> parameter of GetActiveAttribARB. */ + int GL_FLOAT_MAT2x3 = 0x8B65; + int GL_FLOAT_MAT2x4 = 0x8B66; + int GL_FLOAT_MAT3x2 = 0x8B67; + int GL_FLOAT_MAT3x4 = 0x8B68; + int GL_FLOAT_MAT4x2 = 0x8B69; + int GL_FLOAT_MAT4x3 = 0x8B6A; + @StripPostfix("matrices") void glUniformMatrix2x3fv(int location, @AutoSize(value = "matrices", expression = " / (2 * 3)") @GLsizei int count, - boolean transpose, FloatBuffer matrices); + boolean transpose, FloatBuffer matrices); @StripPostfix("matrices") void glUniformMatrix3x2fv(int location, @AutoSize(value = "matrices", expression = " / (3 * 2)") @GLsizei int count, - boolean transpose, FloatBuffer matrices); + boolean transpose, FloatBuffer matrices); @StripPostfix("matrices") void glUniformMatrix2x4fv(int location, @AutoSize(value = "matrices", expression = " >> 3") @GLsizei int count, - boolean transpose, FloatBuffer matrices); + boolean transpose, FloatBuffer matrices); @StripPostfix("matrices") void glUniformMatrix4x2fv(int location, @AutoSize(value = "matrices", expression = " >> 3") @GLsizei int count, - boolean transpose, FloatBuffer matrices); + boolean transpose, FloatBuffer matrices); @StripPostfix("matrices") void glUniformMatrix3x4fv(int location, @AutoSize(value = "matrices", expression = " / (3 * 4)") @GLsizei int count, - boolean transpose, FloatBuffer matrices); + boolean transpose, FloatBuffer matrices); @StripPostfix("matrices") void glUniformMatrix4x3fv(int location, @AutoSize(value = "matrices", expression = " / (4 * 3)") @GLsizei int count, - boolean transpose, FloatBuffer matrices); + boolean transpose, FloatBuffer matrices); // ------------------------------------------------------------------ // -------------------[ ARB_pixel_buffer_object ]-------------------- @@ -72,14 +82,14 @@ /** * Accepted by the <target> parameters of BindBuffer, BufferData, * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, - * GetBufferParameteriv, and GetBufferPointerv: + * GetBufferParameteriv, and GetBufferPointerv. */ int GL_PIXEL_PACK_BUFFER = 0x88EB; int GL_PIXEL_UNPACK_BUFFER = 0x88EC; /** * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, - * GetFloatv, and GetDoublev: + * GetFloatv, and GetDoublev. */ int GL_PIXEL_PACK_BUFFER_BINDING = 0x88ED; int GL_PIXEL_UNPACK_BUFFER_BINDING = 0x88EF; @@ -109,9 +119,7 @@ // -----------------------[ Misc additions ]------------------------- // ------------------------------------------------------------------ - /** - * Accepted by the <pname> parameter of GetIntegerv and GetFloatv. - */ + /** Accepted by the <pname> parameter of GetIntegerv and GetFloatv. */ int GL_CURRENT_RASTER_SECONDARY_COLOR = 0x845F; } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -36,10 +36,14 @@ public interface NV_framebuffer_multisample_coverage { - /** Accepted by the <pname> parameter of GetRenderbufferParameterivEXT: */ + /** Accepted by the <pname> parameter of GetRenderbufferParameterivEXT. */ int GL_RENDERBUFFER_COVERAGE_SAMPLES_NV = 0x8CAB; int GL_RENDERBUFFER_COLOR_SAMPLES_NV = 0x8E10; + /** Accepted by the <pname> parameter of GetIntegerv. */ + int GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E11; + int GL_MULITSAMPLE_COVERAGE_MODES_NV = 0x8E12; + void glRenderbufferStorageMultisampleCoverageNV(@GLenum int target, @GLsizei int coverageSamples, @GLsizei int colorSamples, - @GLenum int internalformat, @GLsizei int width, @GLsizei int height); + @GLenum int internalformat, @GLsizei int width, @GLsizei int height); } Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_texture_shader.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_texture_shader.java 2007-08-30 18:27:12 UTC (rev 2896) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_texture_shader.java 2007-09-19 14:10:48 UTC (rev 2897) @@ -32,23 +32,58 @@ package org.lwjgl.opengl; public interface NV_texture_shader { + + /** + * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, + * and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, + * and GetDoublev, and by the <target> parameter of TexEnvf, TexEnvfv, + * TexEnvi, TexEnviv, GetTexEnvfv, and GetTexEnviv. + */ int GL_TEXTURE_SHADER_NV = 0x86DE; + + /** + * When the <target> parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv, + * GetTexEnvfv, and GetTexEnviv is TEXTURE_SHADER_NV, then the value + * of <pname> may be: + */ int GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9; int GL_SHADER_OPERATION_NV = 0x86DF; - int GL_CULL_MODES_NV = 0x86E0; - int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1; int GL_OFFSET_TEXTURE_SCALE_NV = 0x86E2; int GL_OFFSET_TEXTURE_BIAS_NV = 0x86E3; + int GL_OFFSET_TEXTURE_2D_SCALE_NV = GL_OFFSET_TEXTURE_SCALE_NV; + int GL_OFFSET_TEXTURE_2D_BIAS_NV = GL_OFFSET_TEXTURE_BIAS_NV; int GL_PREVIOUS_TEXTURE_INPUT_NV = 0x86E4; + + /** + * When the <target> parameter of TexEnvfv, TexEnviv, GetTexEnvfv, and + * GetTexEnviv is TEXTURE_SHADER_NV, then the value of <pname> may be: + */ + int GL_CULL_MODES_NV = 0x86E0; + int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1; + int GL_OFFSET_TEXTURE_2D_MATRIX_NV = GL_OFFSET_TEXTURE_MATRIX_NV; int GL_CONST_EYE_NV = 0x86E5; + + /** + * When the <target> parameter GetTexEnvfv and GetTexEnviv is + * TEXTURE_SHADER_NV, then the value of <pname> may be: + */ int GL_SHADER_CONSISTENT_NV = 0x86DD; + + /** + * When the <target> and <pname> parameters of TexEnvf, TexEnvfv, + * TexEnvi, and TexEnviv are TEXTURE_SHADER_NV and SHADER_OPERATION_NV + * respectively, then the value of <param> or the value pointed to by + * <params> may be: + */ int GL_PASS_THROUGH_NV = 0x86E6; int GL_CULL_FRAGMENT_NV = 0x86E7; + int GL_OFFSET_TEXTURE_2D_NV = 0x86E8; int GL_OFFSET_TEXTURE_RECTANGLE_NV = 0x864C; int GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D; int GL_DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9; int GL_DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA; + int GL_DOT_PRODUCT_NV = 0x86EC; int GL_DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED; int GL_DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE; @@ -57,12 +92,27 @@ int GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1; int GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2; int GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3; + + /** + * Accepted by the <format> parameter of GetTexImage, TexImage1D, + * TexImage2D, TexSubImage1D, and TexSubImage2D. + */ int GL_HILO_NV = 0x86F4; int GL_DSDT_NV = 0x86F5; int GL_DSDT_MAG_NV = 0x86F6; int GL_DSDT_MAG_VIB_NV = 0x86F7; + + /** + * Accepted by the <type> parameter of GetTexImage, TexImage1D, + * TexImage2D, TexSubImage1D, and TexSubImage2D. + */ int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; + + /** + * Accepted by the <internalformat> parameter of CopyTexImage1D, + * CopyTexImage2D, TexImage1D, and TexImage2D. + */ int GL_SIGNED_RGBA_NV = 0x86FB; int GL_SIGNED_RGBA8_NV = 0x86FC; int GL_SIGNED_RGB_NV = 0x86FE; @@ -77,6 +127,11 @@ int GL_SIGNED_INTENSITY8_NV = 0x8708; int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; + + /** + * Accepted by the <internalformat> parameter of TexImage1D and + * TexImage2D. + */ int GL_HILO16_NV = 0x86F8; int GL_SIGNED_HILO_NV = 0x86F9; int GL_SIGNED_HILO16_NV = 0x86FA; @@ -84,6 +139,11 @@ int GL_DSDT8_MAG8_NV = 0x870A; int GL_DSDT_MAG_INTENSITY_NV = 0x86DC; int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B; + + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, GetDoublev, PixelTransferf, and PixelTransferi. + */ int GL_HI_SCALE_NV = 0x870E; int GL_LO_SCALE_NV = 0x870F; int GL_DS_SCALE_NV = 0x8710; @@ -96,10 +156,20 @@ int GL_DT_BIAS_NV = 0x8717; int GL_MAGNITUDE_BIAS_NV = 0x8718; int GL_VIBRANCE_BIAS_NV = 0x8719; + + /** + * Accepted by the <pname> parameter of TexParameteriv, TexParameterfv, + * GetTexParameterfv and GetTexParameteriv. + */ int GL_TEXTURE_BORDER_VALUES_NV = 0x871A; + + /** + * Accepted by the <pname> parameter of GetTexLevelParameterfv and + * GetTexLevelParameteriv. + */ int GL_TEXTURE_HI_SIZE_NV = 0x871B; int GL_TEXTURE_LO_SIZE_NV = 0x871C; int GL_TEXTURE_DS_SIZE_NV = 0x871D; int GL_TEXTURE_DT_SIZE_NV = 0x871E; int GL_TEXTURE_MAG_SIZE_NV = 0x871F; -} +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |