diff --git a/src/templates/org/lwjgl/opengl/ARB_imaging.java b/src/templates/org/lwjgl/opengl/ARB_imaging.java index 73fe6db2..c544a07e 100644 --- a/src/templates/org/lwjgl/opengl/ARB_imaging.java +++ b/src/templates/org/lwjgl/opengl/ARB_imaging.java @@ -122,6 +122,7 @@ public interface ARB_imaging { 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) diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_compression.java b/src/templates/org/lwjgl/opengl/ARB_texture_compression.java index 6cb9ad77..62599bf9 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_compression.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_compression.java @@ -43,7 +43,7 @@ public interface ARB_texture_compression { 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; diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java b/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java index c3327fcf..2d739373 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java @@ -33,24 +33,31 @@ package org.lwjgl.opengl; 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; } diff --git a/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample.java b/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample.java index a7e7b9c3..f48d4e09 100644 --- a/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample.java +++ b/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample.java @@ -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. - */ + /** Accepted by the <pname> parameter of GetRenderbufferParameterivEXT. */ int GL_RENDERBUFFER_SAMPLES_EXT = 0x8CAB; + /** Returned by CheckFramebufferStatusEXT. */ + int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT = 0x8D56; + /** - Establishes the data storage, format, dimensions, and number of - samples of a renderbuffer object's image. + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev. + */ + int GL_MAX_SAMPLES_EXT = 0x8D57; + + /** + * 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); } diff --git a/src/templates/org/lwjgl/opengl/GL12.java b/src/templates/org/lwjgl/opengl/GL12.java index 0e461181..8554c84a 100644 --- a/src/templates/org/lwjgl/opengl/GL12.java +++ b/src/templates/org/lwjgl/opengl/GL12.java @@ -33,7 +33,7 @@ package org.lwjgl.opengl; import org.lwjgl.util.generator.*; -import java.nio.*; +import java.nio.Buffer; /** *

@@ -41,14 +41,12 @@ import java.nio.*; * * @author cix_foo * @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 @@ public interface GL12 { 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 @@ public interface GL12 { @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 diff --git a/src/templates/org/lwjgl/opengl/GL14.java b/src/templates/org/lwjgl/opengl/GL14.java index 4fc928c2..7fe0d105 100644 --- a/src/templates/org/lwjgl/opengl/GL14.java +++ b/src/templates/org/lwjgl/opengl/GL14.java @@ -82,7 +82,7 @@ public interface GL14 { 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); diff --git a/src/templates/org/lwjgl/opengl/GL15.java b/src/templates/org/lwjgl/opengl/GL15.java index b5fc0f33..f6dd0ec5 100644 --- a/src/templates/org/lwjgl/opengl/GL15.java +++ b/src/templates/org/lwjgl/opengl/GL15.java @@ -72,6 +72,21 @@ public interface GL15 { 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); diff --git a/src/templates/org/lwjgl/opengl/GL21.java b/src/templates/org/lwjgl/opengl/GL21.java index b6d57b30..50b33f3a 100644 --- a/src/templates/org/lwjgl/opengl/GL21.java +++ b/src/templates/org/lwjgl/opengl/GL21.java @@ -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 @@ public interface GL21 { // --------------------------[ 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 @@ public interface GL21 { /** * 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 @@ public interface GL21 { // -----------------------[ 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 diff --git a/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java b/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java index fbf103b0..3b30ec28 100644 --- a/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java +++ b/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java @@ -36,10 +36,14 @@ import org.lwjgl.util.generator.GLsizei; 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); } diff --git a/src/templates/org/lwjgl/opengl/NV_texture_shader.java b/src/templates/org/lwjgl/opengl/NV_texture_shader.java index c20d7736..c6cfe954 100644 --- a/src/templates/org/lwjgl/opengl/NV_texture_shader.java +++ b/src/templates/org/lwjgl/opengl/NV_texture_shader.java @@ -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 @@ public interface NV_texture_shader { 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 @@ public interface NV_texture_shader { 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 @@ public interface NV_texture_shader { 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 @@ public interface NV_texture_shader { 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