Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17233 Modified Files: ARB_buffer_object.java ARB_color_buffer_float.java ARB_depth_texture.java ARB_draw_buffers.java ARB_fragment_program.java ARB_fragment_program_shadow.java ARB_fragment_shader.java ARB_half_float_pixel.java ARB_imaging.java ARB_matrix_palette.java ARB_multisample.java ARB_multitexture.java ARB_occlusion_query.java ARB_pixel_buffer_object.java ARB_point_parameters.java ARB_point_sprite.java ARB_program.java ARB_shader_objects.java ARB_shading_language_100.java ARB_texture_compression.java ARB_texture_float.java ARB_texture_rectangle.java ARB_transpose_matrix.java ARB_vertex_blend.java ARB_vertex_buffer_object.java ARB_vertex_program.java ARB_vertex_shader.java ARB_window_pos.java ATI_draw_buffers.java ATI_element_array.java ATI_envmap_bumpmap.java ATI_fragment_shader.java ATI_map_object_buffer.java ATI_texture_compression_3dc.java ATI_texture_float.java ATI_vertex_array_object.java ATI_vertex_attrib_array_object.java ATI_vertex_streams.java EXT_bgra.java EXT_blend_equation_separate.java EXT_blend_subtract.java EXT_cg_shader.java EXT_depth_bounds_test.java EXT_draw_range_elements.java EXT_fog_coord.java EXT_framebuffer_object.java EXT_multi_draw_arrays.java EXT_packed_depth_stencil.java EXT_paletted_texture.java EXT_pixel_buffer_object.java EXT_point_parameters.java EXT_secondary_color.java EXT_stencil_clear_tag.java EXT_texture_compression_s3tc.java EXT_texture_env_combine.java EXT_texture_lod_bias.java EXT_texture_mirror_clamp.java EXT_texture_sRGB.java EXT_vertex_shader.java EXT_vertex_weighting.java GL11.java GL12.java GL13.java GL14.java GL15.java GL20.java HP_occlusion_test.java IBM_rasterpos_clip.java NV_evaluators.java NV_fence.java NV_float_buffer.java NV_fragment_program.java NV_fragment_program2.java NV_half_float.java NV_multisample_filter_hint.java NV_occlusion_query.java NV_pixel_data_range.java NV_point_sprite.java NV_primitive_restart.java NV_program.java NV_register_combiners.java NV_register_combiners2.java NV_texture_compression_vtc.java NV_texture_expand_normal.java NV_vertex_array_range.java NV_vertex_program.java NV_vertex_program2_option.java NV_vertex_program3.java SUN_slice_accum.java Log Message: Converted comments to javadoc, code cleanup Index: EXT_depth_bounds_test.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- EXT_depth_bounds_test.java 20 Feb 2005 20:53:49 -0000 1.3 +++ EXT_depth_bounds_test.java 24 Dec 2005 19:26:37 -0000 1.4 @@ -34,17 +34,18 @@ import org.lwjgl.util.generator.*; public interface EXT_depth_bounds_test { - /* - Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, - and by the <pname> parameter of GetBooleanv, GetIntegerv, - GetFloatv, and GetDoublev: - */ + + /** + Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, + and by the <pname> parameter of GetBooleanv, GetIntegerv, + GetFloatv, and GetDoublev: + */ int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890; - /* - Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, - GetFloatv, and GetDoublev: - */ + /** + Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + GetFloatv, and GetDoublev: + */ int GL_DEPTH_BOUNDS_EXT = 0x8891; void glDepthBoundsEXT(@GLclampd double zmin, @GLclampd double zmax); Index: ATI_element_array.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ATI_element_array.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ATI_element_array.java 21 Mar 2005 08:27:45 -0000 1.4 +++ ATI_element_array.java 24 Dec 2005 19:26:37 -0000 1.5 @@ -31,24 +31,23 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface ATI_element_array { int GL_ELEMENT_ARRAY_ATI = 0x8768; int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769; int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A; void glElementPointerATI(@AutoType("pPointer") @GLenum int type, - @CachedReference - @BufferObject(BufferKind.ArrayVBO) - @Check - @Const - @GLubyte - @GLushort - @GLuint - Buffer pPointer); + @CachedReference + @BufferObject(BufferKind.ArrayVBO) + @Check + @Const + @GLubyte + @GLushort + @GLuint Buffer pPointer); void glDrawElementArrayATI(@GLenum int mode, @GLsizei int count); Index: EXT_secondary_color.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_secondary_color.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- EXT_secondary_color.java 2 Nov 2005 09:28:12 -0000 1.6 +++ EXT_secondary_color.java 24 Dec 2005 19:26:37 -0000 1.7 @@ -31,10 +31,10 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface EXT_secondary_color { int GL_COLOR_SUM_EXT = 0x8458; int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459; @@ -47,19 +47,18 @@ void glSecondaryColor3bEXT(byte red, byte green, byte blue); void glSecondaryColor3fEXT(float red, float green, float blue); - + void glSecondaryColor3dEXT(double red, double green, double blue); void glSecondaryColor3ubEXT(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); void glSecondaryColorPointerEXT(int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, - @CachedReference - @BufferObject(BufferKind.ArrayVBO) - @Check - @Const - @GLbyte - @GLubyte - @GLfloat - @GLdouble - Buffer pPointer); + @CachedReference + @BufferObject(BufferKind.ArrayVBO) + @Check + @Const + @GLbyte + @GLubyte + @GLfloat + @GLdouble Buffer pPointer); } Index: EXT_multi_draw_arrays.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- EXT_multi_draw_arrays.java 20 Feb 2005 20:53:49 -0000 1.3 +++ EXT_multi_draw_arrays.java 24 Dec 2005 19:26:37 -0000 1.4 @@ -31,13 +31,13 @@ */ package org.lwjgl.opengl; -import java.nio.IntBuffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface EXT_multi_draw_arrays { - @Code( " if (piFirst.remaining() != piCount.remaining()) {\n" + - " throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" + - " }") + @Code(" if (piFirst.remaining() != piCount.remaining()) {\n" + + " throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" + + " }") void glMultiDrawArraysEXT(@GLenum int mode, IntBuffer piFirst, @Check @GLsizei IntBuffer piCount, @AutoSize("piFirst") int primcount); } Index: ARB_shading_language_100.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_shading_language_100.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARB_shading_language_100.java 15 Feb 2005 17:05:56 -0000 1.2 +++ ARB_shading_language_100.java 24 Dec 2005 19:26:37 -0000 1.3 @@ -32,8 +32,9 @@ package org.lwjgl.opengl; public interface ARB_shading_language_100 { + /** - * Accepted by the <name> parameter of GetString: - */ + * Accepted by the <name> parameter of GetString: + */ int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8B8C; } Index: GL13.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL13.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GL13.java 2 Nov 2005 09:28:12 -0000 1.4 +++ GL13.java 24 Dec 2005 19:26:37 -0000 1.5 @@ -31,12 +31,10 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; -import java.nio.FloatBuffer; -import java.nio.DoubleBuffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + /** * $Id$ * <p/> @@ -151,106 +149,100 @@ void glActiveTexture(@GLenum int texture); void glClientActiveTexture(@GLenum int texture); + void glCompressedTexImage1D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glCompressedTexImage2D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glCompressedTexImage3D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glCompressedTexSubImage1D(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glCompressedTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glCompressedTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); // TODO: check buffer size valid void glGetCompressedTexImage(@GLenum int target, int lod, - @BufferObject(BufferKind.PackPBO) - @Check - @GLbyte - @GLshort - @GLint - Buffer img); + @BufferObject(BufferKind.PackPBO) + @Check + @GLbyte + @GLshort + @GLint Buffer img); void glMultiTexCoord1f(@GLenum int target, float s); void glMultiTexCoord1d(@GLenum int target, double s); void glMultiTexCoord2f(@GLenum int target, float s, float t); - + void glMultiTexCoord2d(@GLenum int target, double s, double t); void glMultiTexCoord3f(@GLenum int target, float s, float t, float r); - + void glMultiTexCoord3d(@GLenum int target, double s, double t, double r); void glMultiTexCoord4f(@GLenum int target, float s, float t, float r, float q); - + void glMultiTexCoord4d(@GLenum int target, double s, double t, double r, double q); @StripPostfix("m") void glLoadTransposeMatrixf(@Check("16") @Const FloatBuffer m); - + @StripPostfix("m") void glLoadTransposeMatrixd(@Check("16") @Const DoubleBuffer m); @StripPostfix("m") void glMultTransposeMatrixf(@Check("16") @Const FloatBuffer m); - + @StripPostfix("m") void glMultTransposeMatrixd(@Check("16") @Const DoubleBuffer m); Index: ARB_texture_rectangle.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rectangle.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ARB_texture_rectangle.java 13 Dec 2005 20:10:56 -0000 1.3 +++ ARB_texture_rectangle.java 24 Dec 2005 19:26:37 -0000 1.4 @@ -33,46 +33,46 @@ public interface ARB_texture_rectangle { - /* - Accepted by the <cap> parameter of Enable, Disable and IsEnabled; - by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv - and GetDoublev; and by the <target> parameter of BindTexture, - GetTexParameterfv, GetTexParameteriv, TexParameterf, TexParameteri, - TexParameterfv and TexParameteriv: - Accepted by the <target> parameter of GetTexImage, - GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D, - CopyTexImage2D, TexSubImage2D and CopySubTexImage2D: - */ + /** + Accepted by the <cap> parameter of Enable, Disable and IsEnabled; + by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv + and GetDoublev; and by the <target> parameter of BindTexture, + GetTexParameterfv, GetTexParameteriv, TexParameterf, TexParameteri, + TexParameterfv and TexParameteriv: + Accepted by the <target> parameter of GetTexImage, + GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D, + CopyTexImage2D, TexSubImage2D and CopySubTexImage2D: + */ int GL_TEXTURE_RECTANGLE_ARB = 0x84F5; - /* - Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, - GetFloatv and GetDoublev: - */ + /** + Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + GetFloatv and GetDoublev: + */ int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84F6; - /* - Accepted by the <target> parameter of GetTexLevelParameteriv, - GetTexLevelParameterfv, GetTexParameteriv and TexImage2D: - */ + /** + Accepted by the <target> parameter of GetTexLevelParameteriv, + GetTexLevelParameterfv, GetTexParameteriv and TexImage2D: + */ int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84F7; - /* - Accepted by the <pname> parameter of GetBooleanv, GetDoublev, - GetIntegerv and GetFloatv: - */ + /** + Accepted by the <pname> parameter of GetBooleanv, GetDoublev, + GetIntegerv and GetFloatv: + */ int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84F8; - /* - Returned by <type> parameter of GetActiveUniform when the location - <index> for program object <program> is of type sampler2DRect: - */ + /** + Returned by <type> parameter of GetActiveUniform when the location + <index> for program object <program> is of type sampler2DRect: + */ int GL_SAMPLER_2D_RECT_ARB = 0x8B63; - /* - Returned by <type> parameter of GetActiveUniform when the location - <index> for program object <program> is of type sampler2DRectShadow: - */ + /** + Returned by <type> parameter of GetActiveUniform when the location + <index> for program object <program> is of type sampler2DRectShadow: + */ int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64; } Index: ARB_buffer_object.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ARB_buffer_object.java 2 Nov 2005 09:28:12 -0000 1.6 +++ ARB_buffer_object.java 24 Dec 2005 19:26:36 -0000 1.7 @@ -35,10 +35,11 @@ import java.nio.*; -@Extension(postfix="ARB", isFinal=false) +@Extension(postfix = "ARB", isFinal = false) public interface ARB_buffer_object { - /* - * Accepted by the <usage> parameter of BufferDataARB: + + /** + * Accepted by the <usage> parameter of BufferDataARB: */ int GL_STREAM_DRAW_ARB = 0x88E0; int GL_STREAM_READ_ARB = 0x88E1; @@ -50,57 +51,57 @@ int GL_DYNAMIC_READ_ARB = 0x88E9; int GL_DYNAMIC_COPY_ARB = 0x88EA; - /* - * Accepted by the <access> parameter of MapBufferARB: - */ + /** + * Accepted by the <access> parameter of MapBufferARB: + */ int GL_READ_ONLY_ARB = 0x88B8; int GL_WRITE_ONLY_ARB = 0x88B9; int GL_READ_WRITE_ARB = 0x88BA; - /* - * Accepted by the <pname> parameter of GetBufferParameterivARB: - */ + /** + * Accepted by the <pname> parameter of GetBufferParameterivARB: + */ int GL_BUFFER_SIZE_ARB = 0x8764; int GL_BUFFER_USAGE_ARB = 0x8765; int GL_BUFFER_ACCESS_ARB = 0x88BB; int GL_BUFFER_MAPPED_ARB = 0x88BC; int GL_BUFFER_MAP_POINTER_ARB = 0x88BD; - @Code( " StateTracker.bindBuffer(target, buffer);") + @Code(" StateTracker.bindBuffer(target, buffer);") void glBindBufferARB(@GLenum int target, @GLuint int buffer); - @Code( " StateTracker.deleteBuffers(buffers);") + + @Code(" StateTracker.deleteBuffers(buffers);") void glDeleteBuffersARB(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers); + void glGenBuffersARB(@AutoSize("buffers") int n, @GLuint IntBuffer buffers); + boolean glIsBufferARB(@GLuint int buffer); @GenerateAutos void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB int size, - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data, @GLenum int usage); + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data, @GLenum int usage); void glBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, - @Check - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @Check + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); /** * glMapBufferARB maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, @@ -116,7 +117,8 @@ * @return A ByteBuffer representing the mapped buffer memory. */ @CachedResult - @GLvoid ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access); + @GLvoid + ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access); boolean glUnmapBufferARB(@GLenum int target); Index: ARB_texture_compression.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ARB_texture_compression.java 2 Nov 2005 09:28:12 -0000 1.4 +++ ARB_texture_compression.java 24 Dec 2005 19:26:37 -0000 1.5 @@ -31,10 +31,10 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface ARB_texture_compression { int GL_COMPRESSED_ALPHA_ARB = 0x84E9; int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA; @@ -49,78 +49,71 @@ int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3; void glCompressedTexImage1DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pData); void glCompressedTexImage2DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pData); void glCompressedTexImage3DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pData); void glCompressedTexSubImage1DARB(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pData); void glCompressedTexSubImage2DARB(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pData); void glCompressedTexSubImage3DARB(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pData); void glGetCompressedTexImageARB(@GLenum int target, int lod, - @BufferObject(BufferKind.PackPBO) - @Check - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer pImg); + @BufferObject(BufferKind.PackPBO) + @Check + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pImg); } Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL15.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- GL15.java 2 Nov 2005 09:28:12 -0000 1.5 +++ GL15.java 24 Dec 2005 19:26:37 -0000 1.6 @@ -72,41 +72,41 @@ int GL_BUFFER_MAPPED = 0x88BC; int GL_BUFFER_MAP_POINTER = 0x88BD; - @Code( " StateTracker.bindBuffer(target, buffer);") + @Code(" StateTracker.bindBuffer(target, buffer);") void glBindBuffer(@GLenum int target, @GLuint int buffer); - @Code( " StateTracker.deleteBuffers(buffers);") + + @Code(" StateTracker.deleteBuffers(buffers);") void glDeleteBuffers(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers); void glGenBuffers(@AutoSize("buffers") @GLsizei int n, @GLuint IntBuffer buffers); + boolean glIsBuffer(@GLuint int buffer); @GenerateAutos void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr int size, - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data, @GLenum int usage); + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data, @GLenum int usage); + void glBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glGetBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, - @Check - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @Check + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); /** * glMapBuffer maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, in which case a new @@ -124,7 +124,8 @@ * @return A ByteBuffer representing the mapped buffer memory. */ @CachedResult - @GLvoid ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access); + @GLvoid + ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access); boolean glUnmapBuffer(@GLenum int target); @@ -138,30 +139,33 @@ // ---------------------- ARB_occlusion_query ---------------------- // ----------------------------------------------------------------- - /* - * Accepted by the <target> parameter of BeginQuery, EndQuery, - * and GetQueryiv: - */ + /** + * Accepted by the <target> parameter of BeginQuery, EndQuery, + * and GetQueryiv: + */ int GL_SAMPLES_PASSED = 0x8914; - /* - Accepted by the <pname> parameter of GetQueryiv: - */ + /** + Accepted by the <pname> parameter of GetQueryiv: + */ int GL_QUERY_COUNTER_BITS = 0x8864; int GL_CURRENT_QUERY = 0x8865; - /* - Accepted by the <pname> parameter of GetQueryObjectiv and - GetQueryObjectuiv: - */ + /** + Accepted by the <pname> parameter of GetQueryObjectiv and + GetQueryObjectuiv: + */ int GL_QUERY_RESULT = 0x8866; int GL_QUERY_RESULT_AVAILABLE = 0x8867; void glGenQueries(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); + void glDeleteQueries(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); + boolean glIsQu... [truncated message content] |