From fd800ad319cd96c087bbe046b1f57b1f05c325a8 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Thu, 3 Jan 2008 00:54:46 +0000 Subject: [PATCH] Specific enums for all Version12 features "Light Model, Rescale Normal, Draw Range Elemenets, 3d textures". --- Source/Bind/Specifications/GL2/enum.spec | 42 +++--- Source/Bind/Specifications/GL2/enumext.spec | 147 +++++++++++++++----- 2 files changed, 128 insertions(+), 61 deletions(-) diff --git a/Source/Bind/Specifications/GL2/enum.spec b/Source/Bind/Specifications/GL2/enum.spec index f7a446dd..9ab16209 100644 --- a/Source/Bind/Specifications/GL2/enum.spec +++ b/Source/Bind/Specifications/GL2/enum.spec @@ -725,12 +725,12 @@ GetPName enum: LINE_STIPPLE = 0x0B24 # 1 I LINE_STIPPLE_PATTERN = 0x0B25 # 1 I LINE_STIPPLE_REPEAT = 0x0B26 # 1 I - use VERSION_1_2 SMOOTH_POINT_SIZE_RANGE - use VERSION_1_2 SMOOTH_POINT_SIZE_GRANULARITY - use VERSION_1_2 SMOOTH_LINE_WIDTH_RANGE - use VERSION_1_2 SMOOTH_LINE_WIDTH_GRANULARITY - use VERSION_1_2 ALIASED_POINT_SIZE_RANGE - use VERSION_1_2 ALIASED_LINE_WIDTH_RANGE +# use VERSION_1_2 SMOOTH_POINT_SIZE_RANGE +# use VERSION_1_2 SMOOTH_POINT_SIZE_GRANULARITY +# use VERSION_1_2 SMOOTH_LINE_WIDTH_RANGE +# use VERSION_1_2 SMOOTH_LINE_WIDTH_GRANULARITY +# use VERSION_1_2 ALIASED_POINT_SIZE_RANGE +# use VERSION_1_2 ALIASED_LINE_WIDTH_RANGE LIST_MODE = 0x0B30 # 1 I MAX_LIST_NESTING = 0x0B31 # 1 I @@ -1001,7 +1001,7 @@ GetPName enum: # use ARB_transpose_matrix TRANSPOSE_TEXTURE_MATRIX_ARB # use ARB_transpose_matrix TRANSPOSE_COLOR_MATRIX_ARB - use VERSION_1_2 LIGHT_MODEL_COLOR_CONTROL +# use VERSION_1_2 LIGHT_MODEL_COLOR_CONTROL use EXT_blend_color BLEND_COLOR_EXT @@ -1290,8 +1290,8 @@ LightEnvParameterSGIX enum: ############################################################################### LightModelColorControl enum: - use VERSION_1_2 SINGLE_COLOR - use VERSION_1_2 SEPARATE_SPECULAR_COLOR +# use VERSION_1_2 SINGLE_COLOR +# use VERSION_1_2 SEPARATE_SPECULAR_COLOR ############################################################################### @@ -1299,7 +1299,7 @@ LightModelParameter enum: use GetPName LIGHT_MODEL_AMBIENT use GetPName LIGHT_MODEL_LOCAL_VIEWER use GetPName LIGHT_MODEL_TWO_SIDE - use VERSION_1_2 LIGHT_MODEL_COLOR_CONTROL +# use VERSION_1_2 LIGHT_MODEL_COLOR_CONTROL ############################################################################### @@ -1498,10 +1498,6 @@ PixelFormat enum: use SGIX_icc_texture LUMINANCE16_ALPHA8_ICC_SGIX use SGIX_ycrcb YCRCB_422_SGIX use SGIX_ycrcb YCRCB_444_SGIX - - # Revision 1 - use EXT_bgra BGR - use EXT_bgra BGRA ############################################################################### @@ -1888,8 +1884,8 @@ TextureWrapMode enum: # use SGIS_texture_border_clamp CLAMP_TO_BORDER_SGIS # use SGIS_texture_edge_clamp CLAMP_TO_EDGE_SGIS - use VERSION_1_3 CLAMP_TO_BORDER - use VERSION_1_2 CLAMP_TO_EDGE + # use VERSION_1_3 CLAMP_TO_BORDER + # use VERSION_1_2 CLAMP_TO_EDGE ############################################################################### @@ -3492,13 +3488,13 @@ SGIX_icc_texture enum: ############################################################################### # SMOOTH_* enums are new names for pre-1.2 enums. -VERSION_1_2 enum: - SMOOTH_POINT_SIZE_RANGE = 0x0B12 # 2 F - SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13 # 1 F - SMOOTH_LINE_WIDTH_RANGE = 0x0B22 # 2 F - SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23 # 1 F - ALIASED_POINT_SIZE_RANGE = 0x846D # 2 F - ALIASED_LINE_WIDTH_RANGE = 0x846E # 2 F +#VERSION_1_2 enum: +# SMOOTH_POINT_SIZE_RANGE = 0x0B12 # 2 F +# SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13 # 1 F +# SMOOTH_LINE_WIDTH_RANGE = 0x0B22 # 2 F +# SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23 # 1 F +# ALIASED_POINT_SIZE_RANGE = 0x846D # 2 F +# ALIASED_LINE_WIDTH_RANGE = 0x846E # 2 F ############################################################################### diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index f4736be3..dbddb6ad 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -31,48 +31,119 @@ passthru: #define GL_GLEXT_VERSION 39 # ############################################################################### -VERSION_1_2 enum: - UNSIGNED_BYTE_3_3_2 = 0x8032 # Equivalent to EXT_packed_pixels - UNSIGNED_SHORT_4_4_4_4 = 0x8033 - UNSIGNED_SHORT_5_5_5_1 = 0x8034 - UNSIGNED_INT_8_8_8_8 = 0x8035 - UNSIGNED_INT_10_10_10_2 = 0x8036 - RESCALE_NORMAL = 0x803A # 1 I # Equivalent to EXT_rescale_normal - TEXTURE_BINDING_3D = 0x806A # 1 I - PACK_SKIP_IMAGES = 0x806B # 1 I - PACK_IMAGE_HEIGHT = 0x806C # 1 F - UNPACK_SKIP_IMAGES = 0x806D # 1 I - UNPACK_IMAGE_HEIGHT = 0x806E # 1 F +#VERSION_1_2 enum: +# UNSIGNED_BYTE_3_3_2 = 0x8032 # Equivalent to EXT_packed_pixels +# UNSIGNED_SHORT_4_4_4_4 = 0x8033 +# UNSIGNED_SHORT_5_5_5_1 = 0x8034 +# UNSIGNED_INT_8_8_8_8 = 0x8035 +# UNSIGNED_INT_10_10_10_2 = 0x8036 +# RESCALE_NORMAL = 0x803A # 1 I # Equivalent to EXT_rescale_normal +# TEXTURE_BINDING_3D = 0x806A # 1 I +# PACK_SKIP_IMAGES = 0x806B # 1 I +# PACK_IMAGE_HEIGHT = 0x806C # 1 F +# UNPACK_SKIP_IMAGES = 0x806D # 1 I +# UNPACK_IMAGE_HEIGHT = 0x806E # 1 F +# TEXTURE_3D = 0x806F # 1 I +# PROXY_TEXTURE_3D = 0x8070 +# TEXTURE_DEPTH = 0x8071 +# TEXTURE_WRAP_R = 0x8072 +# MAX_3D_TEXTURE_SIZE = 0x8073 # 1 I +# UNSIGNED_BYTE_2_3_3_REV = 0x8362 # New for OpenGL 1.2 +# UNSIGNED_SHORT_5_6_5 = 0x8363 +# UNSIGNED_SHORT_5_6_5_REV = 0x8364 +# UNSIGNED_SHORT_4_4_4_4_REV = 0x8365 +# UNSIGNED_SHORT_1_5_5_5_REV = 0x8366 +# UNSIGNED_INT_8_8_8_8_REV = 0x8367 +# UNSIGNED_INT_2_10_10_10_REV = 0x8368 +# BGR = 0x80E0 +# BGRA = 0x80E1 +# MAX_ELEMENTS_VERTICES = 0x80E8 +# MAX_ELEMENTS_INDICES = 0x80E9 +# CLAMP_TO_EDGE = 0x812F # Equivalent to SGIS_texture_edge_clamp +# TEXTURE_MIN_LOD = 0x813A # Equivalent to SGIS_texture_lod +# TEXTURE_MAX_LOD = 0x813B +# TEXTURE_BASE_LEVEL = 0x813C +# TEXTURE_MAX_LEVEL = 0x813D +# LIGHT_MODEL_COLOR_CONTROL = 0x81F8 # 1 I +# SINGLE_COLOR = 0x81F9 +# SEPARATE_SPECULAR_COLOR = 0x81FA +# SMOOTH_POINT_SIZE_RANGE = 0x0B12 # 2 F +# SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13 # 1 F +# SMOOTH_LINE_WIDTH_RANGE = 0x0B22 # 2 F +# SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23 # 1 F +# ALIASED_POINT_SIZE_RANGE = 0x846D # 2 F +# ALIASED_LINE_WIDTH_RANGE = 0x846E # 2 F + +# Light Model (http://www.opengl.org/sdk/docs/man/xhtml/glLightModel.xml) +LightModelParameter enum: + LIGHT_MODEL_COLOR_CONTROL = 0x81F8 # 1 I + +LightModelColorControl enum: + SINGLE_COLOR = 0x81F9 + SEPARATE_SPECULAR_COLOR = 0x81FA + +GetPName enum: + LIGHT_MODEL_COLOR_CONTROL = 0x81F8 + +# Rescale Normal (http://www.opengl.org/registry/specs/EXT/rescale_normal.txt) +EnableCap enum: + RESCALE_NORMAL = 0x803A # 1 I # Equivalent to EXT_rescale_normal + +# Draw Range Elements (http://www.opengl.org/sdk/docs/man/xhtml/glGet.xml) +GetPName enum: + MAX_ELEMENTS_VERTICES = 0x80E8 + MAX_ELEMENTS_INDICES = 0x80E9 + +# 3d textures (http://www.opengl.org/sdk/docs/man/xhtml/glTexImage3D.xml) +# http://www.opengl.org/sdk/docs/man/xhtml/glPixelStore.xml +TextureTarget enum: TEXTURE_3D = 0x806F # 1 I - PROXY_TEXTURE_3D = 0x8070 - TEXTURE_DEPTH = 0x8071 - TEXTURE_WRAP_R = 0x8072 - MAX_3D_TEXTURE_SIZE = 0x8073 # 1 I - UNSIGNED_BYTE_2_3_3_REV = 0x8362 # New for OpenGL 1.2 - UNSIGNED_SHORT_5_6_5 = 0x8363 - UNSIGNED_SHORT_5_6_5_REV = 0x8364 - UNSIGNED_SHORT_4_4_4_4_REV = 0x8365 - UNSIGNED_SHORT_1_5_5_5_REV = 0x8366 - UNSIGNED_INT_8_8_8_8_REV = 0x8367 - UNSIGNED_INT_2_10_10_10_REV = 0x8368 - BGR = 0x80E0 + PROXY_TEXTURE_3D = 0x8070 + +PixelType enum: + UNSIGNED_BYTE_3_3_2 = 0x8032 # Equivalent to EXT_packed_pixels + UNSIGNED_SHORT_4_4_4_4 = 0x8033 + UNSIGNED_SHORT_5_5_5_1 = 0x8034 + UNSIGNED_INT_8_8_8_8 = 0x8035 + UNSIGNED_INT_10_10_10_2 = 0x8036 + UNSIGNED_BYTE_2_3_3_REVERSED = 0x8362 # New for OpenGL 1.2 + UNSIGNED_SHORT_5_6_5 = 0x8363 + UNSIGNED_SHORT_5_6_5_REVERSED = 0x8364 + UNSIGNED_SHORT_4_4_4_4_REVERSED = 0x8365 + UNSIGNED_SHORT_1_5_5_5_REVERSED = 0x8366 + UNSIGNED_INT_8_8_8_8_REVERSED = 0x8367 + UNSIGNED_INT_2_10_10_10_REVERSED = 0x8368 + +PixelFormat enum: + BGR = 0x80E0 BGRA = 0x80E1 - MAX_ELEMENTS_VERTICES = 0x80E8 - MAX_ELEMENTS_INDICES = 0x80E9 - CLAMP_TO_EDGE = 0x812F # Equivalent to SGIS_texture_edge_clamp + +GetPName enum: + TEXTURE_BINDING_3D = 0x806A # 1 I + SMOOTH_POINT_SIZE_RANGE = 0x0B12 # 2 F + SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13 # 1 F + SMOOTH_LINE_WIDTH_RANGE = 0x0B22 # 2 F + SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23 # 1 F + ALIASED_POINT_SIZE_RANGE = 0x846D # 2 F + ALIASED_LINE_WIDTH_RANGE = 0x846E # 2 F + MAX_3D_TEXTURE_SIZE = 0x8073 # 1 I + +GetTextureParameter enum: TEXTURE_MIN_LOD = 0x813A # Equivalent to SGIS_texture_lod TEXTURE_MAX_LOD = 0x813B TEXTURE_BASE_LEVEL = 0x813C TEXTURE_MAX_LEVEL = 0x813D - LIGHT_MODEL_COLOR_CONTROL = 0x81F8 # 1 I - SINGLE_COLOR = 0x81F9 - SEPARATE_SPECULAR_COLOR = 0x81FA - SMOOTH_POINT_SIZE_RANGE = 0x0B12 # 2 F - SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13 # 1 F - SMOOTH_LINE_WIDTH_RANGE = 0x0B22 # 2 F - SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23 # 1 F - ALIASED_POINT_SIZE_RANGE = 0x846D # 2 F - ALIASED_LINE_WIDTH_RANGE = 0x846E # 2 F + TEXTURE_DEPTH = 0x8071 + TEXTURE_WRAP_R = 0x8072 + +TextureParameterName enum: + CLAMP_TO_EDGE = 0x812F # Equivalent to SGIS_texture_edge_clamp + +PixelStoreParameter enum: + PACK_SKIP_IMAGES = 0x806B # 1 I + PACK_IMAGE_HEIGHT = 0x806C # 1 F + UNPACK_SKIP_IMAGES = 0x806D # 1 I + UNPACK_IMAGE_HEIGHT = 0x806E # 1 F ARB_imaging enum: CONSTANT_COLOR = 0x8001 # Equivalent to EXT_blend_color @@ -151,7 +222,6 @@ ARB_imaging enum: REPLICATE_BORDER = 0x8153 CONVOLUTION_BORDER_COLOR = 0x8154 - ############################################################################### # # OpenGL 1.3 enums (edited for OpenTK) @@ -347,7 +417,8 @@ GetPName enum: TEXTURE_COMPRESSION_HINT = 0x84EF NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2 COMPRESSED_TEXTURE_FORMATS = 0x86A3 - + + ############################################################################### # # OpenGL 1.4 enums (edited for OpenTK)