Merged latest OpenGL specs (registry version 48).

Source/Bind/Specifications/GL2/enum.spec

@@ -98,6 +98,7 @@ Extensions define:
 	VERSION_2_0					= 1
 	VERSION_2_1					= 1
 	VERSION_3_0					= 1
+	VERSION_3_1					= 1
 	ARB_imaging					= 1
 	EXT_abgr					= 1
 	EXT_blend_color					= 1
@@ -462,6 +463,10 @@ DrawBufferMode enum:
 	AUX2						= 0x040B
 	AUX3						= 0x040C
 
+# Aliases DrawBufferMode enum above
+# OES_framebuffer_object enum: (OpenGL ES only; additional; see below)
+#	NONE_OES					= 0
+
 ###############################################################################
 
 EnableCap enum:
@@ -593,6 +598,10 @@ ErrorCode enum:
 #	INVALID_FRAMEBUFFER_OPERATION			= 0x0506	# 3.0 / ARB_fbo
 #	INVALID_FRAMEBUFFER_OPERATION_EXT		= 0x0506
 
+# Aliases EXT_fbo enum above
+# OES_framebuffer_object enum: (OpenGL ES only; additional; see below)
+#	INVALID_FRAMEBUFFER_OPERATION_OES		= 0x0506
+
 ###############################################################################
 
 FeedbackType enum:
@@ -1379,6 +1388,15 @@ DataType enum:
 	DOUBLE						= 0x140A
 	DOUBLE_EXT					= 0x140A
 
+# OES_byte_coordinates: (OpenGL ES only)
+#	use DataType BYTE
+
+# OES_element_index_uint enum: (OpenGL ES only)
+#	use DataType UNSIGNED_INT
+
+# OES_texture_float enum: (OpenGL ES only; additional; see below)
+#	use DataType FLOAT
+
 # VERSION_3_0 enum:
 # ARB_half_float_vertex enum: (note: no ARB suffixes)
 # ARB_half_float_pixel enum:
@@ -1387,7 +1405,7 @@ DataType enum:
 #	HALF_FLOAT_ARB					= 0x140B
 #	HALF_FLOAT_NV					= 0x140B
 
-# OES_fixed_point enum:
+# OES_fixed_point enum: (OpenGL ES only)
 #	FIXED_OES					= 0x140C
 
 ###############################################################################
@@ -1538,6 +1556,11 @@ PixelFormat enum:
 	use SGIX_ycrcb YCRCB_422_SGIX
 	use SGIX_ycrcb YCRCB_444_SGIX
 
+# OES_depth_texture enum: (OpenGL ES only)
+#	use DataType UNSIGNED_SHORT
+#	use DataType UNSIGNED_INT
+#	use PixelFormat DEPTH_COMPONENT
+
 ###############################################################################
 
 PixelMap enum:
@@ -1825,6 +1848,10 @@ TextureGenParameter enum:
 	use SGIS_point_line_texgen EYE_LINE_SGIS
 	use SGIS_point_line_texgen OBJECT_LINE_SGIS
 
+# Aliases TextureGenParameter enum above
+# OES_texture_cube_map enum: (OpenGL ES only; additional; see below)
+#	TEXTURE_GEN_MODE				= 0x2500
+
 ###############################################################################
 
 TextureMagFilter enum:
@@ -2110,6 +2137,10 @@ EXT_blend_minmax enum:
 #	BLEND_EQUATION_RGB				= GL_BLEND_EQUATION # VERSION_2_0
 #	BLEND_EQUATION_RGB_EXT				= GL_BLEND_EQUATION
 
+# Aliases EXT_blend_equation_separate enum above
+# OES_blend_equation_separate enum: (OpenGL ES only; additional; see below)
+#	BLEND_EQUATION_RGB_OES				= 0x8009 # 1 I
+
 ###############################################################################
 
 # VERSION_1_2 enum: (Promoted for OpenGL 1.2)
@@ -2119,6 +2150,13 @@ EXT_blend_subtract enum:
 	FUNC_REVERSE_SUBTRACT				= 0x800B
 	FUNC_REVERSE_SUBTRACT_EXT			= 0x800B
 
+# Aliases EXT_blend_minmax and EXT_blend_subtract enums above
+# OES_blend_subtract enum: (OpenGL ES only)
+#	FUNC_ADD_OES					= 0x8006
+#	BLEND_EQUATION_OES				= 0x8009 # 1 I
+#	FUNC_SUBTRACT_OES				= 0x800A
+#	FUNC_REVERSE_SUBTRACT_OES			= 0x800B
+
 ###############################################################################
 
 EXT_cmyka enum:
@@ -2234,6 +2272,9 @@ EXT_packed_pixels enum:
 	UNSIGNED_INT_2_10_10_10_REV			= 0x8368
 	UNSIGNED_INT_2_10_10_10_REV_EXT			= 0x8368
 
+# EXT_texture_type_2_10_10_10_REV enum: (OpenGL ES only)
+#	use EXT_packed_pixels UNSIGNED_INT_2_10_10_10_REV_EXT
+
 ###############################################################################
 
 EXT_polygon_offset enum:
@@ -2295,6 +2336,11 @@ EXT_texture enum:
 	PROXY_TEXTURE_2D_EXT				= 0x8064
 	TEXTURE_TOO_LARGE_EXT				= 0x8065
 
+# Aliases EXT_texture enums above
+# OES_framebuffer_object enum: (OpenGL ES only; additional; see below)
+#	RGBA4_OES					= 0x8056
+#	RGB5_A1_OES					= 0x8057
+
 ###############################################################################
 
 EXT_texture_object enum:
@@ -2327,6 +2373,13 @@ EXT_texture3D enum:
 	MAX_3D_TEXTURE_SIZE				= 0x8073 # 1 I
 	MAX_3D_TEXTURE_SIZE_EXT				= 0x8073 # 1 I
 
+# Aliases EXT_texture_object, EXT_texture3D enums above
+# OES_texture3D enum: (OpenGL ES only)
+#	TEXTURE_3D_BINDING_OES				= 0x806A # 1 I
+#	TEXTURE_3D_OES					= 0x806F # 1 I
+#	TEXTURE_WRAP_R_OES				= 0x8072
+#	MAX_3D_TEXTURE_SIZE_OES				= 0x8073 # 1 I
+
 ###############################################################################
 
 EXT_vertex_array enum:
@@ -2508,6 +2561,13 @@ SGIX_shadow_ambient enum:
 #	BLEND_SRC_ALPHA					= 0x80CB
 #	BLEND_SRC_ALPHA_EXT				= 0x80CB
 
+# Aliases EXT_blend_func_separate enums above
+# OES_blend_func_separate enum: (OpenGL ES only)
+#	BLEND_DST_RGB_OES				= 0x80C8
+#	BLEND_SRC_RGB_OES				= 0x80C9
+#	BLEND_DST_ALPHA_OES				= 0x80CA
+#	BLEND_SRC_ALPHA_OES				= 0x80CB
+
 # EXT_422_pixels enum:
 #	422_EXT						= 0x80CC
 #	422_REV_EXT					= 0x80CD
@@ -2726,7 +2786,7 @@ HP_convolution_border_modes enum:
 	IGNORE_BORDER_HP				= 0x8150
 	CONSTANT_BORDER					= 0x8151
 	CONSTANT_BORDER_HP				= 0x8151
-#	 WRAP_BORDER					 = 0x8152   # Not actually promoted?
+#	WRAP_BORDER					= 0x8152   # Not actually promoted
 	REPLICATE_BORDER				= 0x8153
 	REPLICATE_BORDER_HP				= 0x8153
 	CONVOLUTION_BORDER_COLOR			= 0x8154
@@ -2867,12 +2927,27 @@ SGIX_shadow enum:
 # ARB_depth_texture enum:
 SGIX_depth_texture enum:
 	DEPTH_COMPONENT16				= 0x81A5
+	DEPTH_COMPONENT16_ARB				= 0x81A5
 	DEPTH_COMPONENT16_SGIX				= 0x81A5
 	DEPTH_COMPONENT24				= 0x81A6
+	DEPTH_COMPONENT24_ARB				= 0x81A6
 	DEPTH_COMPONENT24_SGIX				= 0x81A6
 	DEPTH_COMPONENT32				= 0x81A7
+	DEPTH_COMPONENT32_ARB				= 0x81A7
 	DEPTH_COMPONENT32_SGIX				= 0x81A7
 
+# Aliases ARB_depth_texture enum above
+# OES_framebuffer_object enum: (OpenGL ES only; additional; see below)
+#	DEPTH_COMPONENT16_OES				= 0x81A5
+
+# Aliases ARB_depth_texture enum above
+# OES_depth24 enum: (OpenGL ES only)
+#	DEPTH_COMPONENT24_OES				= 0x81A6
+
+# Aliases ARB_depth_texture enum above
+# OES_depth32 enum: (OpenGL ES only)
+#	DEPTH_COMPONENT32_OES				= 0x81A7
+
 ###############################################################################
 
 #EXT_compiled_vertex_array enum:
@@ -3264,7 +3339,7 @@ EXT_pixel_transform enum:
 
 # Unfortunately, there was a collision promoting to EXT from SGIX.
 # Use fog_coord's value of 0x8452 instead of the previously
-#   assigned FRAGMENT_DEPTH_EXT = 0x834B.
+#   assigned FRAGMENT_DEPTH_EXT -> 0x834B.
 # EXT_light_texture: 0x8349-0x8352
 #	FRAGMENT_MATERIAL_EXT				= 0x8349
 #	FRAGMENT_NORMAL_EXT				= 0x834A
@@ -3355,6 +3430,10 @@ SGIX_texture_coordinate_clamp enum:
 #	MIRRORED_REPEAT_ARB				= 0x8370
 #	MIRRORED_REPEAT_IBM				= 0x8370
 
+# Aliases ARB_texture_mirrored_repeat enum above
+# OES_texture_mirrored_repeat enum: (OpenGL ES only)
+#	MIRRORED_REPEAT_OES				= 0x8370
+
 ###############################################################################
 
 # IBM: 0x8380-0x839F
@@ -3593,13 +3672,13 @@ SGIX_icc_texture enum:
 ###############################################################################
 
 # SMOOTH_* enums are new names for pre-1.2 enums.
-#VERSION_1_2 enum:
+VERSION_1_2 enum:
-#	SMOOTH_POINT_SIZE_RANGE				= 0x0B12 # 2 F
+	SMOOTH_POINT_SIZE_RANGE				= 0x0B12 # 2 F
-#	SMOOTH_POINT_SIZE_GRANULARITY			= 0x0B13 # 1 F
+	SMOOTH_POINT_SIZE_GRANULARITY			= 0x0B13 # 1 F
-#	SMOOTH_LINE_WIDTH_RANGE				= 0x0B22 # 2 F
+	SMOOTH_LINE_WIDTH_RANGE				= 0x0B22 # 2 F
-#	SMOOTH_LINE_WIDTH_GRANULARITY			= 0x0B23 # 1 F
+	SMOOTH_LINE_WIDTH_GRANULARITY			= 0x0B23 # 1 F
-#	ALIASED_POINT_SIZE_RANGE			= 0x846D # 2 F
+	ALIASED_POINT_SIZE_RANGE			= 0x846D # 2 F
-#	ALIASED_LINE_WIDTH_RANGE			= 0x846E # 2 F
+	ALIASED_LINE_WIDTH_RANGE			= 0x846E # 2 F
 
 ###############################################################################
 
@@ -3698,8 +3777,41 @@ SGIX_icc_texture enum:
 #	MAX_TEXTURE_UNITS				= 0x84E2 # 1 I
 #	MAX_TEXTURE_UNITS_ARB				= 0x84E2 # 1 I
 
-
+# These are really core ES 1.1 enums, but haven't included
-
+# ES core enums in enum.spec yet
+# OES_texture_env_crossbar: (OpenGL ES only)
+#	use VERSION_1_3 TEXTURE0
+#	use VERSION_1_3 TEXTURE1
+#	use VERSION_1_3 TEXTURE2
+#	use VERSION_1_3 TEXTURE3
+#	use VERSION_1_3 TEXTURE4
+#	use VERSION_1_3 TEXTURE5
+#	use VERSION_1_3 TEXTURE6
+#	use VERSION_1_3 TEXTURE7
+#	use VERSION_1_3 TEXTURE8
+#	use VERSION_1_3 TEXTURE9
+#	use VERSION_1_3 TEXTURE10
+#	use VERSION_1_3 TEXTURE11
+#	use VERSION_1_3 TEXTURE12
+#	use VERSION_1_3 TEXTURE13
+#	use VERSION_1_3 TEXTURE14
+#	use VERSION_1_3 TEXTURE15
+#	use VERSION_1_3 TEXTURE16
+#	use VERSION_1_3 TEXTURE17
+#	use VERSION_1_3 TEXTURE18
+#	use VERSION_1_3 TEXTURE19
+#	use VERSION_1_3 TEXTURE20
+#	use VERSION_1_3 TEXTURE21
+#	use VERSION_1_3 TEXTURE22
+#	use VERSION_1_3 TEXTURE23
+#	use VERSION_1_3 TEXTURE24
+#	use VERSION_1_3 TEXTURE25
+#	use VERSION_1_3 TEXTURE26
+#	use VERSION_1_3 TEXTURE27
+#	use VERSION_1_3 TEXTURE28
+#	use VERSION_1_3 TEXTURE29
+#	use VERSION_1_3 TEXTURE30
+#	use VERSION_1_3 TEXTURE31
 
 ###############################################################################
 
@@ -3725,6 +3837,10 @@ SGIX_icc_texture enum:
 #	MAX_RENDERBUFFER_SIZE				= 0x84E8	# 3.0 / ARB_fbo
 #	MAX_RENDERBUFFER_SIZE_EXT			= 0x84E8
 
+# Aliases EXT_framebuffer_object enum above
+# OES_framebuffer_object enum: (OpenGL ES only; additional; see below)
+#	MAX_RENDERBUFFER_SIZE_OES			= 0x84E8
+
 # VERSION_1_3 enum: (Promoted for OpenGL 1.3)
 # ARB_texture_compression enum:
 #	COMPRESSED_ALPHA				= 0x84E9
@@ -3783,6 +3899,11 @@ SGIX_icc_texture enum:
 #	UNSIGNED_INT_24_8_EXT				= 0x84FA
 #	UNSIGNED_INT_24_8_NV				= 0x84FA
 
+# Aliases EXT_packed_depth_stencil enums above
+# OES_packed_depth_stencil enum: (OpenGL ES only)
+#	DEPTH_STENCIL_OES				= 0x84F9
+#	UNSIGNED_INT_24_8_OES				= 0x84FA
+
 # NV_future_use: 0x84FB-0x84FC
 
 # VERSION_1_4 enum: (Promoted for OpenGL 1.4)
@@ -3820,6 +3941,11 @@ SGIX_icc_texture enum:
 #	DECR_WRAP					= 0x8508
 #	DECR_WRAP_EXT					= 0x8508
 
+# Aliases EXT_stencil_wrap enums above
+# OES_stencil_wrap enum: (OpenGL ES only)
+#	INCR_WRAP_OES					= 0x8507
+#	DECR_WRAP_OES					= 0x8508
+
 # EXT_vertex_weighting enum:
 #	VERTEX_WEIGHTING_EXT				= 0x8509
 #	MODELVIEW1_EXT					= 0x850A
@@ -3860,6 +3986,20 @@ SGIX_icc_texture enum:
 #	MAX_CUBE_MAP_TEXTURE_SIZE			= 0x851C
 #	MAX_CUBE_MAP_TEXTURE_SIZE_ARB			= 0x851C
 
+# Aliases ARB_texture_cube_map enums above
+# OES_texture_cube_map enum: (OpenGL ES only; additional; see below)
+#	NORMAL_MAP_OES					= 0x8511
+#	REFLECTION_MAP_OES				= 0x8512
+#	TEXTURE_CUBE_MAP_OES				= 0x8513
+#	TEXTURE_BINDING_CUBE_MAP_OES			= 0x8514
+#	TEXTURE_CUBE_MAP_POSITIVE_X_OES			= 0x8515
+#	TEXTURE_CUBE_MAP_NEGATIVE_X_OES			= 0x8516
+#	TEXTURE_CUBE_MAP_POSITIVE_Y_OES			= 0x8517
+#	TEXTURE_CUBE_MAP_NEGATIVE_Y_OES			= 0x8518
+#	TEXTURE_CUBE_MAP_POSITIVE_Z_OES			= 0x8519
+#	TEXTURE_CUBE_MAP_NEGATIVE_Z_OES			= 0x851A
+#	MAX_CUBE_MAP_TEXTURE_SIZE_OES			= 0x851C
+
 # NV_vertex_array_range enum:
 #	VERTEX_ARRAY_RANGE_NV				= 0x851D
 #	VERTEX_ARRAY_RANGE_LENGTH_NV			= 0x851E
@@ -4379,6 +4519,15 @@ SGIX_subsample enum:
 #	MODELVIEW30_ARB					= 0x873E
 #	MODELVIEW31_ARB					= 0x873F
 
+# Aliases ARB_vertex_blend enums above
+# OES_matrix_palette enum: (OpenGL ES only; additional; see below)
+#	MAX_VERTEX_UNITS_OES				= 0x86A4
+#	WEIGHT_ARRAY_OES				= 0x86AD
+#	WEIGHT_ARRAY_TYPE_OES				= 0x86A9
+#	WEIGHT_ARRAY_STRIDE_OES				= 0x86AA
+#	WEIGHT_ARRAY_SIZE_OES				= 0x86AB
+#	WEIGHT_ARRAY_POINTER_OES			= 0x86AC
+
 # VERSION_1_3 enum: (Promoted for OpenGL 1.3)
 # ARB_texture_env_dot3
 #	DOT3_RGB					= 0x86AE
@@ -4528,6 +4677,14 @@ SGIX_subsample enum:
 #	DOT3_RGB_EXT					= 0x8740
 #	DOT3_RGBA_EXT					= 0x8741
 
+# There's a collision between AMD_program_binary_Z400 and EXT_texture_env_dot3!
+# AMD_program_binary_Z400 enum: (OpenGL ES only)
+#	Z400_BINARY_AMD					= 0x8740
+
+# There's a collision between OES_get_program_binary and EXT_texture_env_dot3!
+# OES_get_program_binary: (OpenGL ES only; additional; see below)
+#	PROGRAM_BINARY_LENGTH_OES			= 0x8741
+
 # ATI_texture_mirror_once enum:
 #	MIRROR_CLAMP_ATI				= 0x8742
 #	MIRROR_CLAMP_TO_EDGE_ATI			= 0x8743
@@ -4754,6 +4911,9 @@ SGIX_subsample enum:
 #	LOCAL_CONSTANT_VALUE_EXT			= 0x87EC
 #	LOCAL_CONSTANT_DATATYPE_EXT			= 0x87ED
 
+# AMD_compressed_ATC_texture (OpenGL ES only) (additional; see below)
+#	ATC_RGBA_INTERPOLATED_ALPHA_AMD			= 0x87EE
+
 # ATI_pn_triangles enum:
 #	PN_TRIANGLES_ATI				= 0x87F0
 #	MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI		= 0x87F1
@@ -4765,7 +4925,18 @@ SGIX_subsample enum:
 #	PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI		= 0x87F7
 #	PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI		= 0x87F8
 
-# ATI_future_use: 0x87F9-0x87FF
+# AMD_compressed_3DC_texture (OpenGL ES only)
+#	3DC_X_AMD					= 0x87F9
+#	3DC_XY_AMD					= 0x87FA
+
+# ATI_meminfo enum:
+#	VBO_FREE_MEMORY_ATI				= 0x87FB
+#	TEXTURE_FREE_MEMORY_ATI				= 0x87FC
+#	RENDERBUFFER_FREE_MEMORY_ATI			= 0x87FD
+
+# OES_get_program_binary: (OpenGL ES only;
+#	NUM_PROGRAM_BINARY_FORMATS_OES			= 0x87FE
+#	PROGRAM_BINARY_FORMATS_OES			= 0x87FF
 
 # VERSION_2_0 enum: (Promoted for OpenGL 2.0)
 # ATI_separate_stencil enum:
@@ -4899,6 +5070,10 @@ SGIX_subsample enum:
 #	BLEND_EQUATION_ALPHA				= 0x883D    # VERSION_2_0
 #	BLEND_EQUATION_ALPHA_EXT			= 0x883D
 
+# Aliases EXT_blend_equation_separate enum above
+# OES_blend_equation_separate enum: (OpenGL ES only)
+#	BLEND_EQUATION_ALPHA_OES			= 0x883D
+
 ###############################################################################
 
 # ARB: 0x8840-0x884F
@@ -4915,6 +5090,17 @@ SGIX_subsample enum:
 #	MATRIX_INDEX_ARRAY_STRIDE_ARB			= 0x8848
 #	MATRIX_INDEX_ARRAY_POINTER_ARB			= 0x8849
 
+# Aliases ARB_matrix_palette enums above
+# OES_matrix_palette enum: (OpenGL ES only; additional; see below)
+#	MATRIX_PALETTE_OES				= 0x8840
+#	MAX_PALETTE_MATRICES_OES			= 0x8842
+#	CURRENT_PALETTE_MATRIX_OES			= 0x8843
+#	MATRIX_INDEX_ARRAY_OES				= 0x8844
+#	MATRIX_INDEX_ARRAY_SIZE_OES			= 0x8846
+#	MATRIX_INDEX_ARRAY_TYPE_OES			= 0x8847
+#	MATRIX_INDEX_ARRAY_STRIDE_OES			= 0x8848
+#	MATRIX_INDEX_ARRAY_POINTER_OES			= 0x8849
+
 # VERSION_1_4 enum: (Promoted for OpenGL 1.4)
 # ARB_depth_texture enum:
 #	TEXTURE_DEPTH_SIZE				= 0x884A
@@ -4970,6 +5156,11 @@ SGIX_subsample enum:
 #	COORD_REPLACE_ARB				= 0x8862
 #	COORD_REPLACE_NV				= 0x8862
 
+# Aliases ARB_point_sprite enums above
+# OES_point_sprite enum: (OpenGL ES only)
+#	POINT_SPRITE_ARB				= 0x8861
+#	COORD_REPLACE_ARB				= 0x8862
+
 # NV_point_sprite enum:
 #	POINT_SPRITE_R_MODE_NV				= 0x8863
 
@@ -5090,6 +5281,10 @@ SGIX_subsample enum:
 #	VERTEX_ATTRIB_ARRAY_BUFFER_BINDING		= 0x889F
 #	VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB		= 0x889F
 
+# Aliases ARB_vertex_buffer_object enum above
+# OES_matrix_palette enum: (OpenGL ES only; additional; see below)
+#	WEIGHT_ARRAY_BUFFER_BINDING_OES			= 0x889E
+
 # ARB_vertex_program enum: (additional; see above)
 # ARB_fragment_program enum: (additional; see above)
 #	PROGRAM_INSTRUCTIONS_ARB			= 0x88A0
@@ -5132,6 +5327,13 @@ SGIX_subsample enum:
 #	BUFFER_MAP_POINTER				= 0x88BD
 #	BUFFER_MAP_POINTER_ARB				= 0x88BD
 
+# Aliases ARB_vertex_buffer_object enums above
+# OES_mapbuffer enum: (OpenGL ES only)
+#	WRITE_ONLY_OES					= 0x88B9
+#	BUFFER_ACCESS_OES				= 0x88BB
+#	BUFFER_MAPPED_OES				= 0x88BC
+#	BUFFER_MAP_POINTER_OES				= 0x88BD
+
 # NV_future_use: 0x88BE
 
 # EXT_timer_query enum:
@@ -5220,6 +5422,10 @@ SGIX_subsample enum:
 #	TEXTURE_STENCIL_SIZE				= 0x88F1    # 3.0 / ARB_fbo
 #	TEXTURE_STENCIL_SIZE_EXT			= 0x88F1
 
+# Aliases EXT_packed_depth_stencil enum above
+# OES_packed_depth_stencil enum: (OpenGL ES only; additional; see above)
+#	DEPTH24_STENCIL8_OES				= 0x88F0
+
 # EXT_stencil_clear_tag enum:
 #	STENCIL_TAG_BITS_EXT				= 0x88F2
 #	STENCIL_CLEAR_TAG_VALUE_EXT			= 0x88F3
@@ -5405,7 +5611,7 @@ SGIX_subsample enum:
 
 ###############################################################################
 
-# Khronos OpenML WG: 0x8980-0x898F
+# Khronos OpenML WG / OpenGL ES WG: 0x8980-0x898F
 
 # OML_interlace enum:
 #	INTERLACE_OML					= 0x8980
@@ -5423,9 +5629,15 @@ SGIX_subsample enum:
 #	RESAMPLE_AVERAGE_OML				= 0x8988
 #	RESAMPLE_DECIMATE_OML				= 0x8989
 
-# Assigned to Affie Munshi for OES_point_size_array/OES_matrix_get extensions
+# OES_point_size_array enum: (OpenGL ES only)
-# OES_point_size_array enum:	0x898A-
+#	POINT_SIZE_ARRAY_TYPE_OES			= 0x898A
-# OES_matrix_get enum:		0x898F
+#	POINT_SIZE_ARRAY_STRIDE_OES			= 0x898B
+#	POINT_SIZE_ARRAY_POINTER_OES			= 0x898C
+
+# OES_matrix_get enum: (OpenGL ES only)
+#	MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES		= 0x898D
+#	PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES		= 0x898E
+#	TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES		= 0x898F
 
 ###############################################################################
 
@@ -5573,6 +5785,14 @@ SGIX_subsample enum:
 #	SHADING_LANGUAGE_VERSION			= 0x8B8C    # VERSION_2_0
 #	SHADING_LANGUAGE_VERSION_ARB			= 0x8B8C    # ARB_shading_language_100
 
+# Aliases ARB_shader_objects enum above
+# OES_texture3D enum: (OpenGL ES only; additional; see above)
+#	SAMPLER_3D_OES					= 0x8B5F    # ARB_shader_objects
+
+# Aliases ARB_fragment_shader enum above
+# OES_standard_derivatives enum: (OpenGL ES only)
+#	FRAGMENT_SHADER_DERIVATIVE_HINT_OES		= 0x8B8B
+
 # VERSION_3_0 enum:
 # ARB_geometry_shader4 enum: (additional; see below; note: no ARB suffixes)
 #	MAX_VARYING_COMPONENTS				= GL_MAX_VARYING_FLOATS     # 3.0
@@ -5588,7 +5808,7 @@ SGIX_subsample enum:
 
 # Khronos OpenGL ES WG: 0x8B90-0x8B9F
 
-# OES_compressed_paletted_texture enum:
+# OES_compressed_paletted_texture enum: (OpenGL ES only)
 #	PALETTE4_RGB8_OES				= 0x8B90
 #	PALETTE4_RGBA8_OES				= 0x8B91
 #	PALETTE4_R5_G6_B5_OES				= 0x8B92
@@ -5600,18 +5820,21 @@ SGIX_subsample enum:
 #	PALETTE8_RGBA4_OES				= 0x8B98
 #	PALETTE8_RGB5_A1_OES				= 0x8B99
 
-# OES_read_format enum:
+# OES_read_format enum: (OpenGL ES, also implemented in Mesa)
 #	IMPLEMENTATION_COLOR_READ_TYPE_OES		= 0x8B9A
 #	IMPLEMENTATION_COLOR_READ_FORMAT_OES		= 0x8B9B
 
-# Extensions names TBD, for OpenGL ES 1.1
+# OES_point_size_array enum: (OpenGL ES only; additional; see above)
-# These need to go in enumext.spec as well
 #	POINT_SIZE_ARRAY_OES				= 0x8B9C
+
+# OES_draw_texture enum: (OpenGL ES only)
 #	TEXTURE_CROP_RECT_OES				= 0x8B9D
 
-# More Khronos extensions, need to go in enumext.spec
+# OES_matrix_palette enum: (OpenGL ES only)
 #	MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES		= 0x8B9E
-#	WEIGHT_INDEX_ARRAY_BUFFER_BINDING_OES		= 0x8B9F
+
+# OES_point_size_array enum: (OpenGL ES only; additional; see above)
+#	POINT_SIZE_ARRAY_BUFFER_BINDING_OES		= 0x8B9F
 
 ###############################################################################
 
@@ -5636,6 +5859,15 @@ SGIX_subsample enum:
 
 # ATI: 0x8BC0-0x8BFF
 
+# AMD_performance_monitor enum:
+#	COUNTER_TYPE_AMD				= 0x8BC0
+#	COUNTER_RANGE_AMD				= 0x8BC1
+#	UNSIGNED_INT64_AMD				= 0x8BC2
+#	PERCENTAGE_AMD					= 0x8BC3
+#	PERFMON_RESULT_AVAILABLE_AMD			= 0x8BC4
+#	PERFMON_RESULT_SIZE_AMD				= 0x8BC5
+#	PERFMON_RESULT_AMD				= 0x8BC6
+
 ###############################################################################
 
 # Imagination Tech.: 0x8C00-0x8C0F
@@ -5825,6 +6057,14 @@ SGIX_subsample enum:
 
 # ATI: 0x8C90-0x8C9F (Affie Munshi, OpenGL ES extensions)
 
+# AMD_future_use: 0x8C90-0x8C91
+
+# AMD_compressed_ATC_texture (OpenGL ES only)
+#	ATC_RGB_AMD					= 0x8C92
+#	ATC_RGBA_EXPLICIT_ALPHA_AMD			= 0x8C93
+
+# AMD_future_use: 0x8C94-0x8C9F
+
 ###############################################################################
 
 # OpenGL ARB: 0x8CA0-0x8CAF
@@ -5846,6 +6086,11 @@ SGIX_subsample enum:
 #	RENDERBUFFER_BINDING				= 0x8CA7    # 3.0 / ARB_fbo
 #	RENDERBUFFER_BINDING_EXT			= 0x8CA7
 
+# Aliases EXT_framebuffer_object enums above
+# OES_framebuffer_object enum: (OpenGL ES only; additional; see below)
+#	FRAMEBUFFER_BINDING_OES				= 0x8CA6
+#	RENDERBUFFER_BINDING_OES			= 0x8CA7
+
 # VERSION_3_0 enum:
 # ARB_framebuffer_object enum: (note: no ARB suffixes)
 # EXT_framebuffer_blit enum:
@@ -5988,6 +6233,54 @@ SGIX_subsample enum:
 #	RENDERBUFFER_STENCIL_SIZE			= 0x8D55    # 3.0 / ARB_fbo
 #	RENDERBUFFER_STENCIL_SIZE_EXT			= 0x8D55
 
+# Aliases EXT_framebuffer_object enum above
+# OES_texture3D enum: (OpenGL ES only; additional; see above)
+#	FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES	= 0x8CD4
+# @@@??? does this appear in OES_texture3D, or OES_framebuffer_object?
+# extension spec & gl2ext.h disagree!
+
+# Aliases EXT_framebuffer_object enums above
+# OES_framebuffer_object enum: (OpenGL ES only; additional; see below)
+#	FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES		= 0x8CD0
+#	FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES		= 0x8CD1
+#	FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES	= 0x8CD2
+#	FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES = 0x8CD3
+#	FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES	= 0x8CD4
+#	FRAMEBUFFER_COMPLETE_OES			= 0x8CD5
+#	FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES		= 0x8CD6
+#	FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES	= 0x8CD7
+#	FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES		= 0x8CD9
+#	FRAMEBUFFER_INCOMPLETE_FORMATS_OES		= 0x8CDA
+#	FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES		= 0x8CDB
+#	FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES		= 0x8CDC
+#	FRAMEBUFFER_UNSUPPORTED_OES			= 0x8CDD
+#	COLOR_ATTACHMENT0_OES				= 0x8CE0
+#	DEPTH_ATTACHMENT_OES				= 0x8D00
+#	STENCIL_ATTACHMENT_OES				= 0x8D20
+#	FRAMEBUFFER_OES					= 0x8D40
+#	RENDERBUFFER_OES				= 0x8D41
+#	RENDERBUFFER_WIDTH_OES				= 0x8D42
+#	RENDERBUFFER_HEIGHT_OES				= 0x8D43
+#	RENDERBUFFER_INTERNAL_FORMAT_OES		= 0x8D44
+#	STENCIL_INDEX1_OES				= 0x8D46
+#	STENCIL_INDEX4_OES				= 0x8D47
+#	STENCIL_INDEX8_OES				= 0x8D48
+#	RENDERBUFFER_RED_SIZE_OES			= 0x8D50
+#	RENDERBUFFER_GREEN_SIZE_OES			= 0x8D51
+#	RENDERBUFFER_BLUE_SIZE_OES			= 0x8D52
+#	RENDERBUFFER_ALPHA_SIZE_OES			= 0x8D53
+#	RENDERBUFFER_DEPTH_SIZE_OES			= 0x8D54
+#	RENDERBUFFER_STENCIL_SIZE_OES			= 0x8D55
+
+# OES_stencil1 enum: (OpenGL ES only; additional; see below)
+#	use OES_framebuffer_object STENCIL_INDEX1_OES
+
+# OES_stencil4 enum: (OpenGL ES only; additional; see below)
+#	use OES_framebuffer_object STENCIL_INDEX4_OES
+
+# OES_stencil8 enum: (OpenGL ES only; additional; see below)
+#	use OES_framebuffer_object STENCIL_INDEX8_OES
+
 # VERSION_3_0 enum:
 # ARB_framebuffer_object enum: (note: no ARB suffixes)
 # EXT_framebuffer_multisample enum: (additional; see above)
@@ -6005,7 +6298,24 @@ SGIX_subsample enum:
 
 # Khronos OpenGL ES WG: 0x8D60-0x8D6F
 
-# Khronos_future_use: 0x8D60-0x8D6F
+# OES_texture_cube_map enum: (OpenGL ES only)
+#	TEXTURE_GEN_STR_OES				= 0x8D60
+
+# OES_texture_float enum: (OpenGL ES only)
+#	HALF_FLOAT_OES					= 0x8D61
+
+# OES_vertex_half_float enum: (OpenGL ES only)
+#	use OES_texture_float HALF_FLOAT_OES
+
+# OES_framebuffer_object enum: (OpenGL ES only)
+#	RGB565_OES					= 0x8D62
+
+# Khronos_future_use: 0x8D63
+
+# OES_compressed_ETC1_RGB8_texture (OpenGL ES only)
+#	ETC1_RGB8_OES					= 0x8D64
+
+# Khronos_future_use: 0x8D65-0x8D6F
 
 ###############################################################################
 
@@ -6230,7 +6540,13 @@ SGIX_subsample enum:
 
 # Khronos OpenGL ES WG: 0x8DF0-0x8E0F
 
-# Khronos_future_use: 0x8DF0-0x8E0F
+# Khronos_future_use: 0x8DF0-0x8DF5
+
+# OES_vertex_type_10_10_10_2 enum: (OpenGL ES only)
+#	UNSIGNED_INT_10_10_10_2_OES			= 0x8DF6
+#	INT_10_10_10_2_OES				= 0x8DF7
+
+# Khronos_future_use: 0x8DF8-0x8E0F
 
 ###############################################################################
 
@@ -6285,7 +6601,13 @@ SGIX_subsample enum:
 #	TEXTURE_SWIZZLE_A_EXT				= 0x8E45
 #	TEXTURE_SWIZZLE_RGBA_EXT			= 0x8E46
 
-# NV_future_use: 0x8E47-0x8E4F
+# NV_future_use: 0x8E47-0x8E4B
+
+# EXT_provoking_vertex enum:
+#	QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT	= 0x8E4C
+#	FIRST_VERTEX_CONVENTION_EXT			= 0x8E4D
+#	LAST_VERTEX_CONVENTION_EXT			= 0x8E4E
+#	PROVOKING_VERTEX_EXT				= 0x8E4F
 
 # NV_explicit_multisample enum:
 #	SAMPLE_POSITION_NV				= 0x8E50
@@ -6347,18 +6669,70 @@ SGIX_subsample enum:
 # Zebra Imaging: 0x8F80-0x8F8F
 # Assigned for Mike Weiblen (Khronos public bug 91)
 
+###############################################################################
+
+# OpenGL ARB: 0x8F90-0x8F9F (SNORM textures, 3.1 primitive restart server state)
+# VERSION_3_1 enum:
+#	RED_SNORM					= 0x8F90    # 3.1
+#	RG_SNORM					= 0x8F91    # 3.1
+#	RGB_SNORM					= 0x8F92    # 3.1
+#	RGBA_SNORM					= 0x8F93    # 3.1
+#	R8_SNORM					= 0x8F94    # 3.1
+#	RG8_SNORM					= 0x8F95    # 3.1
+#	RGB8_SNORM					= 0x8F96    # 3.1
+#	RGBA8_SNORM					= 0x8F97    # 3.1
+#	R16_SNORM					= 0x8F98    # 3.1
+#	RG16_SNORM					= 0x8F99    # 3.1
+#	RGB16_SNORM					= 0x8F9A    # 3.1
+#	RGBA16_SNORM					= 0x8F9B    # 3.1
+#	SIGNED_NORMALIZED				= 0x8F9C    # 3.1
+#	PRIMITIVE_RESTART				= 0x8F9D    # Different from NV_primitive_restart value
+#	PRIMITIVE_RESTART_INDEX				= 0x8F9E    # Different from NV_primitive_restart value
+
+###############################################################################
+
+# Qualcomm: 0x8FA0-0x8FBF
+# Assigned for Maurice Ribble (Khronos bug 4512)
+
+###############################################################################
+
+# Vivante: 0x8FC0-0x8FDF
+# Assigned for Frido Garritsen	(Khronos bug 4526)
+
+###############################################################################
+
+# Any_vendor_future_use: 0x8FE0-0x8FFF
+
+###############################################################################
+
+# AMD: 0x9000-0x900F
+# Assigned for Bill Licea-Kane
+
+# AMD_vertex_shader_tesselator enum:
+#	SAMPLER_BUFFER_AMD				= 0x9001
+#	INT_SAMPLER_BUFFER_AMD				= 0x9002
+#	UNSIGNED_INT_SAMPLER_BUFFER_AMD			= 0x9003
+#	TESSELLATION_MODE_AMD				= 0x9004
+#	TESSELLATION_FACTOR_AMD				= 0x9005
+#	DISCRETE_AMD					= 0x9006
+#	CONTINUOUS_AMD					= 0x9007
+
+# AMD_future_use: 0x9008-0x900F
+
 ###############################################################################
 ### Please remember that new enumerant allocations must be obtained by request
 ### to the Khronos API registrar (see comments at the top of this file)
 ### File requests in the Khronos Bugzilla, OpenGL project, Registry component.
 ###############################################################################
 
-# Any_vendor_future_use: 0x8F90-0xFFFF
+# Any_vendor_future_use: 0x9010-0xFFFF
 #
 #   This range must be the last range in the file.  To generate a new
 #   range, allocate multiples of 16 from the beginning of the
 #   Any_vendor_future_use range and update enum.spec
 
+# (NOTE: first fill the gap from 0x8FE0-0x8FFF before proceeding here)
+
 ###############################################################################
 
 # ARB:	  100000-100999 (GLU enumerants only)

Source/Bind/Specifications/GL2/enumext.spec

@@ -19,7 +19,7 @@ passthru:
 passthru: /* Header file version number, required by OpenGL ABI for Linux */
 passthru: /* glext.h last updated 2008/11/14 */
 passthru: /* Current version at http://www.opengl.org/registry/ */
-passthru: #define GL_GLEXT_VERSION 44
+passthru: #define GL_GLEXT_VERSION 48
 
 ###############################################################################
 #
@@ -76,12 +76,12 @@ ARB_imaging enum:
 	CONSTANT_ALPHA					= 0x8003
 	ONE_MINUS_CONSTANT_ALPHA			= 0x8004
 	BLEND_COLOR					= 0x8005 # 4 F
-#	FUNC_ADD					= 0x8006 # Equivalent to EXT_blend_minmax
+	FUNC_ADD					= 0x8006 # Equivalent to EXT_blend_minmax
-#	MIN						= 0x8007
+	MIN						= 0x8007
-#	MAX						= 0x8008
+	MAX						= 0x8008
 	BLEND_EQUATION					= 0x8009 # 1 I
-#	FUNC_SUBTRACT					= 0x800A # Equivalent to EXT_blend_subtract
+	FUNC_SUBTRACT					= 0x800A # Equivalent to EXT_blend_subtract
-#	FUNC_REVERSE_SUBTRACT				= 0x800B
+	FUNC_REVERSE_SUBTRACT				= 0x800B
 	CONVOLUTION_1D					= 0x8010 # 1 I # Equivalent to EXT_convolution
 	CONVOLUTION_2D					= 0x8011 # 1 I
 	SEPARABLE_2D					= 0x8012 # 1 I
@@ -729,6 +729,16 @@ passthru: /* Reuse tokens from ARB_vertex_array_object */
 	use ARB_vertex_array_object	    VERTEX_ARRAY_BINDING
 
 
+###############################################################################
+#
+# OpenGL 3.1 enums
+#
+###############################################################################
+
+# TBD
+# VERSION_3_1 enum:
+
+
 ###############################################################################
 #
 # ARB extensions, in ARB extension order
@@ -3942,6 +3952,7 @@ ATI_fragment_shader enum:
 	QUARTER_BIT_ATI					= 0x00000010
 	EIGHTH_BIT_ATI					= 0x00000020
 	SATURATE_BIT_ATI				= 0x00000040
+	2X_BIT_ATI					= 0x00000001
 	COMP_BIT_ATI					= 0x00000002
 	NEGATE_BIT_ATI					= 0x00000004
 	BIAS_BIT_ATI					= 0x00000008
@@ -5186,32 +5197,80 @@ NV_transform_feedback2 enum:
 	TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV		= 0x8E24
 	TRANSFORM_FEEDBACK_BINDING_NV			= 0x8E25
 
+###############################################################################
 
-
+# Extension #359
-
+ATI_meminfo enum:
-
+	VBO_FREE_MEMORY_ATI				= 0x87FB
-
+	TEXTURE_FREE_MEMORY_ATI				= 0x87FC
-
+	RENDERBUFFER_FREE_MEMORY_ATI			= 0x87FD
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 ###############################################################################
+
+# Extension #360
+AMD_performance_monitor enum:
+	COUNTER_TYPE_AMD				= 0x8BC0
+	COUNTER_RANGE_AMD				= 0x8BC1
+	UNSIGNED_INT64_AMD				= 0x8BC2
+	PERCENTAGE_AMD					= 0x8BC3
+	PERFMON_RESULT_AVAILABLE_AMD			= 0x8BC4
+	PERFMON_RESULT_SIZE_AMD				= 0x8BC5
+	PERFMON_RESULT_AMD				= 0x8BC6
+
+###############################################################################
+
+# Extension #361 - WGL_AMD_gpu_association
+
+###############################################################################
+
+# No new tokens
+# Extension #362
+AMD_texture_texture4 enum:
+
+###############################################################################
+
+# Extension #363
+AMD_vertex_shader_tesselator enum:
+	SAMPLER_BUFFER_AMD				= 0x9001
+	INT_SAMPLER_BUFFER_AMD				= 0x9002
+	UNSIGNED_INT_SAMPLER_BUFFER_AMD			= 0x9003
+	TESSELLATION_MODE_AMD				= 0x9004
+	TESSELLATION_FACTOR_AMD				= 0x9005
+	DISCRETE_AMD					= 0x9006
+	CONTINUOUS_AMD					= 0x9007
+
+###############################################################################
+
+# Extension #364
+EXT_provoking_vertex enum:
+	QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT	= 0x8E4C
+	FIRST_VERTEX_CONVENTION_EXT			= 0x8E4D
+	LAST_VERTEX_CONVENTION_EXT			= 0x8E4E
+	PROVOKING_VERTEX_EXT				= 0x8E4F
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#------------------------------------------------------------------------------
 #
 # OpenTK edits for type safety
 #
-###############################################################################
+#------------------------------------------------------------------------------
 
 # Version 1.2
 

Source/Bind/Specifications/GL2/gl.spec

@@ -17,13 +17,13 @@ param:		retval retained
 dlflags:	notlistable handcode
 glxflags:	client-intercept client-handcode server-handcode EXT SGI ignore ARB
 vectorequiv:	*
-category:	display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform 1_1 VERSION_1_2 VERSION_1_3 VERSION_1_4 VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_pn_triangles ATI_vertex_array_object ATI_vertex_streams EXT_blend_color EXT_blend_minmax EXT_convolution EXT_copy_texture EXT_histogram EXT_polygon_offset EXT_subtexture EXT_texture3D EXT_texture_object EXT_vertex_array EXT_vertex_shader SGIS_detail_texture SGIS_multisample SGIS_pixel_texture ARB_point_parameters EXT_point_parameters SGIS_point_parameters SGIS_sharpen_texture SGIS_texture4D SGIS_texture_filter4 SGIX_async SGIX_flush_raster SGIX_fragment_lighting SGIX_framezoom SGIX_igloo_interface SGIX_instruments SGIX_list_priority SGIX_pixel_texture SGIX_polynomial_ffd SGIX_reference_plane SGIX_sprite SGIX_tag_sample_buffer SGI_color_table ARB_multitexture ARB_multisample ARB_texture_compression ARB_transpose_matrix ARB_vertex_blend ARB_matrix_palette EXT_compiled_vertex_array EXT_cull_vertex EXT_index_func EXT_index_material EXT_draw_range_elements EXT_vertex_weighting INGR_blend_func_separate NV_evaluators NV_fence NV_occlusion_query NV_point_sprite NV_register_combiners NV_register_combiners2 NV_vertex_array_range NV_vertex_program NV_vertex_program1_1_dcc MESA_resize_buffers MESA_window_pos PGI_misc_hints EXT_fog_coord EXT_blend_func_separate EXT_color_subtable EXT_coordinate_frame EXT_light_texture EXT_multi_draw_arrays EXT_paletted_texture EXT_pixel_transform EXT_secondary_color EXT_texture_perturb_normal HP_image_transform IBM_multimode_draw_arrays IBM_vertex_array_lists INTEL_parallel_arrays SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list SUN_vertex 3DFX_tbuffer EXT_multisample SGIS_fog_function SGIS_texture_color_mask ARB_window_pos EXT_stencil_two_side EXT_depth_bounds_test EXT_blend_equation_separate ARB_vertex_program ARB_fragment_program ARB_vertex_buffer_object ARB_occlusion_query ARB_shader_objects ARB_vertex_shader ARB_fragment_shader S3_s3tc ATI_draw_buffers ATI_texture_env_combine3 ATI_texture_float NV_float_buffer NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart NV_texture_expand_normal NV_texture_expand_normal NV_vertex_program2 APPLE_element_array APPLE_fence APPLE_vertex_array_object APPLE_vertex_array_range ATI_draw_buffers NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart ATI_map_object_buffer ATI_separate_stencil ATI_vertex_attrib_array_object ARB_draw_buffers ARB_texture_rectangle ARB_color_buffer_float EXT_framebuffer_object GREMEDY_string_marker EXT_stencil_clear_tag EXT_framebuffer_blit EXT_framebuffer_multisample MESAX_texture_stack EXT_timer_query EXT_gpu_program_parameters APPLE_flush_buffer_range NV_gpu_program4 NV_geometry_program4 EXT_geometry_shader4 NV_vertex_program4 EXT_gpu_shader4 EXT_draw_instanced EXT_texture_buffer_object NV_depth_buffer_float NV_framebuffer_multisample_coverage NV_parameter_buffer_object EXT_draw_buffers2 NV_transform_feedback EXT_bindable_uniform EXT_texture_integer GREMEDY_frame_terminator NV_conditional_render NV_present_video EXT_transform_feedback ARB_depth_buffer_float ARB_draw_instanced ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_half_float_vertex ARB_instanced_arrays ARB_map_buffer_range ARB_texture_buffer_object ARB_texture_compression_rgtc ARB_texture_rg ARB_vertex_array_object EXT_direct_state_access EXT_vertex_array_bgra EXT_texture_swizzle NV_explicit_multisample NV_transform_feedback2
+category:	display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform 1_1 VERSION_1_2 VERSION_1_3 VERSION_1_4 VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_pn_triangles ATI_vertex_array_object ATI_vertex_streams EXT_blend_color EXT_blend_minmax EXT_convolution EXT_copy_texture EXT_histogram EXT_polygon_offset EXT_subtexture EXT_texture3D EXT_texture_object EXT_vertex_array EXT_vertex_shader SGIS_detail_texture SGIS_multisample SGIS_pixel_texture ARB_point_parameters EXT_point_parameters SGIS_point_parameters SGIS_sharpen_texture SGIS_texture4D SGIS_texture_filter4 SGIX_async SGIX_flush_raster SGIX_fragment_lighting SGIX_framezoom SGIX_igloo_interface SGIX_instruments SGIX_list_priority SGIX_pixel_texture SGIX_polynomial_ffd SGIX_reference_plane SGIX_sprite SGIX_tag_sample_buffer SGI_color_table ARB_multitexture ARB_multisample ARB_texture_compression ARB_transpose_matrix ARB_vertex_blend ARB_matrix_palette EXT_compiled_vertex_array EXT_cull_vertex EXT_index_func EXT_index_material EXT_draw_range_elements EXT_vertex_weighting INGR_blend_func_separate NV_evaluators NV_fence NV_occlusion_query NV_point_sprite NV_register_combiners NV_register_combiners2 NV_vertex_array_range NV_vertex_program NV_vertex_program1_1_dcc MESA_resize_buffers MESA_window_pos PGI_misc_hints EXT_fog_coord EXT_blend_func_separate EXT_color_subtable EXT_coordinate_frame EXT_light_texture EXT_multi_draw_arrays EXT_paletted_texture EXT_pixel_transform EXT_secondary_color EXT_texture_perturb_normal HP_image_transform IBM_multimode_draw_arrays IBM_vertex_array_lists INTEL_parallel_arrays SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list SUN_vertex 3DFX_tbuffer EXT_multisample SGIS_fog_function SGIS_texture_color_mask ARB_window_pos EXT_stencil_two_side EXT_depth_bounds_test EXT_blend_equation_separate ARB_vertex_program ARB_fragment_program ARB_vertex_buffer_object ARB_occlusion_query ARB_shader_objects ARB_vertex_shader ARB_fragment_shader S3_s3tc ATI_draw_buffers ATI_texture_env_combine3 ATI_texture_float NV_float_buffer NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart NV_texture_expand_normal NV_texture_expand_normal NV_vertex_program2 APPLE_element_array APPLE_fence APPLE_vertex_array_object APPLE_vertex_array_range ATI_draw_buffers NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart ATI_map_object_buffer ATI_separate_stencil ATI_vertex_attrib_array_object ARB_draw_buffers ARB_texture_rectangle ARB_color_buffer_float EXT_framebuffer_object GREMEDY_string_marker EXT_stencil_clear_tag EXT_framebuffer_blit EXT_framebuffer_multisample MESAX_texture_stack EXT_timer_query EXT_gpu_program_parameters APPLE_flush_buffer_range NV_gpu_program4 NV_geometry_program4 EXT_geometry_shader4 NV_vertex_program4 EXT_gpu_shader4 EXT_draw_instanced EXT_texture_buffer_object NV_depth_buffer_float NV_framebuffer_multisample_coverage NV_parameter_buffer_object EXT_draw_buffers2 NV_transform_feedback EXT_bindable_uniform EXT_texture_integer GREMEDY_frame_terminator NV_conditional_render NV_present_video EXT_transform_feedback ARB_depth_buffer_float ARB_draw_instanced ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_half_float_vertex ARB_instanced_arrays ARB_map_buffer_range ARB_texture_buffer_object ARB_texture_compression_rgtc ARB_texture_rg ARB_vertex_array_object EXT_direct_state_access EXT_vertex_array_bgra EXT_texture_swizzle NV_explicit_multisample NV_transform_feedback2 ATI_meminfo AMD_performance_monitor AMD_vertex_shader_tesselator EXT_provoking_vertex
 
 
 # categories for extensions with no functions - need not be included now
 #   ARB_texture_env_add ARB_texture_cube_map ARB_texture_border_clamp ARB_shading_language_100 ARB_texture_non_power_of_two ARB_point_sprite ARB_half_float_pixel ARB_texture_float ARB_pixel_buffer_object EXT_abgr EXT_texture SGI_color_matrix SGI_texture_color_table EXT_cmyka EXT_packed_pixels SGIS_texture_lod EXT_rescale_normal EXT_misc_attribute SGIS_generate_mipmap SGIX_clipmap SGIX_shadow SGIS_texture_edge_clamp SGIS_texture_border_clamp EXT_blend_subtract EXT_blend_logic_op SGIX_async_histogram SGIX_async_pixel SGIX_interlace SGIX_pixel_tiles SGIX_texture_select SGIX_texture_multi_buffer SGIX_texture_scale_bias SGIX_depth_texture SGIX_fog_offset HP_convolution_border_modes SGIX_texture_add_env PGI_vertex_hints EXT_clip_volume_hint SGIX_ir_instrument1 SGIX_calligraphic_fragment SGIX_texture_lod_bias SGIX_shadow_ambient EXT_index_texture EXT_index_array_formats SGIX_ycrcb IBM_rasterpos_clip HP_texture_lighting WIN_phong_shading WIN_specular_fog SGIX_blend_alpha_minmax EXT_bgra HP_occlusion_test EXT_pixel_transform_color_table EXT_shared_texture_palette EXT_separate_specular_color EXT_texture_env REND_screen_coordinates EXT_texture_env_combine APPLE_specular_vector APPLE_transform_hint SGIX_fog_scale INGR_color_clamp INGR_interlace_read EXT_stencil_wrap EXT_422_pixels NV_texgen_reflection SUN_convolution_border_modes SUN_slice_accum EXT_texture_env_add EXT_texture_lod_bias EXT_texture_filter_anisotropic NV_light_max_exponent NV_fog_distance NV_texgen_emboss NV_blend_square NV_texture_env_combine4 NV_packed_depth_stencil NV_texture_compression_vtc NV_texture_rectangle NV_texture_shader NV_texture_shader2 NV_vertex_array_range2 IBM_cull_vertex SGIX_subsample SGIX_ycrcba SGIX_ycrcb_subsample SGIX_depth_pass_instrument 3DFX_texture_compression_FXT1 3DFX_multisample SGIX_vertex_preclip SGIX_convolution_accuracy SGIX_resample SGIX_scalebias_hint SGIX_texture_coordinate_clamp EXT_shadow_funcs MESA_pack_invert MESA_ycbcr_texture EXT_packed_float EXT_texture_array EXT_texture_compression_latc EXT_texture_compression_rgtc EXT_texture_shared_exponent NV_fragment_program4 EXT_framebuffer_sRGB NV_geometry_shader4 EXT_vertex_array_bgra
 
-version:	1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0
+version:	1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1
 glxsingle:	*
 glxropcode:	*
 glxvendorpriv:	*
@@ -7236,11 +7236,11 @@ BindBufferBase(target, index, buffer)
 	glfflags	ignore
 	glsflags	ignore
 
-TransformFeedbackVaryings(program, count, locations, bufferMode)
+TransformFeedbackVaryings(program, count, varyings, bufferMode)
 	return		void
 	param		program		UInt32 in value
 	param		count		SizeI in value
-	param		locations	Int32 in array [COMPSIZE(count)]
+	param		varyings	CharPointer in array [count]
 	param		bufferMode	GLenum in value
 	category	VERSION_3_0
 	version		3.0
@@ -7250,11 +7250,15 @@ TransformFeedbackVaryings(program, count, locations, bufferMode)
 	glfflags	ignore
 	glsflags	ignore
 
-GetTransformFeedbackVarying(program, index, location)
+GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name)
 	return		void
 	param		program		UInt32 in value
 	param		index		UInt32 in value
-	param		location	Int32 out array [1]
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		SizeI out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array [COMPSIZE(length)]
 	category	VERSION_3_0
 	dlflags		notlistable
 	version		3.0
@@ -10942,7 +10946,7 @@ GetFramebufferAttachmentParameteriv(target, attachment, pname, params)
 	glsopcode	?
 	offset		?
 
-Generate(target)
+GenerateMipmap(target)
 	return		void
 	param		target		GenerateMipmapTarget in value # GLenum in value
 	category	ARB_framebuffer_object
@@ -11113,7 +11117,7 @@ VertexAttribDivisor(index, divisor)
 ###############################################################################
 
 MapBufferRange(target, offset, length, access)
-	return		void
+	return		VoidPointer
 	param		target		BufferTargetARB in value
 	param		offset		BufferOffset in value
 	param		length		BufferSize in value
@@ -23379,8 +23383,6 @@ EndConditionalRenderNV()
 ###############################################################################
 
 # TBD
-newcategory: NV_present_video
-
 #    void PresentFrameKeyedNV(uint video_slot, uint64EXT minPresentTime,
 #			      uint beginPresentTimeId, uint
 #			      presentDurationId, enum type, enum target0,
@@ -23400,6 +23402,123 @@ newcategory: NV_present_video
 #    void GetVideoui64vNV(uint video_slot, enum pname, uint64EXT *params);
 #    void VideoParameterivNV(uint video_slot, enum pname, const int *params);
 
+PresentFrameKeyedNV(video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1)
+	return		void
+	param		video_slot	UInt32 in value
+	param		minPresentTime	UInt64EXT in value
+	param		beginPresentTimeId	UInt32 in value
+	param		presentDurationId	UInt32 in value
+	param		type		GLenum in value
+	param		target0		GLenum in value
+	param		fill0		UInt32 in value
+	param		key0		UInt32 in value
+	param		target1		GLenum in value
+	param		fill1		UInt32 in value
+	param		key1		UInt32 in value
+	category	NV_present_video
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	glsopcode	?
+	offset		?
+
+PresentFrameDualFillNV(video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3)
+	return		void
+	param		video_slot	UInt32 in value
+	param		minPresentTime	UInt64EXT in value
+	param		beginPresentTimeId	UInt32 in value
+	param		presentDurationId	UInt32 in value
+	param		type		GLenum in value
+	param		target0		GLenum in value
+	param		fill0		UInt32 in value
+	param		target1		GLenum in value
+	param		fill1		UInt32 in value
+	param		target2		GLenum in value
+	param		fill2		UInt32 in value
+	param		target3		GLenum in value
+	param		fill3		UInt32 in value
+	category	NV_present_video
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	glsopcode	?
+	offset		?
+
+GetVideoivNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+GetVideouivNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+GetVideoi64vNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int64EXT out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+GetVideoui64vNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+VideoParameterivNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	NV_present_video
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	glsopcode	?
+	offset		?
+
 ###############################################################################
 #
 # Extension #348 - GLX_NV_video_out
@@ -23486,11 +23605,11 @@ BindBufferBaseEXT(target, index, buffer)
 	alias		BindBufferBase
 	glsalias	BindBufferBase
 
-TransformFeedbackVaryingsEXT(program, count, locations, bufferMode)
+TransformFeedbackVaryingsEXT(program, count, varyings, bufferMode)
 	return		void
 	param		program		UInt32 in value
 	param		count		SizeI in value
-	param		locations	Int32 in array [COMPSIZE(count)]
+	param		varyings	CharPointer in array [count]
 	param		bufferMode	GLenum in value
 	category	EXT_transform_feedback
 	version		2.0
@@ -23501,12 +23620,15 @@ TransformFeedbackVaryingsEXT(program, count, locations, bufferMode)
 	alias		TransformFeedbackVaryings
 	glsalias	TransformFeedbackVaryings
 
-
+GetTransformFeedbackVaryingEXT(program, index, bufSize, length, size, type, name)
-GetTransformFeedbackVaryingEXT(program, index, location)
 	return		void
 	param		program		UInt32 in value
 	param		index		UInt32 in value
-	param		location	Int32 out array [1]
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		SizeI out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array [COMPSIZE(length)]
 	category	EXT_transform_feedback
 	dlflags		notlistable
 	version		2.0
@@ -26385,3 +26507,245 @@ DrawTransformFeedbackNV(mode, id)
 	glfflags	ignore
 	glsflags	ignore
 	glxflags	ignore
+
+###############################################################################
+#
+# Extension #359
+# ATI_meminfo commands
+#
+###############################################################################
+
+# (none)
+newcategory: ATI_meminfo
+
+###############################################################################
+#
+# Extension #360
+# AMD_performance_monitor commands
+#
+###############################################################################
+
+GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups)
+	return		void
+	param		numGroups	Int32 out array [1]
+	param		groupsSize	SizeI in value
+	param		groups		UInt32 out array [groupsSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+GetPerfMonitorCountersAMD(group, numCounters, maxActiveCounters, counterSize, counters)
+	return		void
+	param		group		UInt32 in value
+	param		numCounters	Int32 out array [1]
+	param		maxActiveCounters Int32 out array [1]
+	param		counterSize	SizeI in value
+	param		counters	UInt32 out array [counterSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+GetPerfMonitorGroupStringAMD(group, bufSize, length, groupString)
+	return		void
+	param		group		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		groupString	Char out array [bufSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+GetPerfMonitorCounterStringAMD(group, counter, bufSize, length, counterString)
+	return		void
+	param		group		UInt32 in value
+	param		counter		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		counterString	Char out array [bufSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+GetPerfMonitorCounterInfoAMD(group, counter, pname, data)
+	return		void
+	param		group		UInt32 in value
+	param		counter		UInt32 in value
+	param		pname		GLenum in value
+	param		data		void out array [COMPSIZE(pname)]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+GenPerfMonitorsAMD(n, monitors)
+	return		void
+	param		n		SizeI in value
+	param		monitors	UInt32 out array [n]
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	glsopcode	?
+	offset		?
+
+# 'monitors' is actually in, not out, but extension spec doesn't use const
+DeletePerfMonitorsAMD(n, monitors)
+	return		void
+	param		n		SizeI in value
+	param		monitors	UInt32 out array [n]
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	glsopcode	?
+	offset		?
+
+# 'counterList' is actually in, not out, but extension spec doesn't use const
+SelectPerfMonitorCountersAMD(monitor, enable, group, numCounters, counterList)
+	return		void
+	param		monitor		UInt32 in value
+	param		enable		Boolean in value
+	param		group		UInt32 in value
+	param		numCounters	Int32 in value
+	param		counterList	UInt32 out array [numCounters]
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	glsopcode	?
+	offset		?
+
+BeginPerfMonitorAMD(monitor)
+	return		void
+	param		monitor		UInt32 in value
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	glsopcode	?
+	offset		?
+
+EndPerfMonitorAMD(monitor)
+	return		void
+	param		monitor		UInt32 in value
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	glsopcode	?
+	offset		?
+
+GetPerfMonitorCounterDataAMD(monitor, pname, dataSize, data, bytesWritten)
+	return		void
+	param		monitor		UInt32 in value
+	param		pname		GLenum in value
+	param		dataSize	SizeI in value
+	param		data		UInt32 out array [dataSize]
+	param		bytesWritten	Int32 out array [1]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #361 - WGL_AMD_gpu_association
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #362
+# AMD_texture_texture4 commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_texture_texture4
+
+
+###############################################################################
+#
+# Extension #363
+# AMD_vertex_shader_tesselator commands
+#
+###############################################################################
+
+TessellationFactorAMD(factor)
+	return		void
+	param		factor		Float32 in value
+	category	AMD_vertex_shader_tesselator
+	version		2.0
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+TessellationModeAMD(mode)
+	return		void
+	param		mode		GLenum in value
+	category	AMD_vertex_shader_tesselator
+	version		2.0
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #364
+# EXT_provoking_vertex commands
+#
+###############################################################################
+
+ProvokingVertexEXT(mode)
+	return		void
+	param		mode		GLenum in value
+	category	EXT_provoking_vertex
+	version		2.1
+	glxsingle	?
+	glxflags	ignore
+	glsflags	get
+	glsopcode	?
+	offset		?