[Xquartz-changes] [405] AppleSGLX/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Jan 12 21:05:02 PST 2010


Revision: 405
          http://trac.macosforge.org/projects/xquartz/changeset/405
Author:   jeremyhu at freedesktop.org
Date:     2010-01-12 21:04:59 -0800 (Tue, 12 Jan 2010)
Log Message:
-----------
Update OpenGL specs

Modified Paths:
--------------
    AppleSGLX/trunk/gen_funcs.tcl
    AppleSGLX/trunk/specs/enum.spec
    AppleSGLX/trunk/specs/enumext.spec
    AppleSGLX/trunk/specs/gl.spec
    AppleSGLX/trunk/specs/glxenum.spec
    AppleSGLX/trunk/specs/glxenumext.spec
    AppleSGLX/trunk/specs/glxext.spec

Added Paths:
-----------
    AppleSGLX/trunk/specs/README.txt

Modified: AppleSGLX/trunk/gen_funcs.tcl
===================================================================
--- AppleSGLX/trunk/gen_funcs.tcl	2010-01-10 03:11:22 UTC (rev 404)
+++ AppleSGLX/trunk/gen_funcs.tcl	2010-01-13 05:04:59 UTC (rev 405)
@@ -80,6 +80,8 @@
     CheckedInt32 GLint
     Float32 GLfloat
     Int32 GLint
+    Int64 GLint64EXT
+    UInt64 GLuint64EXT
     Float64 GLdouble
     ListMode GLuint
     SizeI GLsizei
@@ -278,6 +280,7 @@
     ProgramCharacterNV GLubyte
     SamplePatternEXT GLenum
     SamplePatternSGIS GLenum
+    TypeEnum GLenum
 }
 
 proc psplit s {
@@ -323,7 +326,7 @@
     foreach line [split $data \n] {
 	if {"attr" eq $state} {
 	    if {[string match "\t*" $line]} {
-		set plist [psplit $line]
+		set plist [psplit [lindex [split $line "#"] 0]]
 		#puts PLIST:$plist
 		set master $ar($name)
 		set param [dict get $master parameters]
@@ -380,10 +383,7 @@
 
 #This returns true if the category is valid for an extension.
 proc is-valid-category? c {
-    set clist [list 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]
+    set clist [list display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform VERSION_1_0 VERSION_1_0_DEPRECATED VERSION_1_1 VERSION_1_1_DEPRECATED VERSION_1_2 VERSION_1_2_DEPRECATED VERSION_1_3 VERSION_1_3_DEPRECATED VERSION_1_4 VERSION_1_4_DEPRECATED VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_0_DEPRECATED VERSION_3_1 VERSION_3_2]
 
     set result [expr {$c in $clist}]
 

Added: AppleSGLX/trunk/specs/README.txt
===================================================================
--- AppleSGLX/trunk/specs/README.txt	                        (rev 0)
+++ AppleSGLX/trunk/specs/README.txt	2010-01-13 05:04:59 UTC (rev 405)
@@ -0,0 +1,2 @@
+spec files from http://www.opengl.org/registry
+

Modified: AppleSGLX/trunk/specs/enum.spec
===================================================================
--- AppleSGLX/trunk/specs/enum.spec	2010-01-10 03:11:22 UTC (rev 404)
+++ AppleSGLX/trunk/specs/enum.spec	2010-01-13 05:04:59 UTC (rev 405)
@@ -98,6 +98,8 @@
 	VERSION_2_0					= 1
 	VERSION_2_1					= 1
 	VERSION_3_0					= 1
+	VERSION_3_1					= 1
+	VERSION_3_2					= 1
 	ARB_imaging					= 1
 	EXT_abgr					= 1
 	EXT_blend_color					= 1
@@ -201,17 +203,18 @@
 #	use EXT_multisample MULTISAMPLE_BIT_EXT
 #	use 3DFX_multisample MULTISAMPLE_BIT_3DFX
 
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
-# ARB_multisample enum:
-#	MULTISAMPLE_BIT					= 0x20000000
-#	MULTISAMPLE_BIT_ARB				= 0x20000000
+VERSION_1_3 enum: (Promoted for OpenGL 1.3)
+	MULTISAMPLE_BIT					= 0x20000000
 
-# EXT_multisample enum:
-#	MULTISAMPLE_BIT_EXT				= 0x20000000
+ARB_multisample enum:
+	MULTISAMPLE_BIT_ARB				= 0x20000000
 
-# 3DFX_multisample enum:
-#	MULTISAMPLE_BIT_3DFX				= 0x20000000
+EXT_multisample enum:
+	MULTISAMPLE_BIT_EXT				= 0x20000000
 
+3DFX_multisample enum:
+	MULTISAMPLE_BIT_3DFX				= 0x20000000
+
 ###############################################################################
 
 ClearBufferMask enum:
@@ -230,19 +233,26 @@
 ###############################################################################
 
 # There's no obvious better place to put non-attribute-group mask bits
-# VERSION_3_0 enum:
-# ARB_map_buffer_range enum:
-#	MAP_READ_BIT					= 0x0001	# 3.0 / ARB_mbr
-#	MAP_WRITE_BIT					= 0x0002	# 3.0 / ARB_mbr
-#	MAP_INVALIDATE_RANGE_BIT			= 0x0004	# 3.0 / ARB_mbr
-#	MAP_INVALIDATE_BUFFER_BIT			= 0x0008	# 3.0 / ARB_mbr
-#	MAP_FLUSH_EXPLICIT_BIT				= 0x0010	# 3.0 / ARB_mbr
-#	MAP_UNSYNCHRONIZED_BIT				= 0x0020	# 3.0 / ARB_mbr
+VERSION_3_0 enum:
+	use ARB_map_buffer_range	    MAP_READ_BIT
+	use ARB_map_buffer_range	    MAP_WRITE_BIT
+	use ARB_map_buffer_range	    MAP_INVALIDATE_RANGE_BIT
+	use ARB_map_buffer_range	    MAP_INVALIDATE_BUFFER_BIT
+	use ARB_map_buffer_range	    MAP_FLUSH_EXPLICIT_BIT
+	use ARB_map_buffer_range	    MAP_UNSYNCHRONIZED_BIT
 
+ARB_map_buffer_range enum:
+	MAP_READ_BIT					= 0x0001    # VERSION_3_0 / ARB_mbr
+	MAP_WRITE_BIT					= 0x0002    # VERSION_3_0 / ARB_mbr
+	MAP_INVALIDATE_RANGE_BIT			= 0x0004    # VERSION_3_0 / ARB_mbr
+	MAP_INVALIDATE_BUFFER_BIT			= 0x0008    # VERSION_3_0 / ARB_mbr
+	MAP_FLUSH_EXPLICIT_BIT				= 0x0010    # VERSION_3_0 / ARB_mbr
+	MAP_UNSYNCHRONIZED_BIT				= 0x0020    # VERSION_3_0 / ARB_mbr
+
 ###############################################################################
 
-# VERSION_3_0 enum:
-#	CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT		= 0x0001	# 3.0
+VERSION_3_0 enum:
+	CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT		= 0x0001    # VERSION_3_0
 
 ###############################################################################
 
@@ -263,17 +273,27 @@
 	QUADS						= 0x0007
 	QUAD_STRIP					= 0x0008
 	POLYGON						= 0x0009
-# ARB_geometry_shader4 enum: (additional; see below)
-# NV_geometry_program4 enum: (additional; see below)
-#	LINES_ADJACENCY_ARB				= 0x000A
-#	LINES_ADJACENCY_EXT				= 0x000A
-#	LINE_STRIP_ADJACENCY_ARB			= 0x000B
-#	LINE_STRIP_ADJACENCY_EXT			= 0x000B
-#	TRIANGLES_ADJACENCY_ARB				= 0x000C
-#	TRIANGLES_ADJACENCY_EXT				= 0x000C
-#	TRIANGLE_STRIP_ADJACENCY_ARB			= 0x000D
-#	TRIANGLE_STRIP_ADJACENCY_EXT			= 0x000D
 
+VERSION_3_2 enum:
+	LINES_ADJACENCY					= 0x000A
+	LINE_STRIP_ADJACENCY				= 0x000B
+	TRIANGLES_ADJACENCY				= 0x000C
+	TRIANGLE_STRIP_ADJACENCY			= 0x000D
+
+ARB_geometry_shader4 enum: (additional; see below)
+	LINES_ADJACENCY_ARB				= 0x000A
+	LINE_STRIP_ADJACENCY_ARB			= 0x000B
+	TRIANGLES_ADJACENCY_ARB				= 0x000C
+	TRIANGLE_STRIP_ADJACENCY_ARB			= 0x000D
+
+NV_geometry_program4 enum: (additional; see below)
+	LINES_ADJACENCY_EXT				= 0x000A
+	LINE_STRIP_ADJACENCY_EXT			= 0x000B
+	TRIANGLES_ADJACENCY_EXT				= 0x000C
+	TRIANGLE_STRIP_ADJACENCY_EXT			= 0x000D
+
+# BeginMode_future_use: 0x000E
+
 ###############################################################################
 
 AccumOp enum:
@@ -441,6 +461,10 @@
 	AUX2						= 0x040B
 	AUX3						= 0x040C
 
+# Aliases DrawBufferMode enum above
+OES_framebuffer_object enum: (OpenGL ES only; additional; see below)
+#	NONE_OES					= 0
+
 ###############################################################################
 
 EnableCap enum:
@@ -566,12 +590,19 @@
 
 # Additional error codes
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# EXT_framebuffer_object enum:
-#	INVALID_FRAMEBUFFER_OPERATION			= 0x0506	# 3.0 / ARB_fbo
-#	INVALID_FRAMEBUFFER_OPERATION_EXT		= 0x0506
+VERSION_3_0 enum:
+#	use ARB_framebuffer_object	    INVALID_FRAMEBUFFER_OPERATION
 
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	INVALID_FRAMEBUFFER_OPERATION			= 0x0506    # VERSION_3_0 / ARB_fbo
+
+EXT_framebuffer_object enum:
+	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:
@@ -901,8 +932,10 @@
 
 	MAX_EVAL_ORDER					= 0x0D30 # 1 I
 	MAX_LIGHTS					= 0x0D31 # 1 I
+
 # VERSION_3_0 enum: (aliases)
-#	MAX_CLIP_DISTANCES				= GL_MAX_CLIP_PLANES	# 3.0
+	MAX_CLIP_DISTANCES				= 0x0D32    # VERSION_3_0   # alias GL_MAX_CLIP_PLANES
+
 	MAX_CLIP_PLANES					= 0x0D32 # 1 I
 	MAX_TEXTURE_SIZE				= 0x0D33 # 1 I
 	MAX_PIXEL_MAP_TABLE				= 0x0D34 # 1 I
@@ -1017,10 +1050,10 @@
 	use LightName LIGHT6
 	use LightName LIGHT7
 
-#	 use ARB_transpose_matrix TRANSPOSE_MODELVIEW_MATRIX_ARB
-#	 use ARB_transpose_matrix TRANSPOSE_PROJECTION_MATRIX_ARB
-#	 use ARB_transpose_matrix TRANSPOSE_TEXTURE_MATRIX_ARB
-#	 use ARB_transpose_matrix TRANSPOSE_COLOR_MATRIX_ARB
+#	use ARB_transpose_matrix	    TRANSPOSE_MODELVIEW_MATRIX_ARB
+#	use ARB_transpose_matrix	    TRANSPOSE_PROJECTION_MATRIX_ARB
+#	use ARB_transpose_matrix	    TRANSPOSE_TEXTURE_MATRIX_ARB
+#	use ARB_transpose_matrix	    TRANSPOSE_COLOR_MATRIX_ARB
 
 	use VERSION_1_2 LIGHT_MODEL_COLOR_CONTROL
 
@@ -1351,17 +1384,40 @@
 	DOUBLE						= 0x140A
 	DOUBLE_EXT					= 0x140A
 
-# VERSION_3_0 enum:
-# ARB_half_float_vertex enum: (note: no ARB suffixes)
-# ARB_half_float_pixel enum:
-# NV_half_float enum:
-#	HALF_FLOAT					= 0x140B    # 3.0 / ARB_half_float_vertex
-#	HALF_FLOAT_ARB					= 0x140B
-#	HALF_FLOAT_NV					= 0x140B
+# OES_byte_coordinates: (OpenGL ES only)
+#	use DataType BYTE
 
-# OES_fixed_point enum:
-#	FIXED_OES					= 0x140C
+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:
+#	use ARB_half_float_vertex	    HALF_FLOAT
+
+ARB_half_float_vertex enum: (note: no ARB suffixes)
+	HALF_FLOAT					= 0x140B    # VERSION_3_0 / ARB_half_float_vertex
+
+ARB_half_float_pixel enum:
+	HALF_FLOAT_ARB					= 0x140B
+
+NV_half_float enum:
+	HALF_FLOAT_NV					= 0x140B
+
+APPLE_float_pixels enum: (additional; see below)
+	HALF_APPLE					= 0x140B
+
+OES_fixed_point enum: (OpenGL ES only)
+	FIXED_OES					= 0x140C
+
+# Leave a gap to preserve even/odd int/uint token values
+# ARB_future_use: 0x140D
+
+# Future NV extension (Khronos bug 5172)
+	INT64_NV					= 0x140E
+	UNSIGNED_INT64_NV				= 0x140F
+
 ###############################################################################
 
 ListNameType enum:
@@ -1440,9 +1496,9 @@
 	SHININESS					= 0x1601
 	AMBIENT_AND_DIFFUSE				= 0x1602
 	COLOR_INDEXES					= 0x1603
-	use LightProperty AMBIENT
-	use LightProperty DIFFUSE
-	use LightProperty SPECULAR
+	use LightParameter AMBIENT
+	use LightParameter DIFFUSE
+	use LightParameter SPECULAR
 
 ###############################################################################
 
@@ -1485,6 +1541,11 @@
 	DEPTH						= 0x1801
 	STENCIL						= 0x1802
 
+EXT_discard_framebuffer enum: (OpenGL ES only)
+	COLOR_EXT					= 0x1800
+	DEPTH_EXT					= 0x1801
+	STENCIL_EXT					= 0x1802
+
 ###############################################################################
 
 PixelFormat enum:
@@ -1510,6 +1571,11 @@
 	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:
@@ -1796,6 +1862,10 @@
 	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:
@@ -1962,6 +2032,11 @@
 	use SGIX_icc_texture INTENSITY16_ICC_SGIX
 	use SGIX_icc_texture LUMINANCE16_ALPHA8_ICC_SGIX
 
+# Aliases PixelInternalFormat enums above
+OES_rgb8_rgba8 enum: (OpenGL ES only)
+	RGB8						= 0x8051
+	RGBA8						= 0x8058
+
 ###############################################################################
 
 InterleavedArrayFormat enum:
@@ -1999,13 +2074,15 @@
 	CLIP_PLANE4					= 0x3004 # 1 I
 	CLIP_PLANE5					= 0x3005 # 1 I
 
-# VERSION_3_0 enum: (aliases)
-#	CLIP_DISTANCE0					= GL_CLIP_PLANE0    # 3.0
-#	CLIP_DISTANCE1					= GL_CLIP_PLANE1    # 3.0
-#	CLIP_DISTANCE2					= GL_CLIP_PLANE2    # 3.0
-#	CLIP_DISTANCE3					= GL_CLIP_PLANE3    # 3.0
-#	CLIP_DISTANCE4					= GL_CLIP_PLANE4    # 3.0
-#	CLIP_DISTANCE5					= GL_CLIP_PLANE5    # 3.0
+VERSION_3_0 enum: (aliases)
+	CLIP_DISTANCE0					= 0x3000    # VERSION_3_0   # alias GL_CLIP_PLANE0
+	CLIP_DISTANCE1					= 0x3001    # VERSION_3_0   # alias GL_CLIP_PLANE1
+	CLIP_DISTANCE2					= 0x3002    # VERSION_3_0   # alias GL_CLIP_PLANE2
+	CLIP_DISTANCE3					= 0x3003    # VERSION_3_0   # alias GL_CLIP_PLANE3
+	CLIP_DISTANCE4					= 0x3004    # VERSION_3_0   # alias GL_CLIP_PLANE4
+	CLIP_DISTANCE5					= 0x3005    # VERSION_3_0   # alias GL_CLIP_PLANE5
+	CLIP_DISTANCE6					= 0x3006    # VERSION_3_0   # alias GL_CLIP_PLANE5
+	CLIP_DISTANCE7					= 0x3007    # VERSION_3_0   # alias GL_CLIP_PLANE5
 
 ###############################################################################
 
@@ -2035,22 +2112,23 @@
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	CONSTANT_COLOR					= 0x8001
+	ONE_MINUS_CONSTANT_COLOR			= 0x8002
+	CONSTANT_ALPHA					= 0x8003
+	ONE_MINUS_CONSTANT_ALPHA			= 0x8004
+	BLEND_COLOR					= 0x8005 # 4 F
+
 EXT_blend_color enum:
-	CONSTANT_COLOR					= 0x8001
 	CONSTANT_COLOR_EXT				= 0x8001
-	ONE_MINUS_CONSTANT_COLOR			= 0x8002
 	ONE_MINUS_CONSTANT_COLOR_EXT			= 0x8002
-	CONSTANT_ALPHA					= 0x8003
 	CONSTANT_ALPHA_EXT				= 0x8003
-	ONE_MINUS_CONSTANT_ALPHA			= 0x8004
 	ONE_MINUS_CONSTANT_ALPHA_EXT			= 0x8004
-	BLEND_COLOR					= 0x8005 # 4 F
 	BLEND_COLOR_EXT					= 0x8005 # 4 F
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
 EXT_blend_minmax enum:
 	FUNC_ADD					= 0x8006
 	FUNC_ADD_EXT					= 0x8006
@@ -2061,20 +2139,32 @@
 	BLEND_EQUATION					= 0x8009 # 1 I
 	BLEND_EQUATION_EXT				= 0x8009 # 1 I
 
-# VERSION_2_0 enum: (Promoted for OpenGL 2.0)
-# EXT_blend_equation_separate enum: (separate; see below)
-#	BLEND_EQUATION_RGB				= GL_BLEND_EQUATION # VERSION_2_0
-#	BLEND_EQUATION_RGB_EXT				= GL_BLEND_EQUATION
+VERSION_2_0 enum: (Promoted for OpenGL 2.0)
+	BLEND_EQUATION_RGB				= 0x8009    # VERSION_2_0   # alias GL_BLEND_EQUATION
 
+EXT_blend_equation_separate enum: (separate; see below)
+	BLEND_EQUATION_RGB_EXT				= 0x8009    # alias 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)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
 EXT_blend_subtract enum:
 	FUNC_SUBTRACT					= 0x800A
 	FUNC_SUBTRACT_EXT				= 0x800A
 	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:
@@ -2085,111 +2175,117 @@
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	CONVOLUTION_1D					= 0x8010 # 1 I
+	CONVOLUTION_2D					= 0x8011 # 1 I
+	SEPARABLE_2D					= 0x8012 # 1 I
+	CONVOLUTION_BORDER_MODE				= 0x8013
+	CONVOLUTION_FILTER_SCALE			= 0x8014
+	CONVOLUTION_FILTER_BIAS				= 0x8015
+	REDUCE						= 0x8016
+	CONVOLUTION_FORMAT				= 0x8017
+	CONVOLUTION_WIDTH				= 0x8018
+	CONVOLUTION_HEIGHT				= 0x8019
+	MAX_CONVOLUTION_WIDTH				= 0x801A
+	MAX_CONVOLUTION_HEIGHT				= 0x801B
+	POST_CONVOLUTION_RED_SCALE			= 0x801C # 1 F
+	POST_CONVOLUTION_GREEN_SCALE			= 0x801D # 1 F
+	POST_CONVOLUTION_BLUE_SCALE			= 0x801E # 1 F
+	POST_CONVOLUTION_ALPHA_SCALE			= 0x801F # 1 F
+	POST_CONVOLUTION_RED_BIAS			= 0x8020 # 1 F
+	POST_CONVOLUTION_GREEN_BIAS			= 0x8021 # 1 F
+	POST_CONVOLUTION_BLUE_BIAS			= 0x8022 # 1 F
+	POST_CONVOLUTION_ALPHA_BIAS			= 0x8023 # 1 F
+
 EXT_convolution enum:
-	CONVOLUTION_1D					= 0x8010 # 1 I
 	CONVOLUTION_1D_EXT				= 0x8010 # 1 I
-	CONVOLUTION_2D					= 0x8011 # 1 I
 	CONVOLUTION_2D_EXT				= 0x8011 # 1 I
-	SEPARABLE_2D					= 0x8012 # 1 I
 	SEPARABLE_2D_EXT				= 0x8012 # 1 I
-	CONVOLUTION_BORDER_MODE				= 0x8013
 	CONVOLUTION_BORDER_MODE_EXT			= 0x8013
-	CONVOLUTION_FILTER_SCALE			= 0x8014
 	CONVOLUTION_FILTER_SCALE_EXT			= 0x8014
-	CONVOLUTION_FILTER_BIAS				= 0x8015
 	CONVOLUTION_FILTER_BIAS_EXT			= 0x8015
-	REDUCE						= 0x8016
 	REDUCE_EXT					= 0x8016
-	CONVOLUTION_FORMAT				= 0x8017
 	CONVOLUTION_FORMAT_EXT				= 0x8017
-	CONVOLUTION_WIDTH				= 0x8018
 	CONVOLUTION_WIDTH_EXT				= 0x8018
-	CONVOLUTION_HEIGHT				= 0x8019
 	CONVOLUTION_HEIGHT_EXT				= 0x8019
-	MAX_CONVOLUTION_WIDTH				= 0x801A
 	MAX_CONVOLUTION_WIDTH_EXT			= 0x801A
-	MAX_CONVOLUTION_HEIGHT				= 0x801B
 	MAX_CONVOLUTION_HEIGHT_EXT			= 0x801B
-	POST_CONVOLUTION_RED_SCALE			= 0x801C # 1 F
 	POST_CONVOLUTION_RED_SCALE_EXT			= 0x801C # 1 F
-	POST_CONVOLUTION_GREEN_SCALE			= 0x801D # 1 F
 	POST_CONVOLUTION_GREEN_SCALE_EXT		= 0x801D # 1 F
-	POST_CONVOLUTION_BLUE_SCALE			= 0x801E # 1 F
 	POST_CONVOLUTION_BLUE_SCALE_EXT			= 0x801E # 1 F
-	POST_CONVOLUTION_ALPHA_SCALE			= 0x801F # 1 F
 	POST_CONVOLUTION_ALPHA_SCALE_EXT		= 0x801F # 1 F
-	POST_CONVOLUTION_RED_BIAS			= 0x8020 # 1 F
 	POST_CONVOLUTION_RED_BIAS_EXT			= 0x8020 # 1 F
-	POST_CONVOLUTION_GREEN_BIAS			= 0x8021 # 1 F
 	POST_CONVOLUTION_GREEN_BIAS_EXT			= 0x8021 # 1 F
-	POST_CONVOLUTION_BLUE_BIAS			= 0x8022 # 1 F
 	POST_CONVOLUTION_BLUE_BIAS_EXT			= 0x8022 # 1 F
-	POST_CONVOLUTION_ALPHA_BIAS			= 0x8023 # 1 F
 	POST_CONVOLUTION_ALPHA_BIAS_EXT			= 0x8023 # 1 F
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	HISTOGRAM					= 0x8024 # 1 I
+	PROXY_HISTOGRAM					= 0x8025
+	HISTOGRAM_WIDTH					= 0x8026
+	HISTOGRAM_FORMAT				= 0x8027
+	HISTOGRAM_RED_SIZE				= 0x8028
+	HISTOGRAM_GREEN_SIZE				= 0x8029
+	HISTOGRAM_BLUE_SIZE				= 0x802A
+	HISTOGRAM_ALPHA_SIZE				= 0x802B
+	HISTOGRAM_SINK					= 0x802D
+	MINMAX						= 0x802E # 1 I
+	MINMAX_FORMAT					= 0x802F
+	MINMAX_SINK					= 0x8030
+	TABLE_TOO_LARGE					= 0x8031
+
 EXT_histogram enum:
-	HISTOGRAM					= 0x8024 # 1 I
 	HISTOGRAM_EXT					= 0x8024 # 1 I
-	PROXY_HISTOGRAM					= 0x8025
 	PROXY_HISTOGRAM_EXT				= 0x8025
-	HISTOGRAM_WIDTH					= 0x8026
 	HISTOGRAM_WIDTH_EXT				= 0x8026
-	HISTOGRAM_FORMAT				= 0x8027
 	HISTOGRAM_FORMAT_EXT				= 0x8027
-	HISTOGRAM_RED_SIZE				= 0x8028
 	HISTOGRAM_RED_SIZE_EXT				= 0x8028
-	HISTOGRAM_GREEN_SIZE				= 0x8029
 	HISTOGRAM_GREEN_SIZE_EXT			= 0x8029
-	HISTOGRAM_BLUE_SIZE				= 0x802A
 	HISTOGRAM_BLUE_SIZE_EXT				= 0x802A
-	HISTOGRAM_ALPHA_SIZE				= 0x802B
 	HISTOGRAM_ALPHA_SIZE_EXT			= 0x802B
 	HISTOGRAM_LUMINANCE_SIZE			= 0x802C
 	HISTOGRAM_LUMINANCE_SIZE_EXT			= 0x802C
-	HISTOGRAM_SINK					= 0x802D
 	HISTOGRAM_SINK_EXT				= 0x802D
-	MINMAX						= 0x802E # 1 I
 	MINMAX_EXT					= 0x802E # 1 I
-	MINMAX_FORMAT					= 0x802F
 	MINMAX_FORMAT_EXT				= 0x802F
-	MINMAX_SINK					= 0x8030
 	MINMAX_SINK_EXT					= 0x8030
-	TABLE_TOO_LARGE					= 0x8031
 	TABLE_TOO_LARGE_EXT				= 0x8031
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	UNSIGNED_BYTE_3_3_2				= 0x8032
+	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_REV				= 0x8362
+	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
+
 EXT_packed_pixels enum:
-	UNSIGNED_BYTE_3_3_2				= 0x8032
 	UNSIGNED_BYTE_3_3_2_EXT				= 0x8032
-	UNSIGNED_SHORT_4_4_4_4				= 0x8033
 	UNSIGNED_SHORT_4_4_4_4_EXT			= 0x8033
-	UNSIGNED_SHORT_5_5_5_1				= 0x8034
 	UNSIGNED_SHORT_5_5_5_1_EXT			= 0x8034
-	UNSIGNED_INT_8_8_8_8				= 0x8035
 	UNSIGNED_INT_8_8_8_8_EXT			= 0x8035
-	UNSIGNED_INT_10_10_10_2				= 0x8036
 	UNSIGNED_INT_10_10_10_2_EXT			= 0x8036
-	UNSIGNED_BYTE_2_3_3_REV				= 0x8362
 	UNSIGNED_BYTE_2_3_3_REV_EXT			= 0x8362
-	UNSIGNED_SHORT_5_6_5				= 0x8363
 	UNSIGNED_SHORT_5_6_5_EXT			= 0x8363
-	UNSIGNED_SHORT_5_6_5_REV			= 0x8364
 	UNSIGNED_SHORT_5_6_5_REV_EXT			= 0x8364
-	UNSIGNED_SHORT_4_4_4_4_REV			= 0x8365
 	UNSIGNED_SHORT_4_4_4_4_REV_EXT			= 0x8365
-	UNSIGNED_SHORT_1_5_5_5_REV			= 0x8366
 	UNSIGNED_SHORT_1_5_5_5_REV_EXT			= 0x8366
-	UNSIGNED_INT_8_8_8_8_REV			= 0x8367
 	UNSIGNED_INT_8_8_8_8_REV_EXT			= 0x8367
-	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:
@@ -2199,9 +2295,10 @@
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	RESCALE_NORMAL					= 0x803A # 1 I
+
 EXT_rescale_normal enum:
-	RESCALE_NORMAL					= 0x803A # 1 I
 	RESCALE_NORMAL_EXT				= 0x803A # 1 I
 
 ###############################################################################
@@ -2251,6 +2348,11 @@
 	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:
@@ -2262,27 +2364,35 @@
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	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
+
 EXT_texture3D enum:
-	PACK_SKIP_IMAGES				= 0x806B # 1 I
 	PACK_SKIP_IMAGES_EXT				= 0x806B # 1 I
-	PACK_IMAGE_HEIGHT				= 0x806C # 1 F
 	PACK_IMAGE_HEIGHT_EXT				= 0x806C # 1 F
-	UNPACK_SKIP_IMAGES				= 0x806D # 1 I
 	UNPACK_SKIP_IMAGES_EXT				= 0x806D # 1 I
-	UNPACK_IMAGE_HEIGHT				= 0x806E # 1 F
 	UNPACK_IMAGE_HEIGHT_EXT				= 0x806E # 1 F
-	TEXTURE_3D					= 0x806F # 1 I
 	TEXTURE_3D_EXT					= 0x806F # 1 I
-	PROXY_TEXTURE_3D				= 0x8070
 	PROXY_TEXTURE_3D_EXT				= 0x8070
-	TEXTURE_DEPTH					= 0x8071
 	TEXTURE_DEPTH_EXT				= 0x8071
-	TEXTURE_WRAP_R					= 0x8072
 	TEXTURE_WRAP_R_EXT				= 0x8072
-	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:
@@ -2339,23 +2449,24 @@
 ###############################################################################
 
 # Reuses some SGIS_multisample values
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
+VERSION_1_3 enum: (Promoted for OpenGL 1.3)
+	MULTISAMPLE					= 0x809D
+	SAMPLE_ALPHA_TO_COVERAGE			= 0x809E
+	SAMPLE_ALPHA_TO_ONE				= 0x809F
+	SAMPLE_COVERAGE					= 0x80A0
+	SAMPLE_BUFFERS					= 0x80A8 # 1 I
+	SAMPLES						= 0x80A9 # 1 I
+	SAMPLE_COVERAGE_VALUE				= 0x80AA # 1 F
+	SAMPLE_COVERAGE_INVERT				= 0x80AB # 1 I
+
 ARB_multisample enum:
-	MULTISAMPLE					= 0x809D
 	MULTISAMPLE_ARB					= 0x809D
-	SAMPLE_ALPHA_TO_COVERAGE			= 0x809E
 	SAMPLE_ALPHA_TO_COVERAGE_ARB			= 0x809E
-	SAMPLE_ALPHA_TO_ONE				= 0x809F
 	SAMPLE_ALPHA_TO_ONE_ARB				= 0x809F
-	SAMPLE_COVERAGE					= 0x80A0
 	SAMPLE_COVERAGE_ARB				= 0x80A0
-	SAMPLE_BUFFERS					= 0x80A8 # 1 I
 	SAMPLE_BUFFERS_ARB				= 0x80A8 # 1 I
-	SAMPLES						= 0x80A9 # 1 I
 	SAMPLES_ARB					= 0x80A9 # 1 I
-	SAMPLE_COVERAGE_VALUE				= 0x80AA # 1 F
 	SAMPLE_COVERAGE_VALUE_ARB			= 0x80AA # 1 F
-	SAMPLE_COVERAGE_INVERT				= 0x80AB # 1 I
 	SAMPLE_COVERAGE_INVERT_ARB			= 0x80AB # 1 I
 
 SGIS_multisample enum:
@@ -2377,24 +2488,24 @@
 	SAMPLE_PATTERN_SGIS				= 0x80AC # 1 I
 
 # Reuses SGIS_multisample values.
-# EXT_multisample enum:
-#	  MULTISAMPLE_EXT				  = 0x809D
-#	  SAMPLE_ALPHA_TO_MASK_EXT			  = 0x809E
-#	  SAMPLE_ALPHA_TO_ONE_EXT			  = 0x809F
-#	  SAMPLE_MASK_EXT				  = 0x80A0
-#	  1PASS_EXT					  = 0x80A1
-#	  2PASS_0_EXT					  = 0x80A2
-#	  2PASS_1_EXT					  = 0x80A3
-#	  4PASS_0_EXT					  = 0x80A4
-#	  4PASS_1_EXT					  = 0x80A5
-#	  4PASS_2_EXT					  = 0x80A6
-#	  4PASS_3_EXT					  = 0x80A7
-#	  SAMPLE_BUFFERS_EXT				  = 0x80A8 # 1 I
-#	  SAMPLES_EXT					  = 0x80A9 # 1 I
-#	  SAMPLE_MASK_VALUE_EXT				  = 0x80AA # 1 F
-#	  SAMPLE_MASK_INVERT_EXT			  = 0x80AB # 1 I
-#	  SAMPLE_PATTERN_EXT				  = 0x80AC # 1 I
-#	  MULTISAMPLE_BIT_EXT				  = 0x20000000
+EXT_multisample enum:
+	MULTISAMPLE_EXT					= 0x809D
+	SAMPLE_ALPHA_TO_MASK_EXT			= 0x809E
+	SAMPLE_ALPHA_TO_ONE_EXT				= 0x809F
+	SAMPLE_MASK_EXT					= 0x80A0
+	1PASS_EXT					= 0x80A1
+	2PASS_0_EXT					= 0x80A2
+	2PASS_1_EXT					= 0x80A3
+	4PASS_0_EXT					= 0x80A4
+	4PASS_1_EXT					= 0x80A5
+	4PASS_2_EXT					= 0x80A6
+	4PASS_3_EXT					= 0x80A7
+	SAMPLE_BUFFERS_EXT				= 0x80A8 # 1 I
+	SAMPLES_EXT					= 0x80A9 # 1 I
+	SAMPLE_MASK_VALUE_EXT				= 0x80AA # 1 F
+	SAMPLE_MASK_INVERT_EXT				= 0x80AB # 1 I
+	SAMPLE_PATTERN_EXT				= 0x80AC # 1 I
+	MULTISAMPLE_BIT_EXT				= 0x20000000
 
 ###############################################################################
 
@@ -2406,29 +2517,30 @@
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	COLOR_MATRIX					= 0x80B1 # 16 F
+	COLOR_MATRIX_STACK_DEPTH			= 0x80B2 # 1 I
+	MAX_COLOR_MATRIX_STACK_DEPTH			= 0x80B3 # 1 I
+	POST_COLOR_MATRIX_RED_SCALE			= 0x80B4 # 1 F
+	POST_COLOR_MATRIX_GREEN_SCALE			= 0x80B5 # 1 F
+	POST_COLOR_MATRIX_BLUE_SCALE			= 0x80B6 # 1 F
+	POST_COLOR_MATRIX_ALPHA_SCALE			= 0x80B7 # 1 F
+	POST_COLOR_MATRIX_RED_BIAS			= 0x80B8 # 1 F
+	POST_COLOR_MATRIX_GREEN_BIAS			= 0x80B9 # 1 F
+	POST_COLOR_MATRIX_BLUE_BIAS			= 0x80BA # 1 F
+	POST_COLOR_MATRIX_ALPHA_BIAS			= 0x80BB # 1 F
+
 SGI_color_matrix enum:
-	COLOR_MATRIX					= 0x80B1 # 16 F
 	COLOR_MATRIX_SGI				= 0x80B1 # 16 F
-	COLOR_MATRIX_STACK_DEPTH			= 0x80B2 # 1 I
 	COLOR_MATRIX_STACK_DEPTH_SGI			= 0x80B2 # 1 I
-	MAX_COLOR_MATRIX_STACK_DEPTH			= 0x80B3 # 1 I
 	MAX_COLOR_MATRIX_STACK_DEPTH_SGI		= 0x80B3 # 1 I
-	POST_COLOR_MATRIX_RED_SCALE			= 0x80B4 # 1 F
 	POST_COLOR_MATRIX_RED_SCALE_SGI			= 0x80B4 # 1 F
-	POST_COLOR_MATRIX_GREEN_SCALE			= 0x80B5 # 1 F
 	POST_COLOR_MATRIX_GREEN_SCALE_SGI		= 0x80B5 # 1 F
-	POST_COLOR_MATRIX_BLUE_SCALE			= 0x80B6 # 1 F
 	POST_COLOR_MATRIX_BLUE_SCALE_SGI		= 0x80B6 # 1 F
-	POST_COLOR_MATRIX_ALPHA_SCALE			= 0x80B7 # 1 F
 	POST_COLOR_MATRIX_ALPHA_SCALE_SGI		= 0x80B7 # 1 F
-	POST_COLOR_MATRIX_RED_BIAS			= 0x80B8 # 1 F
 	POST_COLOR_MATRIX_RED_BIAS_SGI			= 0x80B8 # 1 F
-	POST_COLOR_MATRIX_GREEN_BIAS			= 0x80B9 # 1 F
 	POST_COLOR_MATRIX_GREEN_BIAS_SGI		= 0x80B9 # 1 F
-	POST_COLOR_MATRIX_BLUE_BIAS			= 0x80BA # 1 F
 	POST_COLOR_MATRIX_BLUE_BIAS_SGI			= 0x80BA # 1 F
-	POST_COLOR_MATRIX_ALPHA_BIAS			= 0x80BB # 1 F
 	POST_COLOR_MATRIX_ALPHA_BIAS_SGI		= 0x80BB # 1 F
 
 ###############################################################################
@@ -2453,67 +2565,80 @@
 
 # 3Dlabs_future_use: 0x80C0-0x80C7
 
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# EXT_blend_func_separate enum:
-#	BLEND_DST_RGB					= 0x80C8
-#	BLEND_DST_RGB_EXT				= 0x80C8
-#	BLEND_SRC_RGB					= 0x80C9
-#	BLEND_SRC_RGB_EXT				= 0x80C9
-#	BLEND_DST_ALPHA					= 0x80CA
-#	BLEND_DST_ALPHA_EXT				= 0x80CA
-#	BLEND_SRC_ALPHA					= 0x80CB
-#	BLEND_SRC_ALPHA_EXT				= 0x80CB
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	BLEND_DST_RGB					= 0x80C8
+	BLEND_SRC_RGB					= 0x80C9
+	BLEND_DST_ALPHA					= 0x80CA
+	BLEND_SRC_ALPHA					= 0x80CB
 
-# EXT_422_pixels enum:
-#	422_EXT						= 0x80CC
-#	422_REV_EXT					= 0x80CD
-#	422_AVERAGE_EXT					= 0x80CE
-#	422_REV_AVERAGE_EXT				= 0x80CF
+EXT_blend_func_separate enum:
+	BLEND_DST_RGB_EXT				= 0x80C8
+	BLEND_SRC_RGB_EXT				= 0x80C9
+	BLEND_DST_ALPHA_EXT				= 0x80CA
+	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
+	422_AVERAGE_EXT					= 0x80CE
+	422_REV_AVERAGE_EXT				= 0x80CF
+
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	COLOR_TABLE					= 0x80D0 # 1 I
+	POST_CONVOLUTION_COLOR_TABLE			= 0x80D1 # 1 I
+	POST_COLOR_MATRIX_COLOR_TABLE			= 0x80D2 # 1 I
+	PROXY_COLOR_TABLE				= 0x80D3
+	PROXY_POST_CONVOLUTION_COLOR_TABLE		= 0x80D4
+	PROXY_POST_COLOR_MATRIX_COLOR_TABLE		= 0x80D5
+	COLOR_TABLE_SCALE				= 0x80D6
+	COLOR_TABLE_BIAS				= 0x80D7
+	COLOR_TABLE_FORMAT				= 0x80D8
+	COLOR_TABLE_WIDTH				= 0x80D9
+	COLOR_TABLE_RED_SIZE				= 0x80DA
+	COLOR_TABLE_GREEN_SIZE				= 0x80DB
+	COLOR_TABLE_BLUE_SIZE				= 0x80DC
+	COLOR_TABLE_ALPHA_SIZE				= 0x80DD
+	COLOR_TABLE_LUMINANCE_SIZE			= 0x80DE
+	COLOR_TABLE_INTENSITY_SIZE			= 0x80DF
+
 SGI_color_table enum:
-	COLOR_TABLE					= 0x80D0 # 1 I
 	COLOR_TABLE_SGI					= 0x80D0 # 1 I
-	POST_CONVOLUTION_COLOR_TABLE			= 0x80D1 # 1 I
 	POST_CONVOLUTION_COLOR_TABLE_SGI		= 0x80D1 # 1 I
-	POST_COLOR_MATRIX_COLOR_TABLE			= 0x80D2 # 1 I
 	POST_COLOR_MATRIX_COLOR_TABLE_SGI		= 0x80D2 # 1 I
-	PROXY_COLOR_TABLE				= 0x80D3
 	PROXY_COLOR_TABLE_SGI				= 0x80D3
-	PROXY_POST_CONVOLUTION_COLOR_TABLE		= 0x80D4
 	PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI		= 0x80D4
-	PROXY_POST_COLOR_MATRIX_COLOR_TABLE		= 0x80D5
 	PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI		= 0x80D5
-	COLOR_TABLE_SCALE				= 0x80D6
 	COLOR_TABLE_SCALE_SGI				= 0x80D6
-	COLOR_TABLE_BIAS				= 0x80D7
 	COLOR_TABLE_BIAS_SGI				= 0x80D7
-	COLOR_TABLE_FORMAT				= 0x80D8
 	COLOR_TABLE_FORMAT_SGI				= 0x80D8
-	COLOR_TABLE_WIDTH				= 0x80D9
 	COLOR_TABLE_WIDTH_SGI				= 0x80D9
-	COLOR_TABLE_RED_SIZE				= 0x80DA
 	COLOR_TABLE_RED_SIZE_SGI			= 0x80DA
-	COLOR_TABLE_GREEN_SIZE				= 0x80DB
 	COLOR_TABLE_GREEN_SIZE_SGI			= 0x80DB
-	COLOR_TABLE_BLUE_SIZE				= 0x80DC
 	COLOR_TABLE_BLUE_SIZE_SGI			= 0x80DC
-	COLOR_TABLE_ALPHA_SIZE				= 0x80DD
 	COLOR_TABLE_ALPHA_SIZE_SGI			= 0x80DD
-	COLOR_TABLE_LUMINANCE_SIZE			= 0x80DE
 	COLOR_TABLE_LUMINANCE_SIZE_SGI			= 0x80DE
-	COLOR_TABLE_INTENSITY_SIZE			= 0x80DF
 	COLOR_TABLE_INTENSITY_SIZE_SGI			= 0x80DF
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	BGR						= 0x80E0
+	BGRA						= 0x80E1
+
+ARB_vertex_array_bgra enum:
+#	use VERSION_1_2			    BGRA
+
 EXT_bgra enum:
-	BGR						= 0x80E0
 	BGR_EXT						= 0x80E0
-	BGRA						= 0x80E1
 	BGRA_EXT					= 0x80E1
 
 ###############################################################################
@@ -2558,25 +2683,28 @@
 
 ###############################################################################
 
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# ARB_point_parameters enum:
-# EXT_point_parameters enum:
-SGIS_point_parameters enum:
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
 	POINT_SIZE_MIN					= 0x8126 # 1 F
+	POINT_SIZE_MAX					= 0x8127 # 1 F
+	POINT_FADE_THRESHOLD_SIZE			= 0x8128 # 1 F
+	POINT_DISTANCE_ATTENUATION			= 0x8129 # 3 F
+
+ARB_point_parameters enum:
 	POINT_SIZE_MIN_ARB				= 0x8126 # 1 F
+	POINT_SIZE_MAX_ARB				= 0x8127 # 1 F
+	POINT_FADE_THRESHOLD_SIZE_ARB			= 0x8128 # 1 F
+	POINT_DISTANCE_ATTENUATION_ARB			= 0x8129 # 3 F
+
+EXT_point_parameters enum:
 	POINT_SIZE_MIN_EXT				= 0x8126 # 1 F
+	POINT_SIZE_MAX_EXT				= 0x8127 # 1 F
+	POINT_FADE_THRESHOLD_SIZE_EXT			= 0x8128 # 1 F
+	DISTANCE_ATTENUATION_EXT			= 0x8129 # 3 F
+
+SGIS_point_parameters enum:
 	POINT_SIZE_MIN_SGIS				= 0x8126 # 1 F
-	POINT_SIZE_MAX					= 0x8127 # 1 F
-	POINT_SIZE_MAX_ARB				= 0x8127 # 1 F
-	POINT_SIZE_MAX_EXT				= 0x8127 # 1 F
 	POINT_SIZE_MAX_SGIS				= 0x8127 # 1 F
-	POINT_FADE_THRESHOLD_SIZE			= 0x8128 # 1 F
-	POINT_FADE_THRESHOLD_SIZE_ARB			= 0x8128 # 1 F
-	POINT_FADE_THRESHOLD_SIZE_EXT			= 0x8128 # 1 F
 	POINT_FADE_THRESHOLD_SIZE_SGIS			= 0x8128 # 1 F
-	POINT_DISTANCE_ATTENUATION			= 0x8129 # 3 F
-	POINT_DISTANCE_ATTENUATION_ARB			= 0x8129 # 3 F
-	DISTANCE_ATTENUATION_EXT			= 0x8129 # 3 F
 	DISTANCE_ATTENUATION_SGIS			= 0x8129 # 3 F
 
 ###############################################################################
@@ -2588,11 +2716,13 @@
 
 ###############################################################################
 
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
-# ARB_texture_border_clamp enum:
-SGIS_texture_border_clamp enum:
+VERSION_1_3 enum: (Promoted for OpenGL 1.3)
 	CLAMP_TO_BORDER					= 0x812D
+
+ARB_texture_border_clamp enum:
 	CLAMP_TO_BORDER_ARB				= 0x812D
+
+SGIS_texture_border_clamp enum:
 	CLAMP_TO_BORDER_SGIS				= 0x812D
 
 ###############################################################################
@@ -2602,9 +2732,10 @@
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	CLAMP_TO_EDGE					= 0x812F
+
 SGIS_texture_edge_clamp enum:
-	CLAMP_TO_EDGE					= 0x812F
 	CLAMP_TO_EDGE_SGIS				= 0x812F
 
 ###############################################################################
@@ -2629,15 +2760,16 @@
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	TEXTURE_MIN_LOD					= 0x813A
+	TEXTURE_MAX_LOD					= 0x813B
+	TEXTURE_BASE_LEVEL				= 0x813C
+	TEXTURE_MAX_LEVEL				= 0x813D
+
 SGIS_texture_lod enum:
-	TEXTURE_MIN_LOD					= 0x813A
 	TEXTURE_MIN_LOD_SGIS				= 0x813A
-	TEXTURE_MAX_LOD					= 0x813B
 	TEXTURE_MAX_LOD_SGIS				= 0x813B
-	TEXTURE_BASE_LEVEL				= 0x813C
 	TEXTURE_BASE_LEVEL_SGIS				= 0x813C
-	TEXTURE_MAX_LEVEL				= 0x813D
 	TEXTURE_MAX_LEVEL_SGIS				= 0x813D
 
 ###############################################################################
@@ -2648,7 +2780,6 @@
 	PIXEL_TILE_WIDTH_SGIX				= 0x8140 # 1 I
 	PIXEL_TILE_HEIGHT_SGIX				= 0x8141 # 1 I
 	PIXEL_TILE_GRID_WIDTH_SGIX			= 0x8142 # 1 I
-
 	PIXEL_TILE_GRID_HEIGHT_SGIX			= 0x8143 # 1 I
 	PIXEL_TILE_GRID_DEPTH_SGIX			= 0x8144 # 1 I
 	PIXEL_TILE_CACHE_SIZE_SGIX			= 0x8145 # 1 I
@@ -2676,16 +2807,16 @@
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
-# IGNORE_BORDER was *not* promoted into OpenGL 1.2
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	CONSTANT_BORDER					= 0x8151
+#	WRAP_BORDER					= 0x8152   # Not actually used
+	REPLICATE_BORDER				= 0x8153
+	CONVOLUTION_BORDER_COLOR			= 0x8154
+
 HP_convolution_border_modes enum:
-	IGNORE_BORDER_HP				= 0x8150
-	CONSTANT_BORDER					= 0x8151
+	IGNORE_BORDER_HP				= 0x8150    # Not promoted
 	CONSTANT_BORDER_HP				= 0x8151
-#	 WRAP_BORDER					 = 0x8152   # Not actually promoted?
-	REPLICATE_BORDER				= 0x8153
 	REPLICATE_BORDER_HP				= 0x8153
-	CONVOLUTION_BORDER_COLOR			= 0x8154
 	CONVOLUTION_BORDER_COLOR_HP			= 0x8154
 
 ###############################################################################
@@ -2770,11 +2901,12 @@
 
 ###############################################################################
 
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	GENERATE_MIPMAP					= 0x8191
+	GENERATE_MIPMAP_HINT				= 0x8192 # 1 I
+
 SGIS_generate_mipmap enum:
-	GENERATE_MIPMAP					= 0x8191
 	GENERATE_MIPMAP_SGIS				= 0x8191
-	GENERATE_MIPMAP_HINT				= 0x8192 # 1 I
 	GENERATE_MIPMAP_HINT_SGIS			= 0x8192 # 1 I
 
 ###############################################################################
@@ -2785,7 +2917,7 @@
 
 ###############################################################################
 
-# SGIX_polynomial_ffd enum:
+SGIX_polynomial_ffd enum:
 	GEOMETRY_DEFORMATION_SGIX			= 0x8194
 	TEXTURE_DEFORMATION_SGIX			= 0x8195
 	DEFORMATIONS_MASK_SGIX				= 0x8196 # 1 I
@@ -2819,57 +2951,74 @@
 
 ###############################################################################
 
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# ARB_depth_texture enum:
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	DEPTH_COMPONENT16				= 0x81A5
+	DEPTH_COMPONENT24				= 0x81A6
+	DEPTH_COMPONENT32				= 0x81A7
+
+ARB_depth_texture enum:
+	DEPTH_COMPONENT16_ARB				= 0x81A5
+	DEPTH_COMPONENT24_ARB				= 0x81A6
+	DEPTH_COMPONENT32_ARB				= 0x81A7
+
 SGIX_depth_texture enum:
-	DEPTH_COMPONENT16				= 0x81A5
 	DEPTH_COMPONENT16_SGIX				= 0x81A5
-	DEPTH_COMPONENT24				= 0x81A6
 	DEPTH_COMPONENT24_SGIX				= 0x81A6
-	DEPTH_COMPONENT32				= 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:
-#	 ARRAY_ELEMENT_LOCK_FIRST_EXT			 = 0x81A8
-#	 ARRAY_ELEMENT_LOCK_COUNT_EXT			 = 0x81A9
+EXT_compiled_vertex_array enum:
+	ARRAY_ELEMENT_LOCK_FIRST_EXT			= 0x81A8
+	ARRAY_ELEMENT_LOCK_COUNT_EXT			= 0x81A9
 
 ###############################################################################
 
-#EXT_cull_vertex enum:
-#	 CULL_VERTEX_EXT				 = 0x81AA
-#	 CULL_VERTEX_EYE_POSITION_EXT			 = 0x81AB
-#	 CULL_VERTEX_OBJECT_POSITION_EXT		 = 0x81AC
+EXT_cull_vertex enum:
+	CULL_VERTEX_EXT					= 0x81AA
+	CULL_VERTEX_EYE_POSITION_EXT			= 0x81AB
+	CULL_VERTEX_OBJECT_POSITION_EXT			= 0x81AC
 
 ###############################################################################
 
 # Promoted from SGI?
-#EXT_index_array_formats enum:
-#	 IUI_V2F_EXT					 = 0x81AD
-#	 IUI_V3F_EXT					 = 0x81AE
-#	 IUI_N3F_V2F_EXT				 = 0x81AF
-#	 IUI_N3F_V3F_EXT				 = 0x81B0
-#	 T2F_IUI_V2F_EXT				 = 0x81B1
-#	 T2F_IUI_V3F_EXT				 = 0x81B2
-#	 T2F_IUI_N3F_V2F_EXT				 = 0x81B3
-#	 T2F_IUI_N3F_V3F_EXT				 = 0x81B4
+EXT_index_array_formats enum:
+	IUI_V2F_EXT					= 0x81AD
+	IUI_V3F_EXT					= 0x81AE
+	IUI_N3F_V2F_EXT					= 0x81AF
+	IUI_N3F_V3F_EXT					= 0x81B0
+	T2F_IUI_V2F_EXT					= 0x81B1
+	T2F_IUI_V3F_EXT					= 0x81B2
+	T2F_IUI_N3F_V2F_EXT				= 0x81B3
+	T2F_IUI_N3F_V3F_EXT				= 0x81B4
 
 ###############################################################################
 
 # Promoted from SGI?
-#EXT_index_func enum:
-#	 INDEX_TEST_EXT					 = 0x81B5
-#	 INDEX_TEST_FUNC_EXT				 = 0x81B6
-#	 INDEX_TEST_REF_EXT				 = 0x81B7
+EXT_index_func enum:
+	INDEX_TEST_EXT					= 0x81B5
+	INDEX_TEST_FUNC_EXT				= 0x81B6
+	INDEX_TEST_REF_EXT				= 0x81B7
 
 ###############################################################################
 
 # Promoted from SGI?
-#EXT_index_material enum:
-#	 INDEX_MATERIAL_EXT				 = 0x81B8
-#	 INDEX_MATERIAL_PARAMETER_EXT			 = 0x81B9
-#	 INDEX_MATERIAL_FACE_EXT			 = 0x81BA
+EXT_index_material enum:
+	INDEX_MATERIAL_EXT				= 0x81B8
+	INDEX_MATERIAL_PARAMETER_EXT			= 0x81B9
+	INDEX_MATERIAL_FACE_EXT				= 0x81BA
 
 ###############################################################################
 
@@ -2943,33 +3092,21 @@
 #	 SURFACE_SIZE_HINT_SUNX				= 0x81D2
 #	 LARGE_SUNX					= 0x81D3
 
-# SUNX_general_triangle_list enum:
-#	 RESTART_SUN					= 0x0001
-#	 REPLACE_MIDDLE_SUN				= 0x0002
-#	 REPLACE_OLDEST_SUN				= 0x0003
-#	 WRAP_BORDER_SUN				= 0x81D4
-#	 TRIANGLE_LIST_SUN				= 0x81D7
-#	 REPLACEMENT_CODE_SUN				= 0x81D8
-#	 REPLACEMENT_CODE_ARRAY_SUN			= 0x85C0
-#	 REPLACEMENT_CODE_ARRAY_TYPE_SUN		= 0x85C1
-#	 REPLACEMENT_CODE_ARRAY_STRIDE_SUN		= 0x85C2
-#	 REPLACEMENT_CODE_ARRAY_POINTER_SUN		= 0x85C3
-#	 R1UI_V3F_SUN					= 0x85C4
-#	 R1UI_C4UB_V3F_SUN				= 0x85C5
-#	 R1UI_C3F_V3F_SUN				= 0x85C6
-#	 R1UI_N3F_V3F_SUN				= 0x85C7
-#	 R1UI_C4F_N3F_V3F_SUN				= 0x85C8
-#	 R1UI_T2F_V3F_SUN				= 0x85C9
-#	 R1UI_T2F_N3F_V3F_SUN				= 0x85CA
-#	 R1UI_T2F_C4F_N3F_V3F_SUN			= 0x85CB
+SUNX_general_triangle_list enum:
+	 RESTART_SUN					= 0x0001
+	 REPLACE_MIDDLE_SUN				= 0x0002
+	 REPLACE_OLDEST_SUN				= 0x0003
+	 WRAP_BORDER_SUN				= 0x81D4
+	 TRIANGLE_LIST_SUN				= 0x81D7
+	 REPLACEMENT_CODE_SUN				= 0x81D8
 
-# SUNX_constant_data enum:
-#	 UNPACK_CONSTANT_DATA_SUNX			= 0x81D5
-#	 TEXTURE_CONSTANT_DATA_SUNX			= 0x81D6
+SUNX_constant_data enum:
+	 UNPACK_CONSTANT_DATA_SUNX			= 0x81D5
+	 TEXTURE_CONSTANT_DATA_SUNX			= 0x81D6
 
-# SUN_global_alpha enum:
-#	 GLOBAL_ALPHA_SUN				= 0x81D9
-#	 GLOBAL_ALPHA_FACTOR_SUN			= 0x81DA
+SUN_global_alpha enum:
+	 GLOBAL_ALPHA_SUN				= 0x81D9
+	 GLOBAL_ALPHA_FACTOR_SUN			= 0x81DA
 
 ###############################################################################
 
@@ -2994,13 +3131,14 @@
 
 ###############################################################################
 
-# VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+VERSION_1_2 enum: (Promoted for OpenGL 1.2)
+	LIGHT_MODEL_COLOR_CONTROL			= 0x81F8 # 1 I
+	SINGLE_COLOR					= 0x81F9
+	SEPARATE_SPECULAR_COLOR				= 0x81FA
+
 EXT_separate_specular_color enum:
-	LIGHT_MODEL_COLOR_CONTROL			= 0x81F8 # 1 I
 	LIGHT_MODEL_COLOR_CONTROL_EXT			= 0x81F8
-	SINGLE_COLOR					= 0x81F9
 	SINGLE_COLOR_EXT				= 0x81F9
-	SEPARATE_SPECULAR_COLOR				= 0x81FA
 	SEPARATE_SPECULAR_COLOR_EXT			= 0x81FA
 
 ###############################################################################
@@ -3025,69 +3163,107 @@
 ###############################################################################
 
 # ATI: 0x8200-0x820F (released by Microsoft 2002/9/16)
-# ATI_text_fragment_shader enum:
-#	TEXT_FRAGMENT_SHADER_ATI			= 0x8200
+ATI_text_fragment_shader enum:
+	TEXT_FRAGMENT_SHADER_ATI			= 0x8200
 
 ###############################################################################
 
-# ARB: 0x8210-0x823F
+# OpenGL ARB: 0x8210-0x823F
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-#	FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING		= 0x8210    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE		= 0x8211    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_RED_SIZE			= 0x8212    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_GREEN_SIZE		= 0x8213    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_BLUE_SIZE		= 0x8214    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE		= 0x8215    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE		= 0x8216    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE		= 0x8217    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_DEFAULT				= 0x8218    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_UNDEFINED				= 0x8219    # 3.0 / ARB_fbo
-#	DEPTH_STENCIL_ATTACHMENT			= 0x821A    # 3.0 / ARB_fbo
+VERSION_3_0 enum:
+	use ARB_framebuffer_object	    FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING
+	use ARB_framebuffer_object	    FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE
+	use ARB_framebuffer_object	    FRAMEBUFFER_ATTACHMENT_RED_SIZE
+	use ARB_framebuffer_object	    FRAMEBUFFER_ATTACHMENT_GREEN_SIZE
+	use ARB_framebuffer_object	    FRAMEBUFFER_ATTACHMENT_BLUE_SIZE
+	use ARB_framebuffer_object	    FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE
+	use ARB_framebuffer_object	    FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE
+	use ARB_framebuffer_object	    FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE
+	use ARB_framebuffer_object	    FRAMEBUFFER_DEFAULT
+	use ARB_framebuffer_object	    FRAMEBUFFER_UNDEFINED
+	use ARB_framebuffer_object	    DEPTH_STENCIL_ATTACHMENT
 
-# VERSION_3_0 enum:
-#	MAJOR_VERSION					= 0x821B    # 3.0
-#	MINOR_VERSION					= 0x821C    # 3.0
-#	NUM_EXTENSIONS					= 0x821D    # 3.0
-#	CONTEXT_FLAGS					= 0x821E    # 3.0
-# 0x821F-0x8221 currently unused
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING		= 0x8210    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE		= 0x8211    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_RED_SIZE			= 0x8212    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_GREEN_SIZE		= 0x8213    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_BLUE_SIZE		= 0x8214    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE		= 0x8215    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE		= 0x8216    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE		= 0x8217    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_DEFAULT				= 0x8218    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_UNDEFINED				= 0x8219    # VERSION_3_0 / ARB_fbo
+	DEPTH_STENCIL_ATTACHMENT			= 0x821A    # VERSION_3_0 / ARB_fbo
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-#	INDEX						= 0x8222    # 3.0 / ARB_fbo
+VERSION_3_0 enum:
+	MAJOR_VERSION					= 0x821B    # VERSION_3_0
+	MINOR_VERSION					= 0x821C    # VERSION_3_0
+	NUM_EXTENSIONS					= 0x821D    # VERSION_3_0
+	CONTEXT_FLAGS					= 0x821E    # VERSION_3_0
 
-# VERSION_3_0 enum:
-#	DEPTH_BUFFER					= 0x8223    # 3.0
-#	STENCIL_BUFFER					= 0x8224    # 3.0
-#	COMPRESSED_RED					= 0x8225    # 3.0
-#	COMPRESSED_RG					= 0x8226    # 3.0
+# ARB_future_use: 0x821F-0x8221
 
-# VERSION_3_0 enum:
-# ARB_texture_rg enum: (note: no ARB suffixes)
-#	RG						= 0x8227    # 3.0 / ARB_trg
-#	RG_INTEGER					= 0x8228    # 3.0 / ARB_trg
-#	R8						= 0x8229    # 3.0 / ARB_trg
-#	R16						= 0x822A    # 3.0 / ARB_trg
-#	RG8						= 0x822B    # 3.0 / ARB_trg
-#	RG16						= 0x822C    # 3.0 / ARB_trg
-#	R16F						= 0x822D    # 3.0 / ARB_trg
-#	R32F						= 0x822E    # 3.0 / ARB_trg
-#	RG16F						= 0x822F    # 3.0 / ARB_trg
-#	RG32F						= 0x8230    # 3.0 / ARB_trg
-#	R8I						= 0x8231    # 3.0 / ARB_trg
-#	R8UI						= 0x8232    # 3.0 / ARB_trg
-#	R16I						= 0x8233    # 3.0 / ARB_trg
-#	R16UI						= 0x8234    # 3.0 / ARB_trg
-#	R32I						= 0x8235    # 3.0 / ARB_trg
-#	R32UI						= 0x8236    # 3.0 / ARB_trg
-#	RG8I						= 0x8237    # 3.0 / ARB_trg
-#	RG8UI						= 0x8238    # 3.0 / ARB_trg
-#	RG16I						= 0x8239    # 3.0 / ARB_trg
-#	RG16UI						= 0x823A    # 3.0 / ARB_trg
-#	RG32I						= 0x823B    # 3.0 / ARB_trg
-#	RG32UI						= 0x823C    # 3.0 / ARB_trg
+VERSION_3_0 enum:
+	use ARB_framebuffer_object	    INDEX
 
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	INDEX						= 0x8222    # VERSION_3_0 / ARB_fbo
+
+VERSION_3_0 enum:
+	DEPTH_BUFFER					= 0x8223    # VERSION_3_0
+	STENCIL_BUFFER					= 0x8224    # VERSION_3_0
+	COMPRESSED_RED					= 0x8225    # VERSION_3_0
+	COMPRESSED_RG					= 0x8226    # VERSION_3_0
+
+VERSION_3_0 enum:
+	use ARB_texture_rg		    RG
+	use ARB_texture_rg		    RG_INTEGER
+	use ARB_texture_rg		    R8
+	use ARB_texture_rg		    R16
+	use ARB_texture_rg		    RG8
+	use ARB_texture_rg		    RG16
+	use ARB_texture_rg		    R16F
+	use ARB_texture_rg		    R32F
+	use ARB_texture_rg		    RG16F
+	use ARB_texture_rg		    RG32F
+	use ARB_texture_rg		    R8I
+	use ARB_texture_rg		    R8UI
+	use ARB_texture_rg		    R16I
+	use ARB_texture_rg		    R16UI
+	use ARB_texture_rg		    R32I
+	use ARB_texture_rg		    R32UI
+	use ARB_texture_rg		    RG8I
+	use ARB_texture_rg		    RG8UI
+	use ARB_texture_rg		    RG16I
+	use ARB_texture_rg		    RG16UI
+	use ARB_texture_rg		    RG32I
+	use ARB_texture_rg		    RG32UI
+
+ARB_texture_rg enum: (note: no ARB suffixes)
+	RG						= 0x8227    # VERSION_3_0 / ARB_trg
+	RG_INTEGER					= 0x8228    # VERSION_3_0 / ARB_trg
+	R8						= 0x8229    # VERSION_3_0 / ARB_trg
+	R16						= 0x822A    # VERSION_3_0 / ARB_trg
+	RG8						= 0x822B    # VERSION_3_0 / ARB_trg
+	RG16						= 0x822C    # VERSION_3_0 / ARB_trg
+	R16F						= 0x822D    # VERSION_3_0 / ARB_trg
+	R32F						= 0x822E    # VERSION_3_0 / ARB_trg
+	RG16F						= 0x822F    # VERSION_3_0 / ARB_trg
+	RG32F						= 0x8230    # VERSION_3_0 / ARB_trg
+	R8I						= 0x8231    # VERSION_3_0 / ARB_trg
+	R8UI						= 0x8232    # VERSION_3_0 / ARB_trg
+	R16I						= 0x8233    # VERSION_3_0 / ARB_trg
+	R16UI						= 0x8234    # VERSION_3_0 / ARB_trg
+	R32I						= 0x8235    # VERSION_3_0 / ARB_trg
+	R32UI						= 0x8236    # VERSION_3_0 / ARB_trg
+	RG8I						= 0x8237    # VERSION_3_0 / ARB_trg
+	RG8UI						= 0x8238    # VERSION_3_0 / ARB_trg
+	RG16I						= 0x8239    # VERSION_3_0 / ARB_trg
+	RG16UI						= 0x823A    # VERSION_3_0 / ARB_trg
+	RG32I						= 0x823B    # VERSION_3_0 / ARB_trg
+	RG32UI						= 0x823C    # VERSION_3_0 / ARB_trg
+
 # ARB_future_use: 0x823D-0x823F
 
 ###############################################################################
@@ -3100,17 +3276,17 @@
 
 ###############################################################################
 
-# SGIX_depth_pass_instrument enum: 0x8310-0x8312
-#	DEPTH_PASS_INSTRUMENT_SGIX			= 0x8310
-#	DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX		= 0x8311
-#	DEPTH_PASS_INSTRUMENT_MAX_SGIX			= 0x8312
+SGIX_depth_pass_instrument enum: 0x8310-0x8312
+	DEPTH_PASS_INSTRUMENT_SGIX			= 0x8310
+	DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX		= 0x8311
+	DEPTH_PASS_INSTRUMENT_MAX_SGIX			= 0x8312
 
 ###############################################################################
 
-# SGIX_fragments_instrument enum: 0x8313-0x8315
-#	FRAGMENTS_INSTRUMENT_SGIX			= 0x8313 # 1 I
-#	FRAGMENTS_INSTRUMENT_COUNTERS_SGIX		= 0x8314 # 1 I
-#	FRAGMENTS_INSTRUMENT_MAX_SGIX			= 0x8315 # 1 I
+SGIX_fragments_instrument enum: 0x8313-0x8315
+	FRAGMENTS_INSTRUMENT_SGIX			= 0x8313 # 1 I
+	FRAGMENTS_INSTRUMENT_COUNTERS_SGIX		= 0x8314 # 1 I
+	FRAGMENTS_INSTRUMENT_MAX_SGIX			= 0x8315 # 1 I
 
 ###############################################################################
 
@@ -3123,19 +3299,21 @@
 
 ###############################################################################
 
-# SGIX_ycrcba: 0x8318-0x8319
-#	YCRCB_SGIX					= 0x8318
-#	YCRCBA_SGIX					= 0x8319
+# 0x8318-0x8319
+SGIX_ycrcba enum:
+	YCRCB_SGIX					= 0x8318
+	YCRCBA_SGIX					= 0x8319
 
 ###############################################################################
 
-# SGIX_slim: 0x831A-0x831F
-#	UNPACK_COMPRESSED_SIZE_SGIX			= 0x831A
-#	PACK_MAX_COMPRESSED_SIZE_SGIX			= 0x831B
-#	PACK_COMPRESSED_SIZE_SGIX			= 0x831C
-#	SLIM8U_SGIX					= 0x831D
-#	SLIM10U_SGIX					= 0x831E
-#	SLIM12S_SGIX					= 0x831F
+# 0x831A-0x831F
+SGIX_slim enum:
+	UNPACK_COMPRESSED_SIZE_SGIX			= 0x831A
+	PACK_MAX_COMPRESSED_SIZE_SGIX			= 0x831B
+	PACK_COMPRESSED_SIZE_SGIX			= 0x831C
+	SLIM8U_SGIX					= 0x831D
+	SLIM10U_SGIX					= 0x831E
+	SLIM12S_SGIX					= 0x831F
 
 ###############################################################################
 
@@ -3145,8 +3323,8 @@
 
 ###############################################################################
 
-# SGIX_scalebias_hint enum:
-#	SCALEBIAS_HINT_SGIX				= 0x8322
+SGIX_scalebias_hint enum:
+	SCALEBIAS_HINT_SGIX				= 0x8322
 
 ###############################################################################
 
@@ -3161,7 +3339,7 @@
 
 ###############################################################################
 
-# SGIX_async enum:
+SGIX_async enum:
 	ASYNC_MARKER_SGIX				= 0x8329
 
 ###############################################################################
@@ -3220,18 +3398,19 @@
 
 # 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
-#	FRAGMENT_COLOR_EXT				= 0x834C
-#	ATTENUATION_EXT					= 0x834D
-#	SHADOW_ATTENUATION_EXT				= 0x834E
-#	TEXTURE_APPLICATION_MODE_EXT			= 0x834F # 1 I
-#	TEXTURE_LIGHT_EXT				= 0x8350 # 1 I
-#	TEXTURE_MATERIAL_FACE_EXT			= 0x8351 # 1 I
-#	TEXTURE_MATERIAL_PARAMETER_EXT			= 0x8352 # 1 I
-#	use EXT_fog_coord FRAGMENT_DEPTH_EXT
+EXT_light_texture enum: 0x8349-0x8352
+	FRAGMENT_MATERIAL_EXT				= 0x8349
+	FRAGMENT_NORMAL_EXT				= 0x834A
+	FRAGMENT_COLOR_EXT				= 0x834C
+	ATTENUATION_EXT					= 0x834D
+	SHADOW_ATTENUATION_EXT				= 0x834E
+	TEXTURE_APPLICATION_MODE_EXT			= 0x834F # 1 I
+	TEXTURE_LIGHT_EXT				= 0x8350 # 1 I
+	TEXTURE_MATERIAL_FACE_EXT			= 0x8351 # 1 I
+	TEXTURE_MATERIAL_PARAMETER_EXT			= 0x8352 # 1 I
+	use EXT_fog_coord FRAGMENT_DEPTH_EXT
 
 ###############################################################################
 
@@ -3257,8 +3436,8 @@
 
 ###############################################################################
 
-# SGIX_line_quality_hint:
-#	LINE_QUALITY_HINT_SGIX				= 0x835B
+SGIX_line_quality_hint enum:
+	LINE_QUALITY_HINT_SGIX				= 0x835B
 
 ###############################################################################
 
@@ -3304,13 +3483,19 @@
 # whether HP has any conflicts as they have never reported using
 # any values in this range.
 
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# ARB_texture_mirrored_repeat enum:
-# IBM_texture_mirrored_repeat enum:
-#	MIRRORED_REPEAT					= 0x8370
-#	MIRRORED_REPEAT_ARB				= 0x8370
-#	MIRRORED_REPEAT_IBM				= 0x8370
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	MIRRORED_REPEAT					= 0x8370
 
+ARB_texture_mirrored_repeat enum:
+	MIRRORED_REPEAT_ARB				= 0x8370
+
+IBM_texture_mirrored_repeat enum:
+	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
@@ -3319,12 +3504,11 @@
 
 # S3: 0x83A0-0x83BF
 
-# Extension #276
-# S3_s3tc enum: 0x83A0-0x83A3
-#	RGB_S3TC					= 0x83A0
-#	RGB4_S3TC					= 0x83A1
-#	RGBA_S3TC					= 0x83A2
-#	RGBA4_S3TC					= 0x83A3
+S3_s3tc enum:
+	RGB_S3TC					= 0x83A0
+	RGB4_S3TC					= 0x83A1
+	RGBA_S3TC					= 0x83A2
+	RGBA4_S3TC					= 0x83A3
 
 # S3_future_use: 0x83A4-0x83BF
 
@@ -3474,59 +3658,63 @@
 
 # SGI (actually brokered for Id Software): 0x8450-0x845F
 
-# VERSION_1_5 enum: (Consistent naming scheme for OpenGL 1.5)
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# EXT_fog_coord enum:
-#	FOG_COORD_SRC					= GL_FOG_COORDINATE_SOURCE
-#	FOG_COORDINATE_SOURCE				= 0x8450 # 1 I
-#	FOG_COORDINATE_SOURCE_EXT			= 0x8450 # 1 I
-#	FOG_COORD					= GL_FOG_COORDINATE
-#	FOG_COORDINATE					= 0x8451
-#	FOG_COORDINATE_EXT				= 0x8451
-#	FRAGMENT_DEPTH					= 0x8452
-#	FRAGMENT_DEPTH_EXT				= 0x8452
-#	CURRENT_FOG_COORD				= GL_CURRENT_FOG_COORDINATE
-#	CURRENT_FOG_COORDINATE				= 0x8453 # 1 F
-#	CURRENT_FOG_COORDINATE_EXT			= 0x8453 # 1 F
-#	FOG_COORD_ARRAY_TYPE				= GL_FOG_COORDINATE_ARRAY_TYPE
-#	FOG_COORDINATE_ARRAY_TYPE			= 0x8454 # 1 I
-#	FOG_COORDINATE_ARRAY_TYPE_EXT			= 0x8454 # 1 I
-#	FOG_COORD_ARRAY_STRIDE				= GL_FOG_COORDINATE_ARRAY_STRIDE
-#	FOG_COORDINATE_ARRAY_STRIDE			= 0x8455 # 1 I
-#	FOG_COORDINATE_ARRAY_STRIDE_EXT			= 0x8455 # 1 I
-#	FOG_COORD_ARRAY_POINTER				= GL_FOG_COORDINATE_ARRAY_POINTER
-#	FOG_COORDINATE_ARRAY_POINTER			= 0x8456
-#	FOG_COORDINATE_ARRAY_POINTER_EXT		= 0x8456
-#	FOG_COORD_ARRAY					= GL_FOG_COORDINATE_ARRAY
-#	FOG_COORDINATE_ARRAY				= 0x8457 # 1 I
-#	FOG_COORDINATE_ARRAY_EXT			= 0x8457 # 1 I
+VERSION_1_5 enum: (Consistent naming scheme for OpenGL 1.5)
+	FOG_COORD_SRC					= 0x8450    # alias GL_FOG_COORDINATE_SOURCE
+	FOG_COORD					= 0x8451    # alias GL_FOG_COORDINATE
+	CURRENT_FOG_COORD				= 0x8453    # alias GL_CURRENT_FOG_COORDINATE
+	FOG_COORD_ARRAY_TYPE				= 0x8454    # alias GL_FOG_COORDINATE_ARRAY_TYPE
+	FOG_COORD_ARRAY_STRIDE				= 0x8455    # alias GL_FOG_COORDINATE_ARRAY_STRIDE
+	FOG_COORD_ARRAY_POINTER				= 0x8456    # alias GL_FOG_COORDINATE_ARRAY_POINTER
+	FOG_COORD_ARRAY					= 0x8457    # alias GL_FOG_COORDINATE_ARRAY
 
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# EXT_secondary_color enum:
-# ARB_vertex_program enum:
-#	COLOR_SUM					= 0x8458 # 1 I
-#	COLOR_SUM_EXT					= 0x8458 # 1 I
-#	COLOR_SUM_ARB					= 0x8458 # 1 I	# ARB_vertex_program
-#	CURRENT_SECONDARY_COLOR				= 0x8459 # 3 F
-#	CURRENT_SECONDARY_COLOR_EXT			= 0x8459 # 3 F
-#	SECONDARY_COLOR_ARRAY_SIZE			= 0x845A # 1 I
-#	SECONDARY_COLOR_ARRAY_SIZE_EXT			= 0x845A # 1 I
-#	SECONDARY_COLOR_ARRAY_TYPE			= 0x845B # 1 I
-#	SECONDARY_COLOR_ARRAY_TYPE_EXT			= 0x845B # 1 I
-#	SECONDARY_COLOR_ARRAY_STRIDE			= 0x845C # 1 I
-#	SECONDARY_COLOR_ARRAY_STRIDE_EXT		= 0x845C # 1 I
-#	SECONDARY_COLOR_ARRAY_POINTER			= 0x845D
-#	SECONDARY_COLOR_ARRAY_POINTER_EXT		= 0x845D
-#	SECONDARY_COLOR_ARRAY				= 0x845E # 1 I
-#	SECONDARY_COLOR_ARRAY_EXT			= 0x845E # 1 I
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	FOG_COORDINATE_SOURCE				= 0x8450 # 1 I
+	FOG_COORDINATE					= 0x8451
+	FRAGMENT_DEPTH					= 0x8452
+	CURRENT_FOG_COORDINATE				= 0x8453 # 1 F
+	FOG_COORDINATE_ARRAY_TYPE			= 0x8454 # 1 I
+	FOG_COORDINATE_ARRAY_STRIDE			= 0x8455 # 1 I
+	FOG_COORDINATE_ARRAY_POINTER			= 0x8456
+	FOG_COORDINATE_ARRAY				= 0x8457 # 1 I
 
-# VERSION_2_1 enum:
-#	CURRENT_RASTER_SECONDARY_COLOR			= 0x845F
+EXT_fog_coord enum:
+	FOG_COORDINATE_SOURCE_EXT			= 0x8450 # 1 I
+	FOG_COORDINATE_EXT				= 0x8451
+	FRAGMENT_DEPTH_EXT				= 0x8452
+	CURRENT_FOG_COORDINATE_EXT			= 0x8453 # 1 F
+	FOG_COORDINATE_ARRAY_TYPE_EXT			= 0x8454 # 1 I
+	FOG_COORDINATE_ARRAY_STRIDE_EXT			= 0x8455 # 1 I
+	FOG_COORDINATE_ARRAY_POINTER_EXT		= 0x8456
+	FOG_COORDINATE_ARRAY_EXT			= 0x8457 # 1 I
 
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	COLOR_SUM					= 0x8458 # 1 I
+	CURRENT_SECONDARY_COLOR				= 0x8459 # 3 F
+	SECONDARY_COLOR_ARRAY_SIZE			= 0x845A # 1 I
+	SECONDARY_COLOR_ARRAY_TYPE			= 0x845B # 1 I
+	SECONDARY_COLOR_ARRAY_STRIDE			= 0x845C # 1 I
+	SECONDARY_COLOR_ARRAY_POINTER			= 0x845D
+	SECONDARY_COLOR_ARRAY				= 0x845E # 1 I
+
+EXT_secondary_color enum:
+	COLOR_SUM_EXT					= 0x8458 # 1 I
+	CURRENT_SECONDARY_COLOR_EXT			= 0x8459 # 3 F
+	SECONDARY_COLOR_ARRAY_SIZE_EXT			= 0x845A # 1 I
+	SECONDARY_COLOR_ARRAY_TYPE_EXT			= 0x845B # 1 I
+	SECONDARY_COLOR_ARRAY_STRIDE_EXT		= 0x845C # 1 I
+	SECONDARY_COLOR_ARRAY_POINTER_EXT		= 0x845D
+	SECONDARY_COLOR_ARRAY_EXT			= 0x845E # 1 I
+
+ARB_vertex_program enum:
+	COLOR_SUM_ARB					= 0x8458 # 1 I	# ARB_vertex_program
+
+VERSION_2_1 enum:
+	CURRENT_RASTER_SECONDARY_COLOR			= 0x845F
+
 ###############################################################################
 
 # Incomplete extension, not in enumext.spec
-# SGIX_icc_texture enum:
+SGIX_icc_texture enum:
 #	RGB_ICC_SGIX					= 0x8460
 #	RGBA_ICC_SGIX					= 0x8461
 #	ALPHA_ICC_SGIX					= 0x8462
@@ -3567,9 +3755,9 @@
 
 # REND (Rendition): 0x8490-0x849F
 
-# REND_screen_coordinates enum:
-#	SCREEN_COORDINATES_REND				= 0x8490
-#	INVERTED_SCREEN_W_REND				= 0x8491
+REND_screen_coordinates enum:
+	SCREEN_COORDINATES_REND				= 0x8490
+	INVERTED_SCREEN_W_REND				= 0x8491
 
 ###############################################################################
 
@@ -3577,353 +3765,453 @@
 
 ###############################################################################
 
-# ARB: 0x84C0-0x84EF
+# OpenGL ARB: 0x84C0-0x84EF
 
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
-# ARB_multitexture enum:
-#	TEXTURE0					= 0x84C0
-#	TEXTURE0_ARB					= 0x84C0
-#	TEXTURE1					= 0x84C1
-#	TEXTURE1_ARB					= 0x84C1
-#	TEXTURE2					= 0x84C2
-#	TEXTURE2_ARB					= 0x84C2
-#	TEXTURE3					= 0x84C3
-#	TEXTURE3_ARB					= 0x84C3
-#	TEXTURE4					= 0x84C4
-#	TEXTURE4_ARB					= 0x84C4
-#	TEXTURE5					= 0x84C5
-#	TEXTURE5_ARB					= 0x84C5
-#	TEXTURE6					= 0x84C6
-#	TEXTURE6_ARB					= 0x84C6
-#	TEXTURE7					= 0x84C7
-#	TEXTURE7_ARB					= 0x84C7
-#	TEXTURE8					= 0x84C8
-#	TEXTURE8_ARB					= 0x84C8
-#	TEXTURE9					= 0x84C9
-#	TEXTURE9_ARB					= 0x84C9
-#	TEXTURE10					= 0x84CA
-#	TEXTURE10_ARB					= 0x84CA
-#	TEXTURE11					= 0x84CB
-#	TEXTURE11_ARB					= 0x84CB
-#	TEXTURE12					= 0x84CC
-#	TEXTURE12_ARB					= 0x84CC
-#	TEXTURE13					= 0x84CD
-#	TEXTURE13_ARB					= 0x84CD
-#	TEXTURE14					= 0x84CE
-#	TEXTURE14_ARB					= 0x84CE
-#	TEXTURE15					= 0x84CF
-#	TEXTURE15_ARB					= 0x84CF
-#	TEXTURE16					= 0x84D0
-#	TEXTURE16_ARB					= 0x84D0
-#	TEXTURE17					= 0x84D1
-#	TEXTURE17_ARB					= 0x84D1
-#	TEXTURE18					= 0x84D2
-#	TEXTURE18_ARB					= 0x84D2
-#	TEXTURE19					= 0x84D3
-#	TEXTURE19_ARB					= 0x84D3
-#	TEXTURE20					= 0x84D4
-#	TEXTURE20_ARB					= 0x84D4
-#	TEXTURE21					= 0x84D5
-#	TEXTURE21_ARB					= 0x84D5
-#	TEXTURE22					= 0x84D6
-#	TEXTURE22_ARB					= 0x84D6
-#	TEXTURE23					= 0x84D7
-#	TEXTURE23_ARB					= 0x84D7
-#	TEXTURE24					= 0x84D8
-#	TEXTURE24_ARB					= 0x84D8
-#	TEXTURE25					= 0x84D9
-#	TEXTURE25_ARB					= 0x84D9
-#	TEXTURE26					= 0x84DA
-#	TEXTURE26_ARB					= 0x84DA
-#	TEXTURE27					= 0x84DB
-#	TEXTURE27_ARB					= 0x84DB
-#	TEXTURE28					= 0x84DC
-#	TEXTURE28_ARB					= 0x84DC
-#	TEXTURE29					= 0x84DD
-#	TEXTURE29_ARB					= 0x84DD
-#	TEXTURE30					= 0x84DE
-#	TEXTURE30_ARB					= 0x84DE
-#	TEXTURE31					= 0x84DF
-#	TEXTURE31_ARB					= 0x84DF
-#	ACTIVE_TEXTURE					= 0x84E0 # 1 I
-#	ACTIVE_TEXTURE_ARB				= 0x84E0 # 1 I
-#	CLIENT_ACTIVE_TEXTURE				= 0x84E1 # 1 I
-#	CLIENT_ACTIVE_TEXTURE_ARB			= 0x84E1 # 1 I
-#	MAX_TEXTURE_UNITS				= 0x84E2 # 1 I
-#	MAX_TEXTURE_UNITS_ARB				= 0x84E2 # 1 I
+VERSION_1_3 enum: (Promoted for OpenGL 1.3)
+	TEXTURE0					= 0x84C0
+	TEXTURE1					= 0x84C1
+	TEXTURE2					= 0x84C2
+	TEXTURE3					= 0x84C3
+	TEXTURE4					= 0x84C4
+	TEXTURE5					= 0x84C5
+	TEXTURE6					= 0x84C6
+	TEXTURE7					= 0x84C7
+	TEXTURE8					= 0x84C8
+	TEXTURE9					= 0x84C9
+	TEXTURE10					= 0x84CA
+	TEXTURE11					= 0x84CB
+	TEXTURE12					= 0x84CC
+	TEXTURE13					= 0x84CD
+	TEXTURE14					= 0x84CE
+	TEXTURE15					= 0x84CF
+	TEXTURE16					= 0x84D0
+	TEXTURE17					= 0x84D1
+	TEXTURE18					= 0x84D2
+	TEXTURE19					= 0x84D3
+	TEXTURE20					= 0x84D4
+	TEXTURE21					= 0x84D5
+	TEXTURE22					= 0x84D6
+	TEXTURE23					= 0x84D7
+	TEXTURE24					= 0x84D8
+	TEXTURE25					= 0x84D9
+	TEXTURE26					= 0x84DA
+	TEXTURE27					= 0x84DB
+	TEXTURE28					= 0x84DC
+	TEXTURE29					= 0x84DD
+	TEXTURE30					= 0x84DE
+	TEXTURE31					= 0x84DF
+	ACTIVE_TEXTURE					= 0x84E0 # 1 I
+	CLIENT_ACTIVE_TEXTURE				= 0x84E1 # 1 I
+	MAX_TEXTURE_UNITS				= 0x84E2 # 1 I
 
+ARB_multitexture enum:
+	TEXTURE0_ARB					= 0x84C0
+	TEXTURE1_ARB					= 0x84C1
+	TEXTURE2_ARB					= 0x84C2
+	TEXTURE3_ARB					= 0x84C3
+	TEXTURE4_ARB					= 0x84C4
+	TEXTURE5_ARB					= 0x84C5
+	TEXTURE6_ARB					= 0x84C6
+	TEXTURE7_ARB					= 0x84C7
+	TEXTURE8_ARB					= 0x84C8
+	TEXTURE9_ARB					= 0x84C9
+	TEXTURE10_ARB					= 0x84CA
+	TEXTURE11_ARB					= 0x84CB
+	TEXTURE12_ARB					= 0x84CC
+	TEXTURE13_ARB					= 0x84CD
+	TEXTURE14_ARB					= 0x84CE
+	TEXTURE15_ARB					= 0x84CF
+	TEXTURE16_ARB					= 0x84D0
+	TEXTURE17_ARB					= 0x84D1
+	TEXTURE18_ARB					= 0x84D2
+	TEXTURE19_ARB					= 0x84D3
+	TEXTURE20_ARB					= 0x84D4
+	TEXTURE21_ARB					= 0x84D5
+	TEXTURE22_ARB					= 0x84D6
+	TEXTURE23_ARB					= 0x84D7
+	TEXTURE24_ARB					= 0x84D8
+	TEXTURE25_ARB					= 0x84D9
+	TEXTURE26_ARB					= 0x84DA
+	TEXTURE27_ARB					= 0x84DB
+	TEXTURE28_ARB					= 0x84DC
+	TEXTURE29_ARB					= 0x84DD
+	TEXTURE30_ARB					= 0x84DE
+	TEXTURE31_ARB					= 0x84DF
+	ACTIVE_TEXTURE_ARB				= 0x84E0 # 1 I
+	CLIENT_ACTIVE_TEXTURE_ARB			= 0x84E1 # 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 enum: (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
 
-
 ###############################################################################
 
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
-# ARB_transpose_matrix enum:
-#	TRANSPOSE_MODELVIEW_MATRIX			= 0x84E3 # 16 F
-#	TRANSPOSE_MODELVIEW_MATRIX_ARB			= 0x84E3 # 16 F
-#	TRANSPOSE_PROJECTION_MATRIX			= 0x84E4 # 16 F
-#	TRANSPOSE_PROJECTION_MATRIX_ARB			= 0x84E4 # 16 F
-#	TRANSPOSE_TEXTURE_MATRIX			= 0x84E5 # 16 F
-#	TRANSPOSE_TEXTURE_MATRIX_ARB			= 0x84E5 # 16 F
-#	TRANSPOSE_COLOR_MATRIX				= 0x84E6 # 16 F
-#	TRANSPOSE_COLOR_MATRIX_ARB			= 0x84E6 # 16 F
+VERSION_1_3 enum: (Promoted for OpenGL 1.3)
+	TRANSPOSE_MODELVIEW_MATRIX			= 0x84E3 # 16 F
+	TRANSPOSE_PROJECTION_MATRIX			= 0x84E4 # 16 F
+	TRANSPOSE_TEXTURE_MATRIX			= 0x84E5 # 16 F
+	TRANSPOSE_COLOR_MATRIX				= 0x84E6 # 16 F
 
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
-# ARB_texture_env_combine enum:
-#	SUBTRACT					= 0x84E7
-#	SUBTRACT_ARB					= 0x84E7
+ARB_transpose_matrix enum:
+	TRANSPOSE_MODELVIEW_MATRIX_ARB			= 0x84E3 # 16 F
+	TRANSPOSE_PROJECTION_MATRIX_ARB			= 0x84E4 # 16 F
+	TRANSPOSE_TEXTURE_MATRIX_ARB			= 0x84E5 # 16 F
+	TRANSPOSE_COLOR_MATRIX_ARB			= 0x84E6 # 16 F
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# EXT_framebuffer_object (additional; see below):
-#	MAX_RENDERBUFFER_SIZE				= 0x84E8	# 3.0 / ARB_fbo
-#	MAX_RENDERBUFFER_SIZE_EXT			= 0x84E8
+VERSION_1_3 enum: (Promoted for OpenGL 1.3)
+	SUBTRACT					= 0x84E7
 
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
-# ARB_texture_compression enum:
-#	COMPRESSED_ALPHA				= 0x84E9
-#	COMPRESSED_ALPHA_ARB				= 0x84E9
-#	COMPRESSED_LUMINANCE				= 0x84EA
-#	COMPRESSED_LUMINANCE_ARB			= 0x84EA
-#	COMPRESSED_LUMINANCE_ALPHA			= 0x84EB
-#	COMPRESSED_LUMINANCE_ALPHA_ARB			= 0x84EB
-#	COMPRESSED_INTENSITY				= 0x84EC
-#	COMPRESSED_INTENSITY_ARB			= 0x84EC
-#	COMPRESSED_RGB					= 0x84ED
-#	COMPRESSED_RGB_ARB				= 0x84ED
-#	COMPRESSED_RGBA					= 0x84EE
-#	COMPRESSED_RGBA_ARB				= 0x84EE
-#	TEXTURE_COMPRESSION_HINT			= 0x84EF
-#	TEXTURE_COMPRESSION_HINT_ARB			= 0x84EF
-#	TEXTURE_COMPRESSED_IMAGE_SIZE			= 0x86A0
-#	TEXTURE_COMPRESSED_IMAGE_SIZE_ARB		= 0x86A0
-#	TEXTURE_COMPRESSED				= 0x86A1
-#	TEXTURE_COMPRESSED_ARB				= 0x86A1
-#	NUM_COMPRESSED_TEXTURE_FORMATS			= 0x86A2
-#	NUM_COMPRESSED_TEXTURE_FORMATS_ARB		= 0x86A2
-#	COMPRESSED_TEXTURE_FORMATS			= 0x86A3
-#	COMPRESSED_TEXTURE_FORMATS_ARB			= 0x86A3
+ARB_texture_env_combine enum:
+	SUBTRACT_ARB					= 0x84E7
 
+VERSION_3_0 enum:
+	use ARB_framebuffer_object	    MAX_RENDERBUFFER_SIZE
+
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	MAX_RENDERBUFFER_SIZE				= 0x84E8    # VERSION_3_0 / ARB_fbo
+
+EXT_framebuffer_object enum: (additional; see below):
+	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)
+	COMPRESSED_ALPHA				= 0x84E9
+	COMPRESSED_LUMINANCE				= 0x84EA
+	COMPRESSED_LUMINANCE_ALPHA			= 0x84EB
+	COMPRESSED_INTENSITY				= 0x84EC
+	COMPRESSED_RGB					= 0x84ED
+	COMPRESSED_RGBA					= 0x84EE
+	TEXTURE_COMPRESSION_HINT			= 0x84EF
+	TEXTURE_COMPRESSED_IMAGE_SIZE			= 0x86A0
+	TEXTURE_COMPRESSED				= 0x86A1
+	NUM_COMPRESSED_TEXTURE_FORMATS			= 0x86A2
+	COMPRESSED_TEXTURE_FORMATS			= 0x86A3
+
+ARB_texture_compression enum:
+	COMPRESSED_ALPHA_ARB				= 0x84E9
+	COMPRESSED_LUMINANCE_ARB			= 0x84EA
+	COMPRESSED_LUMINANCE_ALPHA_ARB			= 0x84EB
+	COMPRESSED_INTENSITY_ARB			= 0x84EC
+	COMPRESSED_RGB_ARB				= 0x84ED
+	COMPRESSED_RGBA_ARB				= 0x84EE
+	TEXTURE_COMPRESSION_HINT_ARB			= 0x84EF
+	TEXTURE_COMPRESSED_IMAGE_SIZE_ARB		= 0x86A0
+	TEXTURE_COMPRESSED_ARB				= 0x86A1
+	NUM_COMPRESSED_TEXTURE_FORMATS_ARB		= 0x86A2
+	COMPRESSED_TEXTURE_FORMATS_ARB			= 0x86A3
+
 ###############################################################################
 
 # NVIDIA: 0x84F0-0x855F
 
 # NV_future_use: 0x84F0-0x84F1
 
-# NV_fence enum:
-#	ALL_COMPLETED_NV				= 0x84F2
-#	FENCE_STATUS_NV					= 0x84F3
-#	FENCE_CONDITION_NV				= 0x84F4
+NV_fence enum:
+	ALL_COMPLETED_NV				= 0x84F2
+	FENCE_STATUS_NV					= 0x84F3
+	FENCE_CONDITION_NV				= 0x84F4
 
-# ARB_texture_rectangle enum:
-# NV_texture_rectangle enum:
-#	TEXTURE_RECTANGLE_ARB				= 0x84F5
-#	TEXTURE_RECTANGLE_NV				= 0x84F5
-#	TEXTURE_BINDING_RECTANGLE_ARB			= 0x84F6
-#	TEXTURE_BINDING_RECTANGLE_NV			= 0x84F6
-#	PROXY_TEXTURE_RECTANGLE_ARB			= 0x84F7
-#	PROXY_TEXTURE_RECTANGLE_NV			= 0x84F7
-#	MAX_RECTANGLE_TEXTURE_SIZE_ARB			= 0x84F8
-#	MAX_RECTANGLE_TEXTURE_SIZE_NV			= 0x84F8
+VERSION_3_1 enum:
+	TEXTURE_RECTANGLE				= 0x84F5
+	TEXTURE_BINDING_RECTANGLE			= 0x84F6
+	PROXY_TEXTURE_RECTANGLE				= 0x84F7
+	MAX_RECTANGLE_TEXTURE_SIZE			= 0x84F8
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# EXT_packed_depth_stencil enum:
-# NV_packed_depth_stencil enum:
-#	DEPTH_STENCIL					= 0x84F9    # 3.0 / ARB_fbo
-#	DEPTH_STENCIL_EXT				= 0x84F9
-#	DEPTH_STENCIL_NV				= 0x84F9
-#	UNSIGNED_INT_24_8				= 0x84FA    # 3.0 / ARB_fbo
-#	UNSIGNED_INT_24_8_EXT				= 0x84FA
-#	UNSIGNED_INT_24_8_NV				= 0x84FA
+ARB_texture_rectangle enum:
+	TEXTURE_RECTANGLE_ARB				= 0x84F5
+	TEXTURE_BINDING_RECTANGLE_ARB			= 0x84F6
+	PROXY_TEXTURE_RECTANGLE_ARB			= 0x84F7
+	MAX_RECTANGLE_TEXTURE_SIZE_ARB			= 0x84F8
 
+NV_texture_rectangle enum:
+	TEXTURE_RECTANGLE_NV				= 0x84F5
+	TEXTURE_BINDING_RECTANGLE_NV			= 0x84F6
+	PROXY_TEXTURE_RECTANGLE_NV			= 0x84F7
+	MAX_RECTANGLE_TEXTURE_SIZE_NV			= 0x84F8
+
+VERSION_3_0 enum:
+	use ARB_framebuffer_object	    DEPTH_STENCIL
+	use ARB_framebuffer_object	    UNSIGNED_INT_24_8
+
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	DEPTH_STENCIL					= 0x84F9    # VERSION_3_0 / ARB_fbo
+	UNSIGNED_INT_24_8				= 0x84FA    # VERSION_3_0 / ARB_fbo
+
+EXT_packed_depth_stencil enum:
+	DEPTH_STENCIL_EXT				= 0x84F9
+	UNSIGNED_INT_24_8_EXT				= 0x84FA
+
+NV_packed_depth_stencil enum:
+	DEPTH_STENCIL_NV				= 0x84F9
+	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)
-# EXT_texture_lod_bias enum:
-#	MAX_TEXTURE_LOD_BIAS				= 0x84FD
-#	MAX_TEXTURE_LOD_BIAS_EXT			= 0x84FD
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	MAX_TEXTURE_LOD_BIAS				= 0x84FD
 
-# EXT_texture_filter_anisotropic enum:
-#	TEXTURE_MAX_ANISOTROPY_EXT			= 0x84FE
-#	MAX_TEXTURE_MAX_ANISOTROPY_EXT			= 0x84FF
+EXT_texture_lod_bias enum:
+	MAX_TEXTURE_LOD_BIAS_EXT			= 0x84FD
 
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# EXT_texture_lod_bias enum:
-#	TEXTURE_FILTER_CONTROL				= 0x8500
-#	TEXTURE_FILTER_CONTROL_EXT			= 0x8500
-#	TEXTURE_LOD_BIAS				= 0x8501
-#	TEXTURE_LOD_BIAS_EXT				= 0x8501
+EXT_texture_filter_anisotropic enum:
+	TEXTURE_MAX_ANISOTROPY_EXT			= 0x84FE
+	MAX_TEXTURE_MAX_ANISOTROPY_EXT			= 0x84FF
 
-# EXT_vertex_weighting enum:
-#	MODELVIEW1_STACK_DEPTH_EXT			= 0x8502
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	TEXTURE_FILTER_CONTROL				= 0x8500
+	TEXTURE_LOD_BIAS				= 0x8501
 
+EXT_texture_lod_bias enum:
+	TEXTURE_FILTER_CONTROL_EXT			= 0x8500
+	TEXTURE_LOD_BIAS_EXT				= 0x8501
+
+EXT_vertex_weighting enum:
+	MODELVIEW1_STACK_DEPTH_EXT			= 0x8502
+
 # NV_texture_env_combine4 (additional; see below): 0x8503
 
-# NV_light_max_exponent enum:
-#	MAX_SHININESS_NV				= 0x8504
-#	MAX_SPOT_EXPONENT_NV				= 0x8505
+NV_light_max_exponent enum:
+	MAX_SHININESS_NV				= 0x8504
+	MAX_SPOT_EXPONENT_NV				= 0x8505
 
-# EXT_vertex_weighting enum:
-#	MODELVIEW_MATRIX1_EXT				= 0x8506
+EXT_vertex_weighting enum:
+	MODELVIEW_MATRIX1_EXT				= 0x8506
 
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# EXT_stencil_wrap enum:
-#	INCR_WRAP					= 0x8507
-#	INCR_WRAP_EXT					= 0x8507
-#	DECR_WRAP					= 0x8508
-#	DECR_WRAP_EXT					= 0x8508
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	INCR_WRAP					= 0x8507
+	DECR_WRAP					= 0x8508
 
-# EXT_vertex_weighting enum:
-#	VERTEX_WEIGHTING_EXT				= 0x8509
-#	MODELVIEW1_EXT					= 0x850A
-#	CURRENT_VERTEX_WEIGHT_EXT			= 0x850B
-#	VERTEX_WEIGHT_ARRAY_EXT				= 0x850C
-#	VERTEX_WEIGHT_ARRAY_SIZE_EXT			= 0x850D
-#	VERTEX_WEIGHT_ARRAY_TYPE_EXT			= 0x850E
-#	VERTEX_WEIGHT_ARRAY_STRIDE_EXT			= 0x850F
-#	VERTEX_WEIGHT_ARRAY_POINTER_EXT			= 0x8510
+EXT_stencil_wrap enum:
+	INCR_WRAP_EXT					= 0x8507
+	DECR_WRAP_EXT					= 0x8508
 
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
-# Note: these are also exposed as NV and EXT, as well as ARB
-# NV_texgen_reflection enum:
-# EXT_texture_cube_map enum:
-# ARB_texture_cube_map enum:
-#	NORMAL_MAP					= 0x8511
-#	NORMAL_MAP_ARB					= 0x8511
-#	REFLECTION_MAP					= 0x8512
-#	REFLECTION_MAP_ARB				= 0x8512
-#	TEXTURE_CUBE_MAP				= 0x8513
-#	TEXTURE_CUBE_MAP_ARB				= 0x8513
-#	TEXTURE_BINDING_CUBE_MAP			= 0x8514
-#	TEXTURE_BINDING_CUBE_MAP_ARB			= 0x8514
-#	TEXTURE_CUBE_MAP_POSITIVE_X			= 0x8515
-#	TEXTURE_CUBE_MAP_POSITIVE_X_ARB			= 0x8515
-#	TEXTURE_CUBE_MAP_NEGATIVE_X			= 0x8516
-#	TEXTURE_CUBE_MAP_NEGATIVE_X_ARB			= 0x8516
-#	TEXTURE_CUBE_MAP_POSITIVE_Y			= 0x8517
-#	TEXTURE_CUBE_MAP_POSITIVE_Y_ARB			= 0x8517
-#	TEXTURE_CUBE_MAP_NEGATIVE_Y			= 0x8518
-#	TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB			= 0x8518
-#	TEXTURE_CUBE_MAP_POSITIVE_Z			= 0x8519
-#	TEXTURE_CUBE_MAP_POSITIVE_Z_ARB			= 0x8519
-#	TEXTURE_CUBE_MAP_NEGATIVE_Z			= 0x851A
-#	TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB			= 0x851A
-#	PROXY_TEXTURE_CUBE_MAP				= 0x851B
-#	PROXY_TEXTURE_CUBE_MAP_ARB			= 0x851B
-#	MAX_CUBE_MAP_TEXTURE_SIZE			= 0x851C
-#	MAX_CUBE_MAP_TEXTURE_SIZE_ARB			= 0x851C
+# Aliases EXT_stencil_wrap enums above
+OES_stencil_wrap enum: (OpenGL ES only)
+	INCR_WRAP_OES					= 0x8507
+	DECR_WRAP_OES					= 0x8508
 
-# NV_vertex_array_range enum:
-#	VERTEX_ARRAY_RANGE_NV				= 0x851D
-#	VERTEX_ARRAY_RANGE_LENGTH_NV			= 0x851E
-#	VERTEX_ARRAY_RANGE_VALID_NV			= 0x851F
-#	MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV		= 0x8520
-#	VERTEX_ARRAY_RANGE_POINTER_NV			= 0x8521
+EXT_vertex_weighting enum:
+	VERTEX_WEIGHTING_EXT				= 0x8509
+	MODELVIEW1_EXT					= 0x850A
+	CURRENT_VERTEX_WEIGHT_EXT			= 0x850B
+	VERTEX_WEIGHT_ARRAY_EXT				= 0x850C
+	VERTEX_WEIGHT_ARRAY_SIZE_EXT			= 0x850D
+	VERTEX_WEIGHT_ARRAY_TYPE_EXT			= 0x850E
+	VERTEX_WEIGHT_ARRAY_STRIDE_EXT			= 0x850F
+	VERTEX_WEIGHT_ARRAY_POINTER_EXT			= 0x8510
 
+VERSION_1_3 enum: (Promoted for OpenGL 1.3)
+	NORMAL_MAP					= 0x8511
+	REFLECTION_MAP					= 0x8512
+	TEXTURE_CUBE_MAP				= 0x8513
+	TEXTURE_BINDING_CUBE_MAP			= 0x8514
+	TEXTURE_CUBE_MAP_POSITIVE_X			= 0x8515
+	TEXTURE_CUBE_MAP_NEGATIVE_X			= 0x8516
+	TEXTURE_CUBE_MAP_POSITIVE_Y			= 0x8517
+	TEXTURE_CUBE_MAP_NEGATIVE_Y			= 0x8518
+	TEXTURE_CUBE_MAP_POSITIVE_Z			= 0x8519
+	TEXTURE_CUBE_MAP_NEGATIVE_Z			= 0x851A
+	PROXY_TEXTURE_CUBE_MAP				= 0x851B
+	MAX_CUBE_MAP_TEXTURE_SIZE			= 0x851C
+
+EXT_texture_cube_map enum:
+	NORMAL_MAP_EXT					= 0x8511
+	REFLECTION_MAP_EXT				= 0x8512
+	TEXTURE_CUBE_MAP_EXT				= 0x8513
+	TEXTURE_BINDING_CUBE_MAP_EXT			= 0x8514
+	TEXTURE_CUBE_MAP_POSITIVE_X_EXT			= 0x8515
+	TEXTURE_CUBE_MAP_NEGATIVE_X_EXT			= 0x8516
+	TEXTURE_CUBE_MAP_POSITIVE_Y_EXT			= 0x8517
+	TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT			= 0x8518
+	TEXTURE_CUBE_MAP_POSITIVE_Z_EXT			= 0x8519
+	TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT			= 0x851A
+	PROXY_TEXTURE_CUBE_MAP_EXT			= 0x851B
+	MAX_CUBE_MAP_TEXTURE_SIZE_EXT			= 0x851C
+
+NV_texgen_reflection enum:
+	NORMAL_MAP					= 0x8511
+	REFLECTION_MAP					= 0x8512
+
+ARB_texture_cube_map enum:
+	NORMAL_MAP_ARB					= 0x8511
+	REFLECTION_MAP_ARB				= 0x8512
+	TEXTURE_CUBE_MAP_ARB				= 0x8513
+	TEXTURE_BINDING_CUBE_MAP_ARB			= 0x8514
+	TEXTURE_CUBE_MAP_POSITIVE_X_ARB			= 0x8515
+	TEXTURE_CUBE_MAP_NEGATIVE_X_ARB			= 0x8516
+	TEXTURE_CUBE_MAP_POSITIVE_Y_ARB			= 0x8517
+	TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB			= 0x8518
+	TEXTURE_CUBE_MAP_POSITIVE_Z_ARB			= 0x8519
+	TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB			= 0x851A
+	PROXY_TEXTURE_CUBE_MAP_ARB			= 0x851B
+	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
+	VERTEX_ARRAY_RANGE_VALID_NV			= 0x851F
+	MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV		= 0x8520
+	VERTEX_ARRAY_RANGE_POINTER_NV			= 0x8521
+
 # @@@ How does this interact with NV_vertex_array_range?
-# APPLE_vertex_array_range enum:
-#	VERTEX_ARRAY_RANGE_APPLE			= 0x851D
-#	VERTEX_ARRAY_RANGE_LENGTH_APPLE			= 0x851E
-#	VERTEX_ARRAY_STORAGE_HINT_APPLE			= 0x851F
-#	VERTEX_ARRAY_RANGE_POINTER_APPLE		= 0x8521
-#	STORAGE_CACHED_APPLE				= 0x85BE
-#	STORAGE_SHARED_APPLE				= 0x85BF
+APPLE_vertex_array_range enum:
+	VERTEX_ARRAY_RANGE_APPLE			= 0x851D
+	VERTEX_ARRAY_RANGE_LENGTH_APPLE			= 0x851E
+	VERTEX_ARRAY_STORAGE_HINT_APPLE			= 0x851F
+	VERTEX_ARRAY_RANGE_POINTER_APPLE		= 0x8521
+	STORAGE_CACHED_APPLE				= 0x85BE
+	STORAGE_SHARED_APPLE				= 0x85BF
 
-# NV_register_combiners enum:
-#	REGISTER_COMBINERS_NV				= 0x8522
-#	VARIABLE_A_NV					= 0x8523
-#	VARIABLE_B_NV					= 0x8524
-#	VARIABLE_C_NV					= 0x8525
-#	VARIABLE_D_NV					= 0x8526
-#	VARIABLE_E_NV					= 0x8527
-#	VARIABLE_F_NV					= 0x8528
-#	VARIABLE_G_NV					= 0x8529
-#	CONSTANT_COLOR0_NV				= 0x852A
-#	CONSTANT_COLOR1_NV				= 0x852B
-#	PRIMARY_COLOR_NV				= 0x852C
-#	SECONDARY_COLOR_NV				= 0x852D
-#	SPARE0_NV					= 0x852E
-#	SPARE1_NV					= 0x852F
-#	DISCARD_NV					= 0x8530
-#	E_TIMES_F_NV					= 0x8531
-#	SPARE0_PLUS_SECONDARY_COLOR_NV			= 0x8532
-#	UNSIGNED_IDENTITY_NV				= 0x8536
-#	UNSIGNED_INVERT_NV				= 0x8537
-#	EXPAND_NORMAL_NV				= 0x8538
-#	EXPAND_NEGATE_NV				= 0x8539
-#	HALF_BIAS_NORMAL_NV				= 0x853A
-#	HALF_BIAS_NEGATE_NV				= 0x853B
-#	SIGNED_IDENTITY_NV				= 0x853C
-#	UNSIGNED_NEGATE_NV				= 0x853D
-#	SCALE_BY_TWO_NV					= 0x853E
-#	SCALE_BY_FOUR_NV				= 0x853F
-#	SCALE_BY_ONE_HALF_NV				= 0x8540
-#	BIAS_BY_NEGATIVE_ONE_HALF_NV			= 0x8541
-#	COMBINER_INPUT_NV				= 0x8542
-#	COMBINER_MAPPING_NV				= 0x8543
-#	COMBINER_COMPONENT_USAGE_NV			= 0x8544
-#	COMBINER_AB_DOT_PRODUCT_NV			= 0x8545
-#	COMBINER_CD_DOT_PRODUCT_NV			= 0x8546
-#	COMBINER_MUX_SUM_NV				= 0x8547
-#	COMBINER_SCALE_NV				= 0x8548
-#	COMBINER_BIAS_NV				= 0x8549
-#	COMBINER_AB_OUTPUT_NV				= 0x854A
-#	COMBINER_CD_OUTPUT_NV				= 0x854B
-#	COMBINER_SUM_OUTPUT_NV				= 0x854C
-#	MAX_GENERAL_COMBINERS_NV			= 0x854D
-#	NUM_GENERAL_COMBINERS_NV			= 0x854E
-#	COLOR_SUM_CLAMP_NV				= 0x854F
-#	COMBINER0_NV					= 0x8550
-#	COMBINER1_NV					= 0x8551
-#	COMBINER2_NV					= 0x8552
-#	COMBINER3_NV					= 0x8553
-#	COMBINER4_NV					= 0x8554
-#	COMBINER5_NV					= 0x8555
-#	COMBINER6_NV					= 0x8556
-#	COMBINER7_NV					= 0x8557
+NV_register_combiners enum:
+	REGISTER_COMBINERS_NV				= 0x8522
+	VARIABLE_A_NV					= 0x8523
+	VARIABLE_B_NV					= 0x8524
+	VARIABLE_C_NV					= 0x8525
+	VARIABLE_D_NV					= 0x8526
+	VARIABLE_E_NV					= 0x8527
+	VARIABLE_F_NV					= 0x8528
+	VARIABLE_G_NV					= 0x8529
+	CONSTANT_COLOR0_NV				= 0x852A
+	CONSTANT_COLOR1_NV				= 0x852B
+	PRIMARY_COLOR_NV				= 0x852C
+	SECONDARY_COLOR_NV				= 0x852D
+	SPARE0_NV					= 0x852E
+	SPARE1_NV					= 0x852F
+	DISCARD_NV					= 0x8530
+	E_TIMES_F_NV					= 0x8531
+	SPARE0_PLUS_SECONDARY_COLOR_NV			= 0x8532
 
 # NV_vertex_array_range2:
-#	VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV		= 0x8533
+	VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV		= 0x8533
 
 # NV_multisample_filter_hint:
-#	MULTISAMPLE_FILTER_HINT_NV			= 0x8534
+	MULTISAMPLE_FILTER_HINT_NV			= 0x8534
 
-# NV_register_combiners2 enum:
-#	PER_STAGE_CONSTANTS_NV				= 0x8535
+NV_register_combiners2 enum:
+	PER_STAGE_CONSTANTS_NV				= 0x8535
 
-# NV_register_combiners (additional; see above): 0x8536-0x8557
+NV_register_combiners enum: (additional; see above):
+	UNSIGNED_IDENTITY_NV				= 0x8536
+	UNSIGNED_INVERT_NV				= 0x8537
+	EXPAND_NORMAL_NV				= 0x8538
+	EXPAND_NEGATE_NV				= 0x8539
+	HALF_BIAS_NORMAL_NV				= 0x853A
+	HALF_BIAS_NEGATE_NV				= 0x853B
+	SIGNED_IDENTITY_NV				= 0x853C
+	UNSIGNED_NEGATE_NV				= 0x853D
+	SCALE_BY_TWO_NV					= 0x853E
+	SCALE_BY_FOUR_NV				= 0x853F
+	SCALE_BY_ONE_HALF_NV				= 0x8540
+	BIAS_BY_NEGATIVE_ONE_HALF_NV			= 0x8541
+	COMBINER_INPUT_NV				= 0x8542
+	COMBINER_MAPPING_NV				= 0x8543
+	COMBINER_COMPONENT_USAGE_NV			= 0x8544
+	COMBINER_AB_DOT_PRODUCT_NV			= 0x8545
+	COMBINER_CD_DOT_PRODUCT_NV			= 0x8546
+	COMBINER_MUX_SUM_NV				= 0x8547
+	COMBINER_SCALE_NV				= 0x8548
+	COMBINER_BIAS_NV				= 0x8549
+	COMBINER_AB_OUTPUT_NV				= 0x854A
+	COMBINER_CD_OUTPUT_NV				= 0x854B
+	COMBINER_SUM_OUTPUT_NV				= 0x854C
+	MAX_GENERAL_COMBINERS_NV			= 0x854D
+	NUM_GENERAL_COMBINERS_NV			= 0x854E
+	COLOR_SUM_CLAMP_NV				= 0x854F
+	COMBINER0_NV					= 0x8550
+	COMBINER1_NV					= 0x8551
+	COMBINER2_NV					= 0x8552
+	COMBINER3_NV					= 0x8553
+	COMBINER4_NV					= 0x8554
+	COMBINER5_NV					= 0x8555
+	COMBINER6_NV					= 0x8556
+	COMBINER7_NV					= 0x8557
 
-# NV_primitive_restart enum:
-#	PRIMITIVE_RESTART_NV				= 0x8558
-#	PRIMITIVE_RESTART_INDEX_NV			= 0x8559
 
-# NV_fog_distance enum:
-#	FOG_GEN_MODE_NV					= 0x855A
-#	EYE_RADIAL_NV					= 0x855B
-#	EYE_PLANE_ABSOLUTE_NV				= 0x855C
+NV_primitive_restart enum:
+	PRIMITIVE_RESTART_NV				= 0x8558
+	PRIMITIVE_RESTART_INDEX_NV			= 0x8559
 
-# NV_texgen_emboss enum:
-#	EMBOSS_LIGHT_NV					= 0x855D
-#	EMBOSS_CONSTANT_NV				= 0x855E
-#	EMBOSS_MAP_NV					= 0x855F
+NV_fog_distance enum:
+	FOG_GEN_MODE_NV					= 0x855A
+	EYE_RADIAL_NV					= 0x855B
+	EYE_PLANE_ABSOLUTE_NV				= 0x855C
 
+NV_texgen_emboss enum:
+	EMBOSS_LIGHT_NV					= 0x855D
+	EMBOSS_CONSTANT_NV				= 0x855E
+	EMBOSS_MAP_NV					= 0x855F
+
 ###############################################################################
 
 # Intergraph/Intense3D/3Dlabs: 0x8560-0x856F
 
-# INGR_color_clamp enum:
-#	RED_MIN_CLAMP_INGR				= 0x8560
-#	GREEN_MIN_CLAMP_INGR				= 0x8561
-#	BLUE_MIN_CLAMP_INGR				= 0x8562
-#	ALPHA_MIN_CLAMP_INGR				= 0x8563
-#	RED_MAX_CLAMP_INGR				= 0x8564
-#	GREEN_MAX_CLAMP_INGR				= 0x8565
-#	BLUE_MAX_CLAMP_INGR				= 0x8566
-#	ALPHA_MAX_CLAMP_INGR				= 0x8567
+INGR_color_clamp enum:
+	RED_MIN_CLAMP_INGR				= 0x8560
+	GREEN_MIN_CLAMP_INGR				= 0x8561
+	BLUE_MIN_CLAMP_INGR				= 0x8562
+	ALPHA_MIN_CLAMP_INGR				= 0x8563
+	RED_MAX_CLAMP_INGR				= 0x8564
+	GREEN_MAX_CLAMP_INGR				= 0x8565
+	BLUE_MAX_CLAMP_INGR				= 0x8566
+	ALPHA_MAX_CLAMP_INGR				= 0x8567
 
-# INGR_interlace_read enum:
-#	INTERLACE_READ_INGR				= 0x8568
+INGR_interlace_read enum:
+	INTERLACE_READ_INGR				= 0x8568
 
 # 3Dlabs_future_use: 0x8569-0x856F
 
@@ -3931,65 +4219,67 @@
 
 # ATI/NVIDIA: 0x8570-0x859F
 
-# VERSION_1_5 enum: (Consistent naming scheme for OpenGL 1.5)
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
-# EXT_texture_env_combine enum:
-#	COMBINE						= 0x8570
-#	COMBINE_EXT					= 0x8570
-#	COMBINE_RGB					= 0x8571
-#	COMBINE_RGB_EXT					= 0x8571
-#	COMBINE_ALPHA					= 0x8572
-#	COMBINE_ALPHA_EXT				= 0x8572
-#	RGB_SCALE					= 0x8573
-#	RGB_SCALE_EXT					= 0x8573
-#	ADD_SIGNED					= 0x8574
-#	ADD_SIGNED_EXT					= 0x8574
-#	INTERPOLATE					= 0x8575
-#	INTERPOLATE_EXT					= 0x8575
-#	CONSTANT					= 0x8576
-#	CONSTANT_EXT					= 0x8576
-#	PRIMARY_COLOR					= 0x8577
-#	PRIMARY_COLOR_EXT				= 0x8577
-#	PREVIOUS					= 0x8578
-#	PREVIOUS_EXT					= 0x8578
-#	SRC0_RGB					= GL_SOURCE0_RGB
-#	SOURCE0_RGB					= 0x8580
-#	SOURCE0_RGB_EXT					= 0x8580
-#	SRC1_RGB					= GL_SOURCE1_RGB
-#	SOURCE1_RGB					= 0x8581
-#	SOURCE1_RGB_EXT					= 0x8581
-#	SRC2_RGB					= GL_SOURCE2_RGB
-#	SOURCE2_RGB					= 0x8582
-#	SOURCE2_RGB_EXT					= 0x8582
-#	SRC0_ALPHA					= GL_SOURCE0_ALPHA
-#	SOURCE0_ALPHA					= 0x8588
-#	SOURCE0_ALPHA_EXT				= 0x8588
-#	SRC1_ALPHA					= GL_SOURCE1_ALPHA
-#	SOURCE1_ALPHA					= 0x8589
-#	SOURCE1_ALPHA_EXT				= 0x8589
-#	SRC2_ALPHA					= GL_SOURCE2_ALPHA
-#	SOURCE2_ALPHA					= 0x858A
-#	SOURCE2_ALPHA_EXT				= 0x858A
-#	OPERAND0_RGB					= 0x8590
-#	OPERAND0_RGB_EXT				= 0x8590
-#	OPERAND1_RGB					= 0x8591
-#	OPERAND1_RGB_EXT				= 0x8591
-#	OPERAND2_RGB					= 0x8592
-#	OPERAND2_RGB_EXT				= 0x8592
-#	OPERAND0_ALPHA					= 0x8598
-#	OPERAND0_ALPHA_EXT				= 0x8598
-#	OPERAND1_ALPHA					= 0x8599
-#	OPERAND1_ALPHA_EXT				= 0x8599
-#	OPERAND2_ALPHA					= 0x859A
-#	OPERAND2_ALPHA_EXT				= 0x859A
+VERSION_1_5 enum: (Consistent naming scheme for OpenGL 1.5)
+	SRC0_RGB					= 0x8580    # alias GL_SOURCE0_RGB
+	SRC1_RGB					= 0x8581    # alias GL_SOURCE1_RGB
+	SRC2_RGB					= 0x8582    # alias GL_SOURCE2_RGB
+	SRC0_ALPHA					= 0x8588    # alias GL_SOURCE0_ALPHA
+	SRC1_ALPHA					= 0x8589    # alias GL_SOURCE1_ALPHA
+	SRC2_ALPHA					= 0x858A    # alias GL_SOURCE2_ALPHA
 
-# NV_texture_env_combine4 enum:
-#	COMBINE4_NV					= 0x8503
-#	SOURCE3_RGB_NV					= 0x8583
-#	SOURCE3_ALPHA_NV				= 0x858B
-#	OPERAND3_RGB_NV					= 0x8593
-#	OPERAND3_ALPHA_NV				= 0x859B
+VERSION_1_3 enum: (Promoted for OpenGL 1.3)
+	COMBINE						= 0x8570
+	COMBINE_RGB					= 0x8571
+	COMBINE_ALPHA					= 0x8572
+	RGB_SCALE					= 0x8573
+	ADD_SIGNED					= 0x8574
+	INTERPOLATE					= 0x8575
+	CONSTANT					= 0x8576
+	PRIMARY_COLOR					= 0x8577
+	PREVIOUS					= 0x8578
+	SOURCE0_RGB					= 0x8580
+	SOURCE1_RGB					= 0x8581
+	SOURCE2_RGB					= 0x8582
+	SOURCE0_ALPHA					= 0x8588
+	SOURCE1_ALPHA					= 0x8589
+	SOURCE2_ALPHA					= 0x858A
+	OPERAND0_RGB					= 0x8590
+	OPERAND1_RGB					= 0x8591
+	OPERAND2_RGB					= 0x8592
+	OPERAND0_ALPHA					= 0x8598
+	OPERAND1_ALPHA					= 0x8599
+	OPERAND2_ALPHA					= 0x859A
 
+EXT_texture_env_combine enum:
+	COMBINE_EXT					= 0x8570
+	COMBINE_RGB_EXT					= 0x8571
+	COMBINE_ALPHA_EXT				= 0x8572
+	RGB_SCALE_EXT					= 0x8573
+	ADD_SIGNED_EXT					= 0x8574
+	INTERPOLATE_EXT					= 0x8575
+	CONSTANT_EXT					= 0x8576
+	PRIMARY_COLOR_EXT				= 0x8577
+	PREVIOUS_EXT					= 0x8578
+	SOURCE0_RGB_EXT					= 0x8580
+	SOURCE1_RGB_EXT					= 0x8581
+	SOURCE2_RGB_EXT					= 0x8582
+	SOURCE0_ALPHA_EXT				= 0x8588
+	SOURCE1_ALPHA_EXT				= 0x8589
+	SOURCE2_ALPHA_EXT				= 0x858A
+	OPERAND0_RGB_EXT				= 0x8590
+	OPERAND1_RGB_EXT				= 0x8591
+	OPERAND2_RGB_EXT				= 0x8592
+	OPERAND0_ALPHA_EXT				= 0x8598
+	OPERAND1_ALPHA_EXT				= 0x8599
+	OPERAND2_ALPHA_EXT				= 0x859A
+
+NV_texture_env_combine4 enum:
+	COMBINE4_NV					= 0x8503
+	SOURCE3_RGB_NV					= 0x8583
+	SOURCE3_ALPHA_NV				= 0x858B
+	OPERAND3_RGB_NV					= 0x8593
+	OPERAND3_ALPHA_NV				= 0x859B
+
 # "Future use" => "additional combiner input/output enums" only
 # ATI/NVIDIA_future_use: 0x8584-0x8587
 # ATI/NVIDIA_future_use: 0x858C-0x858F
@@ -4021,68 +4311,93 @@
 
 ###############################################################################
 
-# EXT_texture_perturb_normal enum:
-#	PERTURB_EXT					= 0x85AE
-#	TEXTURE_NORMAL_EXT				= 0x85AF
+EXT_texture_perturb_normal enum:
+	PERTURB_EXT					= 0x85AE
+	TEXTURE_NORMAL_EXT				= 0x85AF
 
 ###############################################################################
 
 # Apple: 0x85B0-0x85BF
 
-# APPLE_specular_vector enum:
-#	LIGHT_MODEL_SPECULAR_VECTOR_APPLE		= 0x85B0
+APPLE_specular_vector enum:
+	LIGHT_MODEL_SPECULAR_VECTOR_APPLE		= 0x85B0
 
-# APPLE_transform_hint enum:
-#	TRANSFORM_HINT_APPLE				= 0x85B1
+APPLE_transform_hint enum:
+	TRANSFORM_HINT_APPLE				= 0x85B1
 
-# APPLE_client_storage enum:
-#	UNPACK_CLIENT_STORAGE_APPLE			= 0x85B2
+APPLE_client_storage enum:
+	UNPACK_CLIENT_STORAGE_APPLE			= 0x85B2
 
-# APPLE_future_use: 0x85B3-0x85B4
+# May also be part of APPLE_fence
+APPLE_object_purgeable enum: (additional; see below)
+	BUFFER_OBJECT_APPLE				= 0x85B3
+
+# APPLE_future_use: 0x85B4
+
 ## From Jeremy 2006/10/18 (Bugzilla bug 632) - unknown extension name
-#	BUFFER_OBJECT_APPLE				= 0x85B3
 #	STORAGE_CLIENT_APPLE				= 0x85B4
 
-# VERSION_3_0 enum:
-# ARB_vertex_array_object enum: (note: no ARB suffixes)
-# APPLE_vertex_array_object enum:
-#	VERTEX_ARRAY_BINDING				= 0x85B5	# 3.0 / ARB_vao
-#	VERTEX_ARRAY_BINDING_APPLE			= 0x85B5
+VERSION_3_0 enum:
+	use ARB_vertex_array_object	    VERTEX_ARRAY_BINDING
 
-# APPLE_future_use: 0x85B6-0x85B8
+ARB_vertex_array_object enum: (note: no ARB suffixes)
+	VERTEX_ARRAY_BINDING				= 0x85B5    # VERSION_3_0 / ARB_vao
+
+APPLE_vertex_array_object enum:
+	VERTEX_ARRAY_BINDING_APPLE			= 0x85B5
+
+# APPLE_future_use: 0x85B6
 ## From Jeremy 2006/10/18 (Bugzilla bug 632) - unknown extension name
 #	TEXTURE_MINIMIZE_STORAGE_APPLE			= 0x85B6
-#	TEXTURE_RANGE_LENGTH_APPLE			= 0x85B7
-#	TEXTURE_RANGE_POINTER_APPLE			= 0x85B8
 
-# APPLE_ycbcr_422 enum:
-# MESA_ycbcr_texture enum: (additional; see below)
-#	YCBCR_422_APPLE					= 0x85B9
-#	UNSIGNED_SHORT_8_8_APPLE			= 0x85BA
-#	UNSIGNED_SHORT_8_8_MESA				= 0x85BA
-#	UNSIGNED_SHORT_8_8_REV_APPLE			= 0x85BB
-#	UNSIGNED_SHORT_8_8_REV_MESA			= 0x85BB
+APPLE_texture_range enum:  (additional; see below)
+	TEXTURE_RANGE_LENGTH_APPLE			= 0x85B7
+	TEXTURE_RANGE_POINTER_APPLE			= 0x85B8
 
-# MESA_ycbcr_texture enum: (separate; see below)
-#	UNSIGNED_SHORT_8_8_MESA				= 0x85BA
-#	UNSIGNED_SHORT_8_8_REV_MESA			= 0x85BB
+APPLE_ycbcr_422 enum:
+	YCBCR_422_APPLE					= 0x85B9
+	UNSIGNED_SHORT_8_8_APPLE			= 0x85BA
+	UNSIGNED_SHORT_8_8_REV_APPLE			= 0x85BB
 
-# APPLE_future_use: 0x85BC-0x85BD
-## From Jeremy 2006/10/18 (Bugzilla bug 632) - unknown extension name
-#	TEXTURE_STORAGE_HINT_APPLE			= 0x85BC
-#	STORAGE_PRIVATE_APPLE				= 0x85BD
+MESA_ycbcr_texture enum: (additional; see below)
+	UNSIGNED_SHORT_8_8_MESA				= 0x85BA
+	UNSIGNED_SHORT_8_8_REV_MESA			= 0x85BB
 
-# APPLE_vertex_array_range (additional; see above): 0x85BE-0x85BF
+APPLE_texture_range enum:
+	TEXTURE_STORAGE_HINT_APPLE			= 0x85BC
+	STORAGE_PRIVATE_APPLE				= 0x85BD
 
+APPLE_vertex_array_range enum: (additional; see above):
+	STORAGE_CACHED_APPLE				= 0x85BE
+	STORAGE_SHARED_APPLE				= 0x85BF
+
+APPLE_texture_range enum:
+	use APPLE_vertex_array_range	    STORAGE_CACHED_APPLE
+	use APPLE_vertex_array_range	    STORAGE_SHARED_APPLE
+
 ###############################################################################
 
 # Sun: 0x85C0-0x85CF
 
-# SUNX_general_triangle_list (additional; see above): 0x85C0-0x85CB
+SUNX_general_triangle_list enum: (additional; see above)
+	 REPLACEMENT_CODE_ARRAY_SUN			= 0x85C0
+	 REPLACEMENT_CODE_ARRAY_TYPE_SUN		= 0x85C1
+	 REPLACEMENT_CODE_ARRAY_STRIDE_SUN		= 0x85C2
+	 REPLACEMENT_CODE_ARRAY_POINTER_SUN		= 0x85C3
+	 R1UI_V3F_SUN					= 0x85C4
+	 R1UI_C4UB_V3F_SUN				= 0x85C5
+	 R1UI_C3F_V3F_SUN				= 0x85C6
+	 R1UI_N3F_V3F_SUN				= 0x85C7
+	 R1UI_C4F_N3F_V3F_SUN				= 0x85C8
+	 R1UI_T2F_V3F_SUN				= 0x85C9
+	 R1UI_T2F_N3F_V3F_SUN				= 0x85CA
+	 R1UI_T2F_C4F_N3F_V3F_SUN			= 0x85CB
 
-# SUN_slice_accum: 0x85CC
-#	SLICE_ACCUM_SUN					= 0x85CC
+SUN_slice_accum enum:
+	SLICE_ACCUM_SUN					= 0x85CC
 
+# SUN_future_use: 0x85CD-0x85CF
+
 ###############################################################################
 
 # Unknown extension name, not in enumext.spec
@@ -4131,152 +4446,167 @@
 
 # Sun: 0x8600-0x861F
 
-# SUN_mesh_array: 0x8614-0x8615
-#	QUAD_MESH_SUN					= 0x8614
-#	TRIANGLE_MESH_SUN				= 0x8615
+# SUN_future_use: 0x8600-0x8613
 
+SUN_mesh_array enum: 0x8614-0x8615
+	QUAD_MESH_SUN					= 0x8614
+	TRIANGLE_MESH_SUN				= 0x8615
+
+# SUN_future_use: 0x8614-0x861F
+
 ###############################################################################
 
 # NVIDIA: 0x8620-0x867F
 
-# NV_vertex_program enum:
-#	VERTEX_PROGRAM_NV				= 0x8620
-#	VERTEX_STATE_PROGRAM_NV				= 0x8621
-#	ATTRIB_ARRAY_SIZE_NV				= 0x8623
-#	ATTRIB_ARRAY_STRIDE_NV				= 0x8624
-#	ATTRIB_ARRAY_TYPE_NV				= 0x8625
-#	CURRENT_ATTRIB_NV				= 0x8626
-#	PROGRAM_LENGTH_NV				= 0x8627
-#	PROGRAM_STRING_NV				= 0x8628
-#	MODELVIEW_PROJECTION_NV				= 0x8629
-#	IDENTITY_NV					= 0x862A
-#	INVERSE_NV					= 0x862B
-#	TRANSPOSE_NV					= 0x862C
-#	INVERSE_TRANSPOSE_NV				= 0x862D
-#	MAX_TRACK_MATRIX_STACK_DEPTH_NV			= 0x862E
-#	MAX_TRACK_MATRICES_NV				= 0x862F
-#	MATRIX0_NV					= 0x8630
-#	MATRIX1_NV					= 0x8631
-#	MATRIX2_NV					= 0x8632
-#	MATRIX3_NV					= 0x8633
-#	MATRIX4_NV					= 0x8634
-#	MATRIX5_NV					= 0x8635
-#	MATRIX6_NV					= 0x8636
-#	MATRIX7_NV					= 0x8637
-# ##################
-# #
-# #	Reserved:
-# #
-# #	MATRIX8_NV					= 0x8638
-# #	MATRIX9_NV					= 0x8639
-# #	MATRIX10_NV					= 0x863A
-# #	MATRIX11_NV					= 0x863B
-# #	MATRIX12_NV					= 0x863C
-# #	MATRIX13_NV					= 0x863D
-# #	MATRIX14_NV					= 0x863E
-# #	MATRIX15_NV					= 0x863F
-# #
-# ###################
-#	CURRENT_MATRIX_STACK_DEPTH_NV			= 0x8640
-#	CURRENT_MATRIX_NV				= 0x8641
-#	VERTEX_PROGRAM_POINT_SIZE_NV			= 0x8642
-#	VERTEX_PROGRAM_TWO_SIDE_NV			= 0x8643
-#	PROGRAM_PARAMETER_NV				= 0x8644
-#	ATTRIB_ARRAY_POINTER_NV				= 0x8645
-#	PROGRAM_TARGET_NV				= 0x8646
-#	PROGRAM_RESIDENT_NV				= 0x8647
-#	TRACK_MATRIX_NV					= 0x8648
-#	TRACK_MATRIX_TRANSFORM_NV			= 0x8649
-#	VERTEX_PROGRAM_BINDING_NV			= 0x864A
-#	PROGRAM_ERROR_POSITION_NV			= 0x864B
-#	VERTEX_ATTRIB_ARRAY0_NV				= 0x8650
-#	VERTEX_ATTRIB_ARRAY1_NV				= 0x8651
-#	VERTEX_ATTRIB_ARRAY2_NV				= 0x8652
-#	VERTEX_ATTRIB_ARRAY3_NV				= 0x8653
-#	VERTEX_ATTRIB_ARRAY4_NV				= 0x8654
-#	VERTEX_ATTRIB_ARRAY5_NV				= 0x8655
-#	VERTEX_ATTRIB_ARRAY6_NV				= 0x8656
-#	VERTEX_ATTRIB_ARRAY7_NV				= 0x8657
-#	VERTEX_ATTRIB_ARRAY8_NV				= 0x8658
-#	VERTEX_ATTRIB_ARRAY9_NV				= 0x8659
-#	VERTEX_ATTRIB_ARRAY10_NV			= 0x865A
-#	VERTEX_ATTRIB_ARRAY11_NV			= 0x865B
-#	VERTEX_ATTRIB_ARRAY12_NV			= 0x865C
-#	VERTEX_ATTRIB_ARRAY13_NV			= 0x865D
-#	VERTEX_ATTRIB_ARRAY14_NV			= 0x865E
-#	VERTEX_ATTRIB_ARRAY15_NV			= 0x865F
-#	MAP1_VERTEX_ATTRIB0_4_NV			= 0x8660
-#	MAP1_VERTEX_ATTRIB1_4_NV			= 0x8661
-#	MAP1_VERTEX_ATTRIB2_4_NV			= 0x8662
-#	MAP1_VERTEX_ATTRIB3_4_NV			= 0x8663
-#	MAP1_VERTEX_ATTRIB4_4_NV			= 0x8664
-#	MAP1_VERTEX_ATTRIB5_4_NV			= 0x8665
-#	MAP1_VERTEX_ATTRIB6_4_NV			= 0x8666
-#	MAP1_VERTEX_ATTRIB7_4_NV			= 0x8667
-#	MAP1_VERTEX_ATTRIB8_4_NV			= 0x8668
-#	MAP1_VERTEX_ATTRIB9_4_NV			= 0x8669
-#	MAP1_VERTEX_ATTRIB10_4_NV			= 0x866A
-#	MAP1_VERTEX_ATTRIB11_4_NV			= 0x866B
-#	MAP1_VERTEX_ATTRIB12_4_NV			= 0x866C
-#	MAP1_VERTEX_ATTRIB13_4_NV			= 0x866D
-#	MAP1_VERTEX_ATTRIB14_4_NV			= 0x866E
-#	MAP1_VERTEX_ATTRIB15_4_NV			= 0x866F
-#	MAP2_VERTEX_ATTRIB0_4_NV			= 0x8670
-#	MAP2_VERTEX_ATTRIB1_4_NV			= 0x8671
-#	MAP2_VERTEX_ATTRIB2_4_NV			= 0x8672
-#	MAP2_VERTEX_ATTRIB3_4_NV			= 0x8673
-#	MAP2_VERTEX_ATTRIB4_4_NV			= 0x8674
-#	MAP2_VERTEX_ATTRIB5_4_NV			= 0x8675
-#	MAP2_VERTEX_ATTRIB6_4_NV			= 0x8676
-#	MAP2_VERTEX_ATTRIB7_4_NV			= 0x8677
-#	MAP2_VERTEX_ATTRIB8_4_NV			= 0x8678
-#	MAP2_VERTEX_ATTRIB9_4_NV			= 0x8679
-#	MAP2_VERTEX_ATTRIB10_4_NV			= 0x867A
-#	MAP2_VERTEX_ATTRIB11_4_NV			= 0x867B
-#	MAP2_VERTEX_ATTRIB12_4_NV			= 0x867C
-#	MAP2_VERTEX_ATTRIB13_4_NV			= 0x867D
-#	MAP2_VERTEX_ATTRIB14_4_NV			= 0x867E
-#	MAP2_VERTEX_ATTRIB15_4_NV			= 0x867F
+NV_vertex_program enum:
+	VERTEX_PROGRAM_NV				= 0x8620
+	VERTEX_STATE_PROGRAM_NV				= 0x8621
+	ATTRIB_ARRAY_SIZE_NV				= 0x8623
+	ATTRIB_ARRAY_STRIDE_NV				= 0x8624
+	ATTRIB_ARRAY_TYPE_NV				= 0x8625
+	CURRENT_ATTRIB_NV				= 0x8626
+	PROGRAM_LENGTH_NV				= 0x8627
+	PROGRAM_STRING_NV				= 0x8628
+	MODELVIEW_PROJECTION_NV				= 0x8629
+	IDENTITY_NV					= 0x862A
+	INVERSE_NV					= 0x862B
+	TRANSPOSE_NV					= 0x862C
+	INVERSE_TRANSPOSE_NV				= 0x862D
+	MAX_TRACK_MATRIX_STACK_DEPTH_NV			= 0x862E
+	MAX_TRACK_MATRICES_NV				= 0x862F
+	MATRIX0_NV					= 0x8630
+	MATRIX1_NV					= 0x8631
+	MATRIX2_NV					= 0x8632
+	MATRIX3_NV					= 0x8633
+	MATRIX4_NV					= 0x8634
+	MATRIX5_NV					= 0x8635
+	MATRIX6_NV					= 0x8636
+	MATRIX7_NV					= 0x8637
+##################
+#
+#     Reserved:
+#
+#     MATRIX8_NV				      = 0x8638
+#     MATRIX9_NV				      = 0x8639
+#     MATRIX10_NV				      = 0x863A
+#     MATRIX11_NV				      = 0x863B
+#     MATRIX12_NV				      = 0x863C
+#     MATRIX13_NV				      = 0x863D
+#     MATRIX14_NV				      = 0x863E
+#     MATRIX15_NV				      = 0x863F
+#
+###################
+	CURRENT_MATRIX_STACK_DEPTH_NV			= 0x8640
+	CURRENT_MATRIX_NV				= 0x8641
+	VERTEX_PROGRAM_POINT_SIZE_NV			= 0x8642
+	VERTEX_PROGRAM_TWO_SIDE_NV			= 0x8643
+	PROGRAM_PARAMETER_NV				= 0x8644
+	ATTRIB_ARRAY_POINTER_NV				= 0x8645
+	PROGRAM_TARGET_NV				= 0x8646
+	PROGRAM_RESIDENT_NV				= 0x8647
+	TRACK_MATRIX_NV					= 0x8648
+	TRACK_MATRIX_TRANSFORM_NV			= 0x8649
+	VERTEX_PROGRAM_BINDING_NV			= 0x864A
+	PROGRAM_ERROR_POSITION_NV			= 0x864B
+	VERTEX_ATTRIB_ARRAY0_NV				= 0x8650
+	VERTEX_ATTRIB_ARRAY1_NV				= 0x8651
+	VERTEX_ATTRIB_ARRAY2_NV				= 0x8652
+	VERTEX_ATTRIB_ARRAY3_NV				= 0x8653
+	VERTEX_ATTRIB_ARRAY4_NV				= 0x8654
+	VERTEX_ATTRIB_ARRAY5_NV				= 0x8655
+	VERTEX_ATTRIB_ARRAY6_NV				= 0x8656
+	VERTEX_ATTRIB_ARRAY7_NV				= 0x8657
+	VERTEX_ATTRIB_ARRAY8_NV				= 0x8658
+	VERTEX_ATTRIB_ARRAY9_NV				= 0x8659
+	VERTEX_ATTRIB_ARRAY10_NV			= 0x865A
+	VERTEX_ATTRIB_ARRAY11_NV			= 0x865B
+	VERTEX_ATTRIB_ARRAY12_NV			= 0x865C
+	VERTEX_ATTRIB_ARRAY13_NV			= 0x865D
+	VERTEX_ATTRIB_ARRAY14_NV			= 0x865E
+	VERTEX_ATTRIB_ARRAY15_NV			= 0x865F
+	MAP1_VERTEX_ATTRIB0_4_NV			= 0x8660
+	MAP1_VERTEX_ATTRIB1_4_NV			= 0x8661
+	MAP1_VERTEX_ATTRIB2_4_NV			= 0x8662
+	MAP1_VERTEX_ATTRIB3_4_NV			= 0x8663
+	MAP1_VERTEX_ATTRIB4_4_NV			= 0x8664
+	MAP1_VERTEX_ATTRIB5_4_NV			= 0x8665
+	MAP1_VERTEX_ATTRIB6_4_NV			= 0x8666
+	MAP1_VERTEX_ATTRIB7_4_NV			= 0x8667
+	MAP1_VERTEX_ATTRIB8_4_NV			= 0x8668
+	MAP1_VERTEX_ATTRIB9_4_NV			= 0x8669
+	MAP1_VERTEX_ATTRIB10_4_NV			= 0x866A
+	MAP1_VERTEX_ATTRIB11_4_NV			= 0x866B
+	MAP1_VERTEX_ATTRIB12_4_NV			= 0x866C
+	MAP1_VERTEX_ATTRIB13_4_NV			= 0x866D
+	MAP1_VERTEX_ATTRIB14_4_NV			= 0x866E
+	MAP1_VERTEX_ATTRIB15_4_NV			= 0x866F
+	MAP2_VERTEX_ATTRIB0_4_NV			= 0x8670
+	MAP2_VERTEX_ATTRIB1_4_NV			= 0x8671
+	MAP2_VERTEX_ATTRIB2_4_NV			= 0x8672
+	MAP2_VERTEX_ATTRIB3_4_NV			= 0x8673
+	MAP2_VERTEX_ATTRIB4_4_NV			= 0x8674
+	MAP2_VERTEX_ATTRIB5_4_NV			= 0x8675
+	MAP2_VERTEX_ATTRIB6_4_NV			= 0x8676
+	MAP2_VERTEX_ATTRIB7_4_NV			= 0x8677
+	MAP2_VERTEX_ATTRIB8_4_NV			= 0x8678
+	MAP2_VERTEX_ATTRIB9_4_NV			= 0x8679
+	MAP2_VERTEX_ATTRIB10_4_NV			= 0x867A
+	MAP2_VERTEX_ATTRIB11_4_NV			= 0x867B
+	MAP2_VERTEX_ATTRIB12_4_NV			= 0x867C
+	MAP2_VERTEX_ATTRIB13_4_NV			= 0x867D
+	MAP2_VERTEX_ATTRIB14_4_NV			= 0x867E
+	MAP2_VERTEX_ATTRIB15_4_NV			= 0x867F
 
 # NV_texture_shader (additional; see below): 0x864C-0x864E
 
-# ARB_geometry_shader4 enum: (additional; see below)
-# NV_geometry_program4 enum: (additional; see below)
-#	PROGRAM_POINT_SIZE_ARB				= 0x8642
-#	PROGRAM_POINT_SIZE_EXT				= 0x8642
+VERSION_3_2 enum:
+	PROGRAM_POINT_SIZE				= 0x8642
 
-# NV_depth_clamp enum:
-#	DEPTH_CLAMP_NV					= 0x864F
+ARB_geometry_shader4 enum: (additional; see below)
+	PROGRAM_POINT_SIZE_ARB				= 0x8642
 
-# VERSION_2_0 enum: (Promoted from ARB_vertex_shader; only some values)
-# ARB_vertex_program enum: (additional; see above; reuses NV_vertex_program values)
-# ARB_fragment_program enum: (additional; only some values; see below)
+NV_geometry_program4 enum: (additional; see below)
+	PROGRAM_POINT_SIZE_EXT				= 0x8642
+
+VERSION_3_2 enum:
+	use ARB_depth_clamp		    DEPTH_CLAMP
+
+ARB_depth_clamp enum:
+	DEPTH_CLAMP					= 0x864F
+
+NV_depth_clamp enum:
+	DEPTH_CLAMP_NV					= 0x864F
+
+VERSION_2_0 enum: (Promoted from ARB_vertex_shader; only some values)
+	VERTEX_ATTRIB_ARRAY_ENABLED			= 0x8622    # VERSION_2_0
+	VERTEX_ATTRIB_ARRAY_SIZE			= 0x8623    # VERSION_2_0
+	VERTEX_ATTRIB_ARRAY_STRIDE			= 0x8624    # VERSION_2_0
+	VERTEX_ATTRIB_ARRAY_TYPE			= 0x8625    # VERSION_2_0
+	CURRENT_VERTEX_ATTRIB				= 0x8626    # VERSION_2_0
+	VERTEX_PROGRAM_POINT_SIZE			= 0x8642    # VERSION_2_0
+	VERTEX_PROGRAM_TWO_SIDE				= 0x8643    # VERSION_2_0
+	VERTEX_ATTRIB_ARRAY_POINTER			= 0x8645    # VERSION_2_0
+
+ARB_vertex_program enum: (additional; see above; reuses NV_vertex_program values)
+ARB_fragment_program enum: (additional; only some values; see below)
 # (Unfortunately, PROGRAM_BINDING_ARB does accidentally reuse 0x8677)
-#	VERTEX_PROGRAM_ARB				= 0x8620
-#	VERTEX_ATTRIB_ARRAY_ENABLED			= 0x8622    # VERSION_2_0
-#	VERTEX_ATTRIB_ARRAY_ENABLED_ARB			= 0x8622
-#	VERTEX_ATTRIB_ARRAY_SIZE			= 0x8623    # VERSION_2_0
-#	VERTEX_ATTRIB_ARRAY_SIZE_ARB			= 0x8623
-#	VERTEX_ATTRIB_ARRAY_STRIDE			= 0x8624    # VERSION_2_0
-#	VERTEX_ATTRIB_ARRAY_STRIDE_ARB			= 0x8624
-#	VERTEX_ATTRIB_ARRAY_TYPE			= 0x8625    # VERSION_2_0
-#	VERTEX_ATTRIB_ARRAY_TYPE_ARB			= 0x8625
-#	CURRENT_VERTEX_ATTRIB				= 0x8626    # VERSION_2_0
-#	CURRENT_VERTEX_ATTRIB_ARB			= 0x8626
-#	PROGRAM_LENGTH_ARB				= 0x8627    # ARB_fragment_program
-#	PROGRAM_STRING_ARB				= 0x8628    # ARB_fragment_program
-#	MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB		= 0x862E    # ARB_fragment_program
-#	MAX_PROGRAM_MATRICES_ARB			= 0x862F    # ARB_fragment_program
-#	CURRENT_MATRIX_STACK_DEPTH_ARB			= 0x8640    # ARB_fragment_program
-#	CURRENT_MATRIX_ARB				= 0x8641    # ARB_fragment_program
-#	VERTEX_PROGRAM_POINT_SIZE			= 0x8642    # VERSION_2_0
-#	VERTEX_PROGRAM_POINT_SIZE_ARB			= 0x8642
-#	VERTEX_PROGRAM_TWO_SIDE				= 0x8643    # VERSION_2_0
-#	VERTEX_PROGRAM_TWO_SIDE_ARB			= 0x8643
-#	VERTEX_ATTRIB_ARRAY_POINTER			= 0x8645    # VERSION_2_0
-#	VERTEX_ATTRIB_ARRAY_POINTER_ARB			= 0x8645
-#	PROGRAM_ERROR_POSITION_ARB			= 0x864B    # ARB_fragment_program
-#	PROGRAM_BINDING_ARB				= 0x8677    # ARB_fragment_program
+	VERTEX_PROGRAM_ARB				= 0x8620
+	VERTEX_ATTRIB_ARRAY_ENABLED_ARB			= 0x8622
+	VERTEX_ATTRIB_ARRAY_SIZE_ARB			= 0x8623
+	VERTEX_ATTRIB_ARRAY_STRIDE_ARB			= 0x8624
+	VERTEX_ATTRIB_ARRAY_TYPE_ARB			= 0x8625
+	CURRENT_VERTEX_ATTRIB_ARB			= 0x8626
+	PROGRAM_LENGTH_ARB				= 0x8627    # ARB_fragment_program
+	PROGRAM_STRING_ARB				= 0x8628    # ARB_fragment_program
+	MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB		= 0x862E    # ARB_fragment_program
+	MAX_PROGRAM_MATRICES_ARB			= 0x862F    # ARB_fragment_program
+	CURRENT_MATRIX_STACK_DEPTH_ARB			= 0x8640    # ARB_fragment_program
+	CURRENT_MATRIX_ARB				= 0x8641    # ARB_fragment_program
+	VERTEX_PROGRAM_POINT_SIZE_ARB			= 0x8642
+	VERTEX_PROGRAM_TWO_SIDE_ARB			= 0x8643
+	VERTEX_ATTRIB_ARRAY_POINTER_ARB			= 0x8645
+	PROGRAM_ERROR_POSITION_ARB			= 0x864B    # ARB_fragment_program
+	PROGRAM_BINDING_ARB				= 0x8677    # ARB_fragment_program
 
 ###############################################################################
 
@@ -4284,185 +4614,200 @@
 
 ###############################################################################
 
-# ARB: 0x86A0-0x86AF
+# OpenGL ARB: 0x86A0-0x86AF
 
 # ARB_texture_compression/1.3 (additional; see above): 0x86A0-0x86A3
 
-# ARB_vertex_blend enum:
-#	MAX_VERTEX_UNITS_ARB				= 0x86A4
-#	ACTIVE_VERTEX_UNITS_ARB				= 0x86A5
-#	WEIGHT_SUM_UNITY_ARB				= 0x86A6
-#	VERTEX_BLEND_ARB				= 0x86A7
-#	CURRENT_WEIGHT_ARB				= 0x86A8
-#	WEIGHT_ARRAY_TYPE_ARB				= 0x86A9
-#	WEIGHT_ARRAY_STRIDE_ARB				= 0x86AA
-#	WEIGHT_ARRAY_SIZE_ARB				= 0x86AB
-#	WEIGHT_ARRAY_POINTER_ARB			= 0x86AC
-#	WEIGHT_ARRAY_ARB				= 0x86AD
+ARB_vertex_blend enum:
+	MAX_VERTEX_UNITS_ARB				= 0x86A4
+	ACTIVE_VERTEX_UNITS_ARB				= 0x86A5
+	WEIGHT_SUM_UNITY_ARB				= 0x86A6
+	VERTEX_BLEND_ARB				= 0x86A7
+	CURRENT_WEIGHT_ARB				= 0x86A8
+	WEIGHT_ARRAY_TYPE_ARB				= 0x86A9
+	WEIGHT_ARRAY_STRIDE_ARB				= 0x86AA
+	WEIGHT_ARRAY_SIZE_ARB				= 0x86AB
+	WEIGHT_ARRAY_POINTER_ARB			= 0x86AC
+	WEIGHT_ARRAY_ARB				= 0x86AD
 # Note: MODELVIEW0/1 are defined in other extensions, but not as ARB)
-#	MODELVIEW0_ARB					= 0x1700
-#	MODELVIEW1_ARB					= 0x850A
-#	MODELVIEW2_ARB					= 0x8722
-#	MODELVIEW3_ARB					= 0x8723
-#	MODELVIEW4_ARB					= 0x8724
-#	MODELVIEW5_ARB					= 0x8725
-#	MODELVIEW6_ARB					= 0x8726
-#	MODELVIEW7_ARB					= 0x8727
-#	MODELVIEW8_ARB					= 0x8728
-#	MODELVIEW9_ARB					= 0x8729
-#	MODELVIEW10_ARB					= 0x872A
-#	MODELVIEW11_ARB					= 0x872B
-#	MODELVIEW12_ARB					= 0x872C
-#	MODELVIEW13_ARB					= 0x872D
-#	MODELVIEW14_ARB					= 0x872E
-#	MODELVIEW15_ARB					= 0x872F
-#	MODELVIEW16_ARB					= 0x8730
-#	MODELVIEW17_ARB					= 0x8731
-#	MODELVIEW18_ARB					= 0x8732
-#	MODELVIEW19_ARB					= 0x8733
-#	MODELVIEW20_ARB					= 0x8734
-#	MODELVIEW21_ARB					= 0x8735
-#	MODELVIEW22_ARB					= 0x8736
-#	MODELVIEW23_ARB					= 0x8737
-#	MODELVIEW24_ARB					= 0x8738
-#	MODELVIEW25_ARB					= 0x8739
-#	MODELVIEW26_ARB					= 0x873A
-#	MODELVIEW27_ARB					= 0x873B
-#	MODELVIEW28_ARB					= 0x873C
-#	MODELVIEW29_ARB					= 0x873D
-#	MODELVIEW30_ARB					= 0x873E
-#	MODELVIEW31_ARB					= 0x873F
+	MODELVIEW0_ARB					= 0x1700
+	MODELVIEW1_ARB					= 0x850A
+	MODELVIEW2_ARB					= 0x8722
+	MODELVIEW3_ARB					= 0x8723
+	MODELVIEW4_ARB					= 0x8724
+	MODELVIEW5_ARB					= 0x8725
+	MODELVIEW6_ARB					= 0x8726
+	MODELVIEW7_ARB					= 0x8727
+	MODELVIEW8_ARB					= 0x8728
+	MODELVIEW9_ARB					= 0x8729
+	MODELVIEW10_ARB					= 0x872A
+	MODELVIEW11_ARB					= 0x872B
+	MODELVIEW12_ARB					= 0x872C
+	MODELVIEW13_ARB					= 0x872D
+	MODELVIEW14_ARB					= 0x872E
+	MODELVIEW15_ARB					= 0x872F
+	MODELVIEW16_ARB					= 0x8730
+	MODELVIEW17_ARB					= 0x8731
+	MODELVIEW18_ARB					= 0x8732
+	MODELVIEW19_ARB					= 0x8733
+	MODELVIEW20_ARB					= 0x8734
+	MODELVIEW21_ARB					= 0x8735
+	MODELVIEW22_ARB					= 0x8736
+	MODELVIEW23_ARB					= 0x8737
+	MODELVIEW24_ARB					= 0x8738
+	MODELVIEW25_ARB					= 0x8739
+	MODELVIEW26_ARB					= 0x873A
+	MODELVIEW27_ARB					= 0x873B
+	MODELVIEW28_ARB					= 0x873C
+	MODELVIEW29_ARB					= 0x873D
+	MODELVIEW30_ARB					= 0x873E
+	MODELVIEW31_ARB					= 0x873F
 
-# VERSION_1_3 enum: (Promoted for OpenGL 1.3)
-# ARB_texture_env_dot3
-#	DOT3_RGB					= 0x86AE
-#	DOT3_RGB_ARB					= 0x86AE
-#	DOT3_RGBA					= 0x86AF
-#	DOT3_RGBA_ARB					= 0x86AF
+# 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)
+	DOT3_RGB					= 0x86AE
+	DOT3_RGBA					= 0x86AF
+
+ARB_texture_env_dot3 enum:
+	DOT3_RGB_ARB					= 0x86AE
+	DOT3_RGBA_ARB					= 0x86AF
+
+IMG_texture_env_enhanced_fixed_function enum: (OpenGL ES only; additional; see below)
+	DOT3_RGBA_IMG					= 0x86AF
+
 ###############################################################################
 
 # 3Dfx: 0x86B0-0x86BF
 
-# 3DFX_texture_compression_FXT1 enum:
-#	COMPRESSED_RGB_FXT1_3DFX			= 0x86B0
-#	COMPRESSED_RGBA_FXT1_3DFX			= 0x86B1
+3DFX_texture_compression_FXT1 enum:
+	COMPRESSED_RGB_FXT1_3DFX			= 0x86B0
+	COMPRESSED_RGBA_FXT1_3DFX			= 0x86B1
 
-# 3DFX_multisample enum:
-#	MULTISAMPLE_3DFX				= 0x86B2
-#	SAMPLE_BUFFERS_3DFX				= 0x86B3
-#	SAMPLES_3DFX					= 0x86B4
-#	MULTISAMPLE_BIT_3DFX				= 0x20000000
+3DFX_multisample enum:
+	MULTISAMPLE_3DFX				= 0x86B2
+	SAMPLE_BUFFERS_3DFX				= 0x86B3
+	SAMPLES_3DFX					= 0x86B4
+	MULTISAMPLE_BIT_3DFX				= 0x20000000
 
+# 3DFX_future_use: 0x86B5-0x86BF
+
 ###############################################################################
 
 # NVIDIA: 0x86C0-0x871F
 
-# NV_evaluators enum:
-#	EVAL_2D_NV					= 0x86C0
-#	EVAL_TRIANGULAR_2D_NV				= 0x86C1
-#	MAP_TESSELLATION_NV				= 0x86C2
-#	MAP_ATTRIB_U_ORDER_NV				= 0x86C3
-#	MAP_ATTRIB_V_ORDER_NV				= 0x86C4
-#	EVAL_FRACTIONAL_TESSELLATION_NV			= 0x86C5
-#	EVAL_VERTEX_ATRRIB0_NV				= 0x86C6
-#	EVAL_VERTEX_ATRRIB1_NV				= 0x86C7
-#	EVAL_VERTEX_ATRRIB2_NV				= 0x86C8
-#	EVAL_VERTEX_ATRRIB3_NV				= 0x86C9
-#	EVAL_VERTEX_ATRRIB4_NV				= 0x86CA
-#	EVAL_VERTEX_ATRRIB5_NV				= 0x86CB
-#	EVAL_VERTEX_ATRRIB6_NV				= 0x86CC
-#	EVAL_VERTEX_ATRRIB7_NV				= 0x86CD
-#	EVAL_VERTEX_ATRRIB8_NV				= 0x86CE
-#	EVAL_VERTEX_ATRRIB9_NV				= 0x86CF
-#	EVAL_VERTEX_ATRRIB10_NV				= 0x86D0
-#	EVAL_VERTEX_ATRRIB11_NV				= 0x86D1
-#	EVAL_VERTEX_ATRRIB12_NV				= 0x86D2
-#	EVAL_VERTEX_ATRRIB13_NV				= 0x86D3
-#	EVAL_VERTEX_ATRRIB14_NV				= 0x86D4
-#	EVAL_VERTEX_ATRRIB15_NV				= 0x86D5
-#	MAX_MAP_TESSELLATION_NV				= 0x86D6
-#	MAX_RATIONAL_EVAL_ORDER_NV			= 0x86D7
+NV_evaluators enum:
+	EVAL_2D_NV					= 0x86C0
+	EVAL_TRIANGULAR_2D_NV				= 0x86C1
+	MAP_TESSELLATION_NV				= 0x86C2
+	MAP_ATTRIB_U_ORDER_NV				= 0x86C3
+	MAP_ATTRIB_V_ORDER_NV				= 0x86C4
+	EVAL_FRACTIONAL_TESSELLATION_NV			= 0x86C5
+	EVAL_VERTEX_ATRRIB0_NV				= 0x86C6
+	EVAL_VERTEX_ATRRIB1_NV				= 0x86C7
+	EVAL_VERTEX_ATRRIB2_NV				= 0x86C8
+	EVAL_VERTEX_ATRRIB3_NV				= 0x86C9
+	EVAL_VERTEX_ATRRIB4_NV				= 0x86CA
+	EVAL_VERTEX_ATRRIB5_NV				= 0x86CB
+	EVAL_VERTEX_ATRRIB6_NV				= 0x86CC
+	EVAL_VERTEX_ATRRIB7_NV				= 0x86CD
+	EVAL_VERTEX_ATRRIB8_NV				= 0x86CE
+	EVAL_VERTEX_ATRRIB9_NV				= 0x86CF
+	EVAL_VERTEX_ATRRIB10_NV				= 0x86D0
+	EVAL_VERTEX_ATRRIB11_NV				= 0x86D1
+	EVAL_VERTEX_ATRRIB12_NV				= 0x86D2
+	EVAL_VERTEX_ATRRIB13_NV				= 0x86D3
+	EVAL_VERTEX_ATRRIB14_NV				= 0x86D4
+	EVAL_VERTEX_ATRRIB15_NV				= 0x86D5
+	MAX_MAP_TESSELLATION_NV				= 0x86D6
+	MAX_RATIONAL_EVAL_ORDER_NV			= 0x86D7
 
 # NV_future_use: 0x86D8
 
-# NV_texture_shader enum:
-#	OFFSET_TEXTURE_RECTANGLE_NV			= 0x864C
-#	OFFSET_TEXTURE_RECTANGLE_SCALE_NV		= 0x864D
-#	DOT_PRODUCT_TEXTURE_RECTANGLE_NV		= 0x864E
-#	RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV		= 0x86D9
-#	UNSIGNED_INT_S8_S8_8_8_NV			= 0x86DA
-#	UNSIGNED_INT_8_8_S8_S8_REV_NV			= 0x86DB
-#	DSDT_MAG_INTENSITY_NV				= 0x86DC
-#	SHADER_CONSISTENT_NV				= 0x86DD
-#	TEXTURE_SHADER_NV				= 0x86DE
-#	SHADER_OPERATION_NV				= 0x86DF
-#	CULL_MODES_NV					= 0x86E0
-#	OFFSET_TEXTURE_MATRIX_NV			= 0x86E1
-#	OFFSET_TEXTURE_SCALE_NV				= 0x86E2
-#	OFFSET_TEXTURE_BIAS_NV				= 0x86E3
-#	OFFSET_TEXTURE_2D_MATRIX_NV			= GL_OFFSET_TEXTURE_MATRIX_NV
-#	OFFSET_TEXTURE_2D_SCALE_NV			= GL_OFFSET_TEXTURE_SCALE_NV
-#	OFFSET_TEXTURE_2D_BIAS_NV			= GL_OFFSET_TEXTURE_BIAS_NV
-#	PREVIOUS_TEXTURE_INPUT_NV			= 0x86E4
-#	CONST_EYE_NV					= 0x86E5
-#	PASS_THROUGH_NV					= 0x86E6
-#	CULL_FRAGMENT_NV				= 0x86E7
-#	OFFSET_TEXTURE_2D_NV				= 0x86E8
-#	DEPENDENT_AR_TEXTURE_2D_NV			= 0x86E9
-#	DEPENDENT_GB_TEXTURE_2D_NV			= 0x86EA
-#	DOT_PRODUCT_NV					= 0x86EC
-#	DOT_PRODUCT_DEPTH_REPLACE_NV			= 0x86ED
-#	DOT_PRODUCT_TEXTURE_2D_NV			= 0x86EE
-#	DOT_PRODUCT_TEXTURE_CUBE_MAP_NV			= 0x86F0
-#	DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV			= 0x86F1
-#	DOT_PRODUCT_REFLECT_CUBE_MAP_NV			= 0x86F2
-#	DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV	= 0x86F3
-#	HILO_NV						= 0x86F4
-#	DSDT_NV						= 0x86F5
-#	DSDT_MAG_NV					= 0x86F6
-#	DSDT_MAG_VIB_NV					= 0x86F7
-#	HILO16_NV					= 0x86F8
-#	SIGNED_HILO_NV					= 0x86F9
-#	SIGNED_HILO16_NV				= 0x86FA
-#	SIGNED_RGBA_NV					= 0x86FB
-#	SIGNED_RGBA8_NV					= 0x86FC
-#	SIGNED_RGB_NV					= 0x86FE
-#	SIGNED_RGB8_NV					= 0x86FF
-#	SIGNED_LUMINANCE_NV				= 0x8701
-#	SIGNED_LUMINANCE8_NV				= 0x8702
-#	SIGNED_LUMINANCE_ALPHA_NV			= 0x8703
-#	SIGNED_LUMINANCE8_ALPHA8_NV			= 0x8704
-#	SIGNED_ALPHA_NV					= 0x8705
-#	SIGNED_ALPHA8_NV				= 0x8706
-#	SIGNED_INTENSITY_NV				= 0x8707
-#	SIGNED_INTENSITY8_NV				= 0x8708
-#	DSDT8_NV					= 0x8709
-#	DSDT8_MAG8_NV					= 0x870A
-#	DSDT8_MAG8_INTENSITY8_NV			= 0x870B
-#	SIGNED_RGB_UNSIGNED_ALPHA_NV			= 0x870C
-#	SIGNED_RGB8_UNSIGNED_ALPHA8_NV			= 0x870D
-#	HI_SCALE_NV					= 0x870E
-#	LO_SCALE_NV					= 0x870F
-#	DS_SCALE_NV					= 0x8710
-#	DT_SCALE_NV					= 0x8711
-#	MAGNITUDE_SCALE_NV				= 0x8712
-#	VIBRANCE_SCALE_NV				= 0x8713
-#	HI_BIAS_NV					= 0x8714
-#	LO_BIAS_NV					= 0x8715
-#	DS_BIAS_NV					= 0x8716
-#	DT_BIAS_NV					= 0x8717
-#	MAGNITUDE_BIAS_NV				= 0x8718
-#	VIBRANCE_BIAS_NV				= 0x8719
-#	TEXTURE_BORDER_VALUES_NV			= 0x871A
-#	TEXTURE_HI_SIZE_NV				= 0x871B
-#	TEXTURE_LO_SIZE_NV				= 0x871C
-#	TEXTURE_DS_SIZE_NV				= 0x871D
-#	TEXTURE_DT_SIZE_NV				= 0x871E
-#	TEXTURE_MAG_SIZE_NV				= 0x871F
+NV_texture_shader enum:
+	OFFSET_TEXTURE_RECTANGLE_NV			= 0x864C
+	OFFSET_TEXTURE_RECTANGLE_SCALE_NV		= 0x864D
+	DOT_PRODUCT_TEXTURE_RECTANGLE_NV		= 0x864E
+	RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV		= 0x86D9
+	UNSIGNED_INT_S8_S8_8_8_NV			= 0x86DA
+	UNSIGNED_INT_8_8_S8_S8_REV_NV			= 0x86DB
+	DSDT_MAG_INTENSITY_NV				= 0x86DC
+	SHADER_CONSISTENT_NV				= 0x86DD
+	TEXTURE_SHADER_NV				= 0x86DE
+	SHADER_OPERATION_NV				= 0x86DF
+	CULL_MODES_NV					= 0x86E0
+	OFFSET_TEXTURE_MATRIX_NV			= 0x86E1
+	OFFSET_TEXTURE_SCALE_NV				= 0x86E2
+	OFFSET_TEXTURE_BIAS_NV				= 0x86E3
+	OFFSET_TEXTURE_2D_MATRIX_NV			= GL_OFFSET_TEXTURE_MATRIX_NV
+	OFFSET_TEXTURE_2D_SCALE_NV			= GL_OFFSET_TEXTURE_SCALE_NV
+	OFFSET_TEXTURE_2D_BIAS_NV			= GL_OFFSET_TEXTURE_BIAS_NV
+	PREVIOUS_TEXTURE_INPUT_NV			= 0x86E4
+	CONST_EYE_NV					= 0x86E5
+	PASS_THROUGH_NV					= 0x86E6
+	CULL_FRAGMENT_NV				= 0x86E7
+	OFFSET_TEXTURE_2D_NV				= 0x86E8
+	DEPENDENT_AR_TEXTURE_2D_NV			= 0x86E9
+	DEPENDENT_GB_TEXTURE_2D_NV			= 0x86EA
+	DOT_PRODUCT_NV					= 0x86EC
+	DOT_PRODUCT_DEPTH_REPLACE_NV			= 0x86ED
+	DOT_PRODUCT_TEXTURE_2D_NV			= 0x86EE
+	DOT_PRODUCT_TEXTURE_CUBE_MAP_NV			= 0x86F0
+	DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV			= 0x86F1
+	DOT_PRODUCT_REFLECT_CUBE_MAP_NV			= 0x86F2
+	DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV	= 0x86F3
+	HILO_NV						= 0x86F4
+	DSDT_NV						= 0x86F5
+	DSDT_MAG_NV					= 0x86F6
+	DSDT_MAG_VIB_NV					= 0x86F7
+	HILO16_NV					= 0x86F8
+	SIGNED_HILO_NV					= 0x86F9
+	SIGNED_HILO16_NV				= 0x86FA
+	SIGNED_RGBA_NV					= 0x86FB
+	SIGNED_RGBA8_NV					= 0x86FC
+	SIGNED_RGB_NV					= 0x86FE
+	SIGNED_RGB8_NV					= 0x86FF
+	SIGNED_LUMINANCE_NV				= 0x8701
+	SIGNED_LUMINANCE8_NV				= 0x8702
+	SIGNED_LUMINANCE_ALPHA_NV			= 0x8703
+	SIGNED_LUMINANCE8_ALPHA8_NV			= 0x8704
+	SIGNED_ALPHA_NV					= 0x8705
+	SIGNED_ALPHA8_NV				= 0x8706
+	SIGNED_INTENSITY_NV				= 0x8707
+	SIGNED_INTENSITY8_NV				= 0x8708
+	DSDT8_NV					= 0x8709
+	DSDT8_MAG8_NV					= 0x870A
+	DSDT8_MAG8_INTENSITY8_NV			= 0x870B
+	SIGNED_RGB_UNSIGNED_ALPHA_NV			= 0x870C
+	SIGNED_RGB8_UNSIGNED_ALPHA8_NV			= 0x870D
+	HI_SCALE_NV					= 0x870E
+	LO_SCALE_NV					= 0x870F
+	DS_SCALE_NV					= 0x8710
+	DT_SCALE_NV					= 0x8711
+	MAGNITUDE_SCALE_NV				= 0x8712
+	VIBRANCE_SCALE_NV				= 0x8713
+	HI_BIAS_NV					= 0x8714
+	LO_BIAS_NV					= 0x8715
+	DS_BIAS_NV					= 0x8716
+	DT_BIAS_NV					= 0x8717
+	MAGNITUDE_BIAS_NV				= 0x8718
+	VIBRANCE_BIAS_NV				= 0x8719
+	TEXTURE_BORDER_VALUES_NV			= 0x871A
+	TEXTURE_HI_SIZE_NV				= 0x871B
+	TEXTURE_LO_SIZE_NV				= 0x871C
+	TEXTURE_DS_SIZE_NV				= 0x871D
+	TEXTURE_DT_SIZE_NV				= 0x871E
+	TEXTURE_MAG_SIZE_NV				= 0x871F
 
-# NV_texture_shader2 enum:
-#	DOT_PRODUCT_TEXTURE_3D_NV			= 0x86EF
+NV_texture_shader2 enum:
+	DOT_PRODUCT_TEXTURE_3D_NV			= 0x86EF
 
 # NV_future_use: 0x86EB
 # NV_future_use: 0x86FD
@@ -4470,7 +4815,7 @@
 
 ###############################################################################
 
-# ARB: 0x8720-0x873F
+# OpenGL ARB: 0x8720-0x873F
 
 # ARB_vertex_blend (additional; see above): 0x8720-0x873F
 
@@ -4478,909 +4823,1034 @@
 
 # ATI: 0x8740-0x874F
 
-# EXT_texture_env_dot3 enum:
-#	DOT3_RGB_EXT					= 0x8740
-#	DOT3_RGBA_EXT					= 0x8741
+EXT_texture_env_dot3 enum:
+	DOT3_RGB_EXT					= 0x8740
+	DOT3_RGBA_EXT					= 0x8741
 
-# ATI_texture_mirror_once enum:
-#	MIRROR_CLAMP_ATI				= 0x8742
-#	MIRROR_CLAMP_TO_EDGE_ATI			= 0x8743
-# EXT_texture_mirror_clamp enum:
-#	MIRROR_CLAMP_EXT				= 0x8742
-#	MIRROR_CLAMP_TO_EDGE_EXT			= 0x8743
+# 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
 
-# ATI_texture_env_combine3 enum:
-#	MODULATE_ADD_ATI				= 0x8744
-#	MODULATE_SIGNED_ADD_ATI				= 0x8745
-#	MODULATE_SUBTRACT_ATI				= 0x8746
+# There's a collision between OES_get_program_binary and EXT_texture_env_dot3!
+OES_get_program_binary enum: (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
+
+EXT_texture_mirror_clamp enum:
+	MIRROR_CLAMP_EXT				= 0x8742
+	MIRROR_CLAMP_TO_EDGE_EXT			= 0x8743
+
+ATI_texture_env_combine3 enum:
+	MODULATE_ADD_ATI				= 0x8744
+	MODULATE_SIGNED_ADD_ATI				= 0x8745
+	MODULATE_SUBTRACT_ATI				= 0x8746
+
 # ATI_future_use: 0x8747-0x874F
 
 ###############################################################################
 
 # MESA: 0x8750-0x875F
 
-# MESA_packed_depth_stencil enum:
-#	DEPTH_STENCIL_MESA				= 0x8750
-#	UNSIGNED_INT_24_8_MESA				= 0x8751
-#	UNSIGNED_INT_8_24_REV_MESA			= 0x8752
-#	UNSIGNED_SHORT_15_1_MESA			= 0x8753
-#	UNSIGNED_SHORT_1_15_REV_MESA			= 0x8754
+MESA_packed_depth_stencil enum:
+	DEPTH_STENCIL_MESA				= 0x8750
+	UNSIGNED_INT_24_8_MESA				= 0x8751
+	UNSIGNED_INT_8_24_REV_MESA			= 0x8752
+	UNSIGNED_SHORT_15_1_MESA			= 0x8753
+	UNSIGNED_SHORT_1_15_REV_MESA			= 0x8754
 
-# MESA_trace enum:
-#	TRACE_ALL_BITS_MESA				= 0xFFFF
-#	TRACE_OPERATIONS_BIT_MESA			= 0x0001
-#	TRACE_PRIMITIVES_BIT_MESA			= 0x0002
-#	TRACE_ARRAYS_BIT_MESA				= 0x0004
-#	TRACE_TEXTURES_BIT_MESA				= 0x0008
-#	TRACE_PIXELS_BIT_MESA				= 0x0010
-#	TRACE_ERRORS_BIT_MESA				= 0x0020
-#	TRACE_MASK_MESA					= 0x8755
-#	TRACE_NAME_MESA					= 0x8756
+MESA_trace enum:
+	TRACE_ALL_BITS_MESA				= 0xFFFF
+	TRACE_OPERATIONS_BIT_MESA			= 0x0001
+	TRACE_PRIMITIVES_BIT_MESA			= 0x0002
+	TRACE_ARRAYS_BIT_MESA				= 0x0004
+	TRACE_TEXTURES_BIT_MESA				= 0x0008
+	TRACE_PIXELS_BIT_MESA				= 0x0010
+	TRACE_ERRORS_BIT_MESA				= 0x0020
+	TRACE_MASK_MESA					= 0x8755
+	TRACE_NAME_MESA					= 0x8756
 
-# MESA_ycbcr_texture enum:
-#	YCBCR_MESA					= 0x8757
+MESA_ycbcr_texture enum:
+	YCBCR_MESA					= 0x8757
 
-# MESA_pack_invert enum:
-#	PACK_INVERT_MESA				= 0x8758
+MESA_pack_invert enum:
+	PACK_INVERT_MESA				= 0x8758
 
-# MESAX_texture_stack enum:
-#	TEXTURE_1D_STACK_MESAX				= 0x8759
-#	TEXTURE_2D_STACK_MESAX				= 0x875A
-#	PROXY_TEXTURE_1D_STACK_MESAX			= 0x875B
-#	PROXY_TEXTURE_2D_STACK_MESAX			= 0x875C
-#	TEXTURE_1D_STACK_BINDING_MESAX			= 0x875D
-#	TEXTURE_2D_STACK_BINDING_MESAX			= 0x875E
+MESAX_texture_stack enum:
+	TEXTURE_1D_STACK_MESAX				= 0x8759
+	TEXTURE_2D_STACK_MESAX				= 0x875A
+	PROXY_TEXTURE_1D_STACK_MESAX			= 0x875B
+	PROXY_TEXTURE_2D_STACK_MESAX			= 0x875C
+	TEXTURE_1D_STACK_BINDING_MESAX			= 0x875D
+	TEXTURE_2D_STACK_BINDING_MESAX			= 0x875E
 
-# MESA_shader_debug enum:
-#	DEBUG_OBJECT_MESA				= 0x8759
-#	DEBUG_PRINT_MESA				= 0x875A
-#	DEBUG_ASSERT_MESA				= 0x875B
+MESA_shader_debug enum:
+	DEBUG_OBJECT_MESA				= 0x8759
+	DEBUG_PRINT_MESA				= 0x875A
+	DEBUG_ASSERT_MESA				= 0x875B
 
-
 # MESA_future_use: 0x875F
 
 ###############################################################################
 
 # ATI: 0x8760-0x883F
 
-# ATI_vertex_array_object enum:
-#	STATIC_ATI					= 0x8760
-#	DYNAMIC_ATI					= 0x8761
-#	PRESERVE_ATI					= 0x8762
-#	DISCARD_ATI					= 0x8763
-#	OBJECT_BUFFER_SIZE_ATI				= 0x8764
-#	OBJECT_BUFFER_USAGE_ATI				= 0x8765
-#	ARRAY_OBJECT_BUFFER_ATI				= 0x8766
-#	ARRAY_OBJECT_OFFSET_ATI				= 0x8767
+ATI_vertex_array_object enum:
+	STATIC_ATI					= 0x8760
+	DYNAMIC_ATI					= 0x8761
+	PRESERVE_ATI					= 0x8762
+	DISCARD_ATI					= 0x8763
+	OBJECT_BUFFER_SIZE_ATI				= 0x8764
+	OBJECT_BUFFER_USAGE_ATI				= 0x8765
+	ARRAY_OBJECT_BUFFER_ATI				= 0x8766
+	ARRAY_OBJECT_OFFSET_ATI				= 0x8767
 
-# VERSION_1_5 enum: (Promoted for OpenGL 1.5)
-# ARB_vertex_buffer_object enum (additional; aliases some ATI enums; see below)
-#	BUFFER_SIZE					= 0x8764
-#	BUFFER_SIZE_ARB					= 0x8764
-#	BUFFER_USAGE					= 0x8765
-#	BUFFER_USAGE_ARB				= 0x8765
+VERSION_1_5 enum: (Promoted for OpenGL 1.5)
+	BUFFER_SIZE					= 0x8764
+	BUFFER_USAGE					= 0x8765
 
-# ATI_element_array enum:
-#	ELEMENT_ARRAY_ATI				= 0x8768
-#	ELEMENT_ARRAY_TYPE_ATI				= 0x8769
-#	ELEMENT_ARRAY_POINTER_ATI			= 0x876A
+ARB_vertex_buffer_object enum: (additional; aliases some ATI enums; see below)
+	BUFFER_SIZE_ARB					= 0x8764
+	BUFFER_USAGE_ARB				= 0x8765
 
+ATI_element_array enum:
+	ELEMENT_ARRAY_ATI				= 0x8768
+	ELEMENT_ARRAY_TYPE_ATI				= 0x8769
+	ELEMENT_ARRAY_POINTER_ATI			= 0x876A
+
 # @@@ (extends ATI_element_array, I think???)
-# APPLE_element_array enum:
-#	ELEMENT_ARRAY_APPLE				= 0x8768
-#	ELEMENT_ARRAY_TYPE_APPLE			= 0x8769
-#	ELEMENT_ARRAY_POINTER_APPLE			= 0x876A
+APPLE_element_array enum:
+	ELEMENT_ARRAY_APPLE				= 0x8768
+	ELEMENT_ARRAY_TYPE_APPLE			= 0x8769
+	ELEMENT_ARRAY_POINTER_APPLE			= 0x876A
 
-# ATI_vertex_streams enum:
-#	MAX_VERTEX_STREAMS_ATI				= 0x876B
-#	VERTEX_STREAM0_ATI				= 0x876C
-#	VERTEX_STREAM1_ATI				= 0x876D
-#	VERTEX_STREAM2_ATI				= 0x876E
-#	VERTEX_STREAM3_ATI				= 0x876F
-#	VERTEX_STREAM4_ATI				= 0x8770
-#	VERTEX_STREAM5_ATI				= 0x8771
-#	VERTEX_STREAM6_ATI				= 0x8772
-#	VERTEX_STREAM7_ATI				= 0x8773
-#	VERTEX_SOURCE_ATI				= 0x8774
+ATI_vertex_streams enum:
+	MAX_VERTEX_STREAMS_ATI				= 0x876B
+	VERTEX_STREAM0_ATI				= 0x876C
+	VERTEX_STREAM1_ATI				= 0x876D
+	VERTEX_STREAM2_ATI				= 0x876E
+	VERTEX_STREAM3_ATI				= 0x876F
+	VERTEX_STREAM4_ATI				= 0x8770
+	VERTEX_STREAM5_ATI				= 0x8771
+	VERTEX_STREAM6_ATI				= 0x8772
+	VERTEX_STREAM7_ATI				= 0x8773
+	VERTEX_SOURCE_ATI				= 0x8774
 
-# ATI_envmap_bumpmap enum:
-#	BUMP_ROT_MATRIX_ATI				= 0x8775
-#	BUMP_ROT_MATRIX_SIZE_ATI			= 0x8776
-#	BUMP_NUM_TEX_UNITS_ATI				= 0x8777
-#	BUMP_TEX_UNITS_ATI				= 0x8778
-#	DUDV_ATI					= 0x8779
-#	DU8DV8_ATI					= 0x877A
-#	BUMP_ENVMAP_ATI					= 0x877B
-#	BUMP_TARGET_ATI					= 0x877C
+ATI_envmap_bumpmap enum:
+	BUMP_ROT_MATRIX_ATI				= 0x8775
+	BUMP_ROT_MATRIX_SIZE_ATI			= 0x8776
+	BUMP_NUM_TEX_UNITS_ATI				= 0x8777
+	BUMP_TEX_UNITS_ATI				= 0x8778
+	DUDV_ATI					= 0x8779
+	DU8DV8_ATI					= 0x877A
+	BUMP_ENVMAP_ATI					= 0x877B
+	BUMP_TARGET_ATI					= 0x877C
 
 # ATI_future_use: 0x877D-0x877F
 
-# EXT_vertex_shader enum:
-#	VERTEX_SHADER_EXT				= 0x8780
-#	VERTEX_SHADER_BINDING_EXT			= 0x8781
-#	OP_INDEX_EXT					= 0x8782
-#	OP_NEGATE_EXT					= 0x8783
-#	OP_DOT3_EXT					= 0x8784
-#	OP_DOT4_EXT					= 0x8785
-#	OP_MUL_EXT					= 0x8786
-#	OP_ADD_EXT					= 0x8787
-#	OP_MADD_EXT					= 0x8788
-#	OP_FRAC_EXT					= 0x8789
-#	OP_MAX_EXT					= 0x878A
-#	OP_MIN_EXT					= 0x878B
-#	OP_SET_GE_EXT					= 0x878C
-#	OP_SET_LT_EXT					= 0x878D
-#	OP_CLAMP_EXT					= 0x878E
-#	OP_FLOOR_EXT					= 0x878F
-#	OP_ROUND_EXT					= 0x8790
-#	OP_EXP_BASE_2_EXT				= 0x8791
-#	OP_LOG_BASE_2_EXT				= 0x8792
-#	OP_POWER_EXT					= 0x8793
-#	OP_RECIP_EXT					= 0x8794
-#	OP_RECIP_SQRT_EXT				= 0x8795
-#	OP_SUB_EXT					= 0x8796
-#	OP_CROSS_PRODUCT_EXT				= 0x8797
-#	OP_MULTIPLY_MATRIX_EXT				= 0x8798
-#	OP_MOV_EXT					= 0x8799
-#	OUTPUT_VERTEX_EXT				= 0x879A
-#	OUTPUT_COLOR0_EXT				= 0x879B
-#	OUTPUT_COLOR1_EXT				= 0x879C
-#	OUTPUT_TEXTURE_COORD0_EXT			= 0x879D
-#	OUTPUT_TEXTURE_COORD1_EXT			= 0x879E
-#	OUTPUT_TEXTURE_COORD2_EXT			= 0x879F
-#	OUTPUT_TEXTURE_COORD3_EXT			= 0x87A0
-#	OUTPUT_TEXTURE_COORD4_EXT			= 0x87A1
-#	OUTPUT_TEXTURE_COORD5_EXT			= 0x87A2
-#	OUTPUT_TEXTURE_COORD6_EXT			= 0x87A3
-#	OUTPUT_TEXTURE_COORD7_EXT			= 0x87A4
-#	OUTPUT_TEXTURE_COORD8_EXT			= 0x87A5
-#	OUTPUT_TEXTURE_COORD9_EXT			= 0x87A6
-#	OUTPUT_TEXTURE_COORD10_EXT			= 0x87A7
-#	OUTPUT_TEXTURE_COORD11_EXT			= 0x87A8
-#	OUTPUT_TEXTURE_COORD12_EXT			= 0x87A9
-#	OUTPUT_TEXTURE_COORD13_EXT			= 0x87AA
-#	OUTPUT_TEXTURE_COORD14_EXT			= 0x87AB
-#	OUTPUT_TEXTURE_COORD15_EXT			= 0x87AC
-#	OUTPUT_TEXTURE_COORD16_EXT			= 0x87AD
-#	OUTPUT_TEXTURE_COORD17_EXT			= 0x87AE
-#	OUTPUT_TEXTURE_COORD18_EXT			= 0x87AF
-#	OUTPUT_TEXTURE_COORD19_EXT			= 0x87B0
-#	OUTPUT_TEXTURE_COORD20_EXT			= 0x87B1
-#	OUTPUT_TEXTURE_COORD21_EXT			= 0x87B2
-#	OUTPUT_TEXTURE_COORD22_EXT			= 0x87B3
-#	OUTPUT_TEXTURE_COORD23_EXT			= 0x87B4
-#	OUTPUT_TEXTURE_COORD24_EXT			= 0x87B5
-#	OUTPUT_TEXTURE_COORD25_EXT			= 0x87B6
-#	OUTPUT_TEXTURE_COORD26_EXT			= 0x87B7
-#	OUTPUT_TEXTURE_COORD27_EXT			= 0x87B8
-#	OUTPUT_TEXTURE_COORD28_EXT			= 0x87B9
-#	OUTPUT_TEXTURE_COORD29_EXT			= 0x87BA
-#	OUTPUT_TEXTURE_COORD30_EXT			= 0x87BB
-#	OUTPUT_TEXTURE_COORD31_EXT			= 0x87BC
-#	OUTPUT_FOG_EXT					= 0x87BD
-#	SCALAR_EXT					= 0x87BE
-#	VECTOR_EXT					= 0x87BF
-#	MATRIX_EXT					= 0x87C0
-#	VARIANT_EXT					= 0x87C1
-#	INVARIANT_EXT					= 0x87C2
-#	LOCAL_CONSTANT_EXT				= 0x87C3
-#	LOCAL_EXT					= 0x87C4
-#	MAX_VERTEX_SHADER_INSTRUCTIONS_EXT		= 0x87C5
-#	MAX_VERTEX_SHADER_VARIANTS_EXT			= 0x87C6
-#	MAX_VERTEX_SHADER_INVARIANTS_EXT		= 0x87C7
-#	MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT		= 0x87C8
-#	MAX_VERTEX_SHADER_LOCALS_EXT			= 0x87C9
-#	MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT	= 0x87CA
-#	MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT	= 0x87CB
-#	MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CC
-#	MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT	= 0x87CD
-#	MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT		= 0x87CE
-#	VERTEX_SHADER_INSTRUCTIONS_EXT			= 0x87CF
-#	VERTEX_SHADER_VARIANTS_EXT			= 0x87D0
-#	VERTEX_SHADER_INVARIANTS_EXT			= 0x87D1
-#	VERTEX_SHADER_LOCAL_CONSTANTS_EXT		= 0x87D2
-#	VERTEX_SHADER_LOCALS_EXT			= 0x87D3
-#	VERTEX_SHADER_OPTIMIZED_EXT			= 0x87D4
-#	X_EXT						= 0x87D5
-#	Y_EXT						= 0x87D6
-#	Z_EXT						= 0x87D7
-#	W_EXT						= 0x87D8
-#	NEGATIVE_X_EXT					= 0x87D9
-#	NEGATIVE_Y_EXT					= 0x87DA
-#	NEGATIVE_Z_EXT					= 0x87DB
-#	NEGATIVE_W_EXT					= 0x87DC
-#	ZERO_EXT					= 0x87DD
-#	ONE_EXT						= 0x87DE
-#	NEGATIVE_ONE_EXT				= 0x87DF
-#	NORMALIZED_RANGE_EXT				= 0x87E0
-#	FULL_RANGE_EXT					= 0x87E1
-#	CURRENT_VERTEX_EXT				= 0x87E2
-#	MVP_MATRIX_EXT					= 0x87E3
-#	VARIANT_VALUE_EXT				= 0x87E4
-#	VARIANT_DATATYPE_EXT				= 0x87E5
-#	VARIANT_ARRAY_STRIDE_EXT			= 0x87E6
-#	VARIANT_ARRAY_TYPE_EXT				= 0x87E7
-#	VARIANT_ARRAY_EXT				= 0x87E8
-#	VARIANT_ARRAY_POINTER_EXT			= 0x87E9
-#	INVARIANT_VALUE_EXT				= 0x87EA
-#	INVARIANT_DATATYPE_EXT				= 0x87EB
-#	LOCAL_CONSTANT_VALUE_EXT			= 0x87EC
-#	LOCAL_CONSTANT_DATATYPE_EXT			= 0x87ED
+EXT_vertex_shader enum:
+	VERTEX_SHADER_EXT				= 0x8780
+	VERTEX_SHADER_BINDING_EXT			= 0x8781
+	OP_INDEX_EXT					= 0x8782
+	OP_NEGATE_EXT					= 0x8783
+	OP_DOT3_EXT					= 0x8784
+	OP_DOT4_EXT					= 0x8785
+	OP_MUL_EXT					= 0x8786
+	OP_ADD_EXT					= 0x8787
+	OP_MADD_EXT					= 0x8788
+	OP_FRAC_EXT					= 0x8789
+	OP_MAX_EXT					= 0x878A
+	OP_MIN_EXT					= 0x878B
+	OP_SET_GE_EXT					= 0x878C
+	OP_SET_LT_EXT					= 0x878D
+	OP_CLAMP_EXT					= 0x878E
+	OP_FLOOR_EXT					= 0x878F
+	OP_ROUND_EXT					= 0x8790
+	OP_EXP_BASE_2_EXT				= 0x8791
+	OP_LOG_BASE_2_EXT				= 0x8792
+	OP_POWER_EXT					= 0x8793
+	OP_RECIP_EXT					= 0x8794
+	OP_RECIP_SQRT_EXT				= 0x8795
+	OP_SUB_EXT					= 0x8796
+	OP_CROSS_PRODUCT_EXT				= 0x8797
+	OP_MULTIPLY_MATRIX_EXT				= 0x8798
+	OP_MOV_EXT					= 0x8799
+	OUTPUT_VERTEX_EXT				= 0x879A
+	OUTPUT_COLOR0_EXT				= 0x879B
+	OUTPUT_COLOR1_EXT				= 0x879C
+	OUTPUT_TEXTURE_COORD0_EXT			= 0x879D
+	OUTPUT_TEXTURE_COORD1_EXT			= 0x879E
+	OUTPUT_TEXTURE_COORD2_EXT			= 0x879F
+	OUTPUT_TEXTURE_COORD3_EXT			= 0x87A0
+	OUTPUT_TEXTURE_COORD4_EXT			= 0x87A1
+	OUTPUT_TEXTURE_COORD5_EXT			= 0x87A2
+	OUTPUT_TEXTURE_COORD6_EXT			= 0x87A3
+	OUTPUT_TEXTURE_COORD7_EXT			= 0x87A4
+	OUTPUT_TEXTURE_COORD8_EXT			= 0x87A5
+	OUTPUT_TEXTURE_COORD9_EXT			= 0x87A6
+	OUTPUT_TEXTURE_COORD10_EXT			= 0x87A7
+	OUTPUT_TEXTURE_COORD11_EXT			= 0x87A8
+	OUTPUT_TEXTURE_COORD12_EXT			= 0x87A9
+	OUTPUT_TEXTURE_COORD13_EXT			= 0x87AA
+	OUTPUT_TEXTURE_COORD14_EXT			= 0x87AB
+	OUTPUT_TEXTURE_COORD15_EXT			= 0x87AC
+	OUTPUT_TEXTURE_COORD16_EXT			= 0x87AD
+	OUTPUT_TEXTURE_COORD17_EXT			= 0x87AE
+	OUTPUT_TEXTURE_COORD18_EXT			= 0x87AF
+	OUTPUT_TEXTURE_COORD19_EXT			= 0x87B0
+	OUTPUT_TEXTURE_COORD20_EXT			= 0x87B1
+	OUTPUT_TEXTURE_COORD21_EXT			= 0x87B2
+	OUTPUT_TEXTURE_COORD22_EXT			= 0x87B3
+	OUTPUT_TEXTURE_COORD23_EXT			= 0x87B4
+	OUTPUT_TEXTURE_COORD24_EXT			= 0x87B5
+	OUTPUT_TEXTURE_COORD25_EXT			= 0x87B6
+	OUTPUT_TEXTURE_COORD26_EXT			= 0x87B7
+	OUTPUT_TEXTURE_COORD27_EXT			= 0x87B8
+	OUTPUT_TEXTURE_COORD28_EXT			= 0x87B9
+	OUTPUT_TEXTURE_COORD29_EXT			= 0x87BA
+	OUTPUT_TEXTURE_COORD30_EXT			= 0x87BB
+	OUTPUT_TEXTURE_COORD31_EXT			= 0x87BC
+	OUTPUT_FOG_EXT					= 0x87BD
+	SCALAR_EXT					= 0x87BE
+	VECTOR_EXT					= 0x87BF
+	MATRIX_EXT					= 0x87C0
+	VARIANT_EXT					= 0x87C1
+	INVARIANT_EXT					= 0x87C2
+	LOCAL_CONSTANT_EXT				= 0x87C3
+	LOCAL_EXT					= 0x87C4
+	MAX_VERTEX_SHADER_INSTRUCTIONS_EXT		= 0x87C5
+	MAX_VERTEX_SHADER_VARIANTS_EXT			= 0x87C6
+	MAX_VERTEX_SHADER_INVARIANTS_EXT		= 0x87C7
+	MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT		= 0x87C8
+	MAX_VERTEX_SHADER_LOCALS_EXT			= 0x87C9
+	MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT	= 0x87CA
+	MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT	= 0x87CB
+	MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CC
+	MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT	= 0x87CD
+	MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT		= 0x87CE
+	VERTEX_SHADER_INSTRUCTIONS_EXT			= 0x87CF
+	VERTEX_SHADER_VARIANTS_EXT			= 0x87D0
+	VERTEX_SHADER_INVARIANTS_EXT			= 0x87D1
+	VERTEX_SHADER_LOCAL_CONSTANTS_EXT		= 0x87D2
+	VERTEX_SHADER_LOCALS_EXT			= 0x87D3
+	VERTEX_SHADER_OPTIMIZED_EXT			= 0x87D4
+	X_EXT						= 0x87D5
+	Y_EXT						= 0x87D6
+	Z_EXT						= 0x87D7
+	W_EXT						= 0x87D8
+	NEGATIVE_X_EXT					= 0x87D9
+	NEGATIVE_Y_EXT					= 0x87DA
+	NEGATIVE_Z_EXT					= 0x87DB
+	NEGATIVE_W_EXT					= 0x87DC
+	ZERO_EXT					= 0x87DD
+	ONE_EXT						= 0x87DE
+	NEGATIVE_ONE_EXT				= 0x87DF
+	NORMALIZED_RANGE_EXT				= 0x87E0
+	FULL_RANGE_EXT					= 0x87E1
+	CURRENT_VERTEX_EXT				= 0x87E2
+	MVP_MATRIX_EXT					= 0x87E3
+	VARIANT_VALUE_EXT				= 0x87E4
+	VARIANT_DATATYPE_EXT				= 0x87E5
+	VARIANT_ARRAY_STRIDE_EXT			= 0x87E6
+	VARIANT_ARRAY_TYPE_EXT				= 0x87E7
+	VARIANT_ARRAY_EXT				= 0x87E8
+	VARIANT_ARRAY_POINTER_EXT			= 0x87E9
+	INVARIANT_VALUE_EXT				= 0x87EA
+	INVARIANT_DATATYPE_EXT				= 0x87EB
+	LOCAL_CONSTANT_VALUE_EXT			= 0x87EC
+	LOCAL_CONSTANT_DATATYPE_EXT			= 0x87ED
 
-# ATI_pn_triangles enum:
-#	PN_TRIANGLES_ATI				= 0x87F0
-#	MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI		= 0x87F1
-#	PN_TRIANGLES_POINT_MODE_ATI			= 0x87F2
-#	PN_TRIANGLES_NORMAL_MODE_ATI			= 0x87F3
-#	PN_TRIANGLES_TESSELATION_LEVEL_ATI		= 0x87F4
-#	PN_TRIANGLES_POINT_MODE_LINEAR_ATI		= 0x87F5
-#	PN_TRIANGLES_POINT_MODE_CUBIC_ATI		= 0x87F6
-#	PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI		= 0x87F7
-#	PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI		= 0x87F8
+AMD_compressed_ATC_texture enum: (OpenGL ES only) (additional; see below)
+	ATC_RGBA_INTERPOLATED_ALPHA_AMD			= 0x87EE
 
-# ATI_future_use: 0x87F9-0x87FF
+ATI_pn_triangles enum:
+	PN_TRIANGLES_ATI				= 0x87F0
+	MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI		= 0x87F1
+	PN_TRIANGLES_POINT_MODE_ATI			= 0x87F2
+	PN_TRIANGLES_NORMAL_MODE_ATI			= 0x87F3
+	PN_TRIANGLES_TESSELATION_LEVEL_ATI		= 0x87F4
+	PN_TRIANGLES_POINT_MODE_LINEAR_ATI		= 0x87F5
+	PN_TRIANGLES_POINT_MODE_CUBIC_ATI		= 0x87F6
+	PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI		= 0x87F7
+	PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI		= 0x87F8
 
-# VERSION_2_0 enum: (Promoted for OpenGL 2.0)
-# ATI_separate_stencil enum:
-#	STENCIL_BACK_FUNC				= 0x8800    # VERSION_2_0
-#	STENCIL_BACK_FUNC_ATI				= 0x8800
-#	STENCIL_BACK_FAIL				= 0x8801    # VERSION_2_0
-#	STENCIL_BACK_FAIL_ATI				= 0x8801
-#	STENCIL_BACK_PASS_DEPTH_FAIL			= 0x8802    # VERSION_2_0
-#	STENCIL_BACK_PASS_DEPTH_FAIL_ATI		= 0x8802
-#	STENCIL_BACK_PASS_DEPTH_PASS			= 0x8803    # VERSION_2_0
-#	STENCIL_BACK_PASS_DEPTH_PASS_ATI		= 0x8803
+AMD_compressed_3DC_texture enum: (OpenGL ES only)
+	3DC_X_AMD					= 0x87F9
+	3DC_XY_AMD					= 0x87FA
 
-# ARB_fragment_program enum:
-#	FRAGMENT_PROGRAM_ARB				= 0x8804
-#	PROGRAM_ALU_INSTRUCTIONS_ARB			= 0x8805
-#	PROGRAM_TEX_INSTRUCTIONS_ARB			= 0x8806
-#	PROGRAM_TEX_INDIRECTIONS_ARB			= 0x8807
-#	PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB		= 0x8808
-#	PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB		= 0x8809
-#	PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB		= 0x880A
-#	MAX_PROGRAM_ALU_INSTRUCTIONS_ARB		= 0x880B
-#	MAX_PROGRAM_TEX_INSTRUCTIONS_ARB		= 0x880C
-#	MAX_PROGRAM_TEX_INDIRECTIONS_ARB		= 0x880D
-#	MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB		= 0x880E
-#	MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB		= 0x880F
-#	MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB		= 0x8810
+ATI_meminfo enum:
+	VBO_FREE_MEMORY_ATI				= 0x87FB
+	TEXTURE_FREE_MEMORY_ATI				= 0x87FC
+	RENDERBUFFER_FREE_MEMORY_ATI			= 0x87FD
 
+OES_get_program_binary enum: (OpenGL ES only;
+	NUM_PROGRAM_BINARY_FORMATS_OES			= 0x87FE
+	PROGRAM_BINARY_FORMATS_OES			= 0x87FF
+
+VERSION_2_0 enum: (Promoted for OpenGL 2.0)
+	STENCIL_BACK_FUNC				= 0x8800    # VERSION_2_0
+	STENCIL_BACK_FAIL				= 0x8801    # VERSION_2_0
+	STENCIL_BACK_PASS_DEPTH_FAIL			= 0x8802    # VERSION_2_0
+	STENCIL_BACK_PASS_DEPTH_PASS			= 0x8803    # VERSION_2_0
+	STENCIL_BACK_FAIL_ATI				= 0x8801
+
+ATI_separate_stencil enum:
+	STENCIL_BACK_FUNC_ATI				= 0x8800
+	STENCIL_BACK_PASS_DEPTH_FAIL_ATI		= 0x8802
+	STENCIL_BACK_PASS_DEPTH_PASS_ATI		= 0x8803
+
+ARB_fragment_program enum:
+	FRAGMENT_PROGRAM_ARB				= 0x8804
+	PROGRAM_ALU_INSTRUCTIONS_ARB			= 0x8805
+	PROGRAM_TEX_INSTRUCTIONS_ARB			= 0x8806
+	PROGRAM_TEX_INDIRECTIONS_ARB			= 0x8807
+	PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB		= 0x8808
+	PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB		= 0x8809
+	PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB		= 0x880A
+	MAX_PROGRAM_ALU_INSTRUCTIONS_ARB		= 0x880B
+	MAX_PROGRAM_TEX_INSTRUCTIONS_ARB		= 0x880C
+	MAX_PROGRAM_TEX_INDIRECTIONS_ARB		= 0x880D
+	MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB		= 0x880E
+	MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB		= 0x880F
+	MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB		= 0x8810
+
 # ATI_future_use: 0x8811-0x8813
 
-# VERSION_3_0 enum:
-# ARB_texture_float enum:
-# ATI_texture_float enum:
-#	RGBA32F						= 0x8814	# 3.0
-#	RGBA32F_ARB					= 0x8814
-#	RGBA_FLOAT32_ATI				= 0x8814
-#	RGB32F						= 0x8815	# 3.0
-#	RGB32F_ARB					= 0x8815
-#	RGB_FLOAT32_ATI					= 0x8815
-#	ALPHA32F_ARB					= 0x8816
-#	ALPHA_FLOAT32_ATI				= 0x8816
-#	INTENSITY32F_ARB				= 0x8817
-#	INTENSITY_FLOAT32_ATI				= 0x8817
-#	LUMINANCE32F_ARB				= 0x8818
-#	LUMINANCE_FLOAT32_ATI				= 0x8818
-#	LUMINANCE_ALPHA32F_ARB				= 0x8819
-#	LUMINANCE_ALPHA_FLOAT32_ATI			= 0x8819
-#	RGBA16F						= 0x881A	# 3.0
-#	RGBA16F_ARB					= 0x881A
-#	RGBA_FLOAT16_ATI				= 0x881A
-#	RGB16F						= 0x881B	# 3.0
-#	RGB16F_ARB					= 0x881B
-#	RGB_FLOAT16_ATI					= 0x881B
-#	ALPHA16F_ARB					= 0x881C
-#	ALPHA_FLOAT16_ATI				= 0x881C
-#	INTENSITY16F_ARB				= 0x881D
-#	INTENSITY_FLOAT16_ATI				= 0x881D
-#	LUMINANCE16F_ARB				= 0x881E
-#	LUMINANCE_FLOAT16_ATI				= 0x881E
-#	LUMINANCE_ALPHA16F_ARB				= 0x881F
-#	LUMINANCE_ALPHA_FLOAT16_ATI			= 0x881F
+VERSION_3_0 enum:
+	RGBA32F						= 0x8814    # VERSION_3_0
+	RGB32F						= 0x8815    # VERSION_3_0
+	RGBA16F						= 0x881A    # VERSION_3_0
+	RGB16F						= 0x881B    # VERSION_3_0
 
-# ARB_color_buffer_float enum:
-# ATI_pixel_format_float enum: (really WGL_ATI_pixel_format_float)
-#	RGBA_FLOAT_MODE_ARB				= 0x8820
-#	TYPE_RGBA_FLOAT_ATI				= 0x8820
+ARB_texture_float enum:
+	RGBA32F_ARB					= 0x8814
+	RGB32F_ARB					= 0x8815
+	ALPHA32F_ARB					= 0x8816
+	INTENSITY32F_ARB				= 0x8817
+	LUMINANCE32F_ARB				= 0x8818
+	LUMINANCE_ALPHA32F_ARB				= 0x8819
+	RGBA16F_ARB					= 0x881A
+	RGB16F_ARB					= 0x881B
+	ALPHA16F_ARB					= 0x881C
+	INTENSITY16F_ARB				= 0x881D
+	LUMINANCE16F_ARB				= 0x881E
+	LUMINANCE_ALPHA16F_ARB				= 0x881F
 
-# ATI_future_use: 0x8821-0x8823
+ATI_texture_float enum:
+	RGBA_FLOAT32_ATI				= 0x8814
+	RGB_FLOAT32_ATI					= 0x8815
+	ALPHA_FLOAT32_ATI				= 0x8816
+	INTENSITY_FLOAT32_ATI				= 0x8817
+	LUMINANCE_FLOAT32_ATI				= 0x8818
+	LUMINANCE_ALPHA_FLOAT32_ATI			= 0x8819
+	RGBA_FLOAT16_ATI				= 0x881A
+	RGB_FLOAT16_ATI					= 0x881B
+	ALPHA_FLOAT16_ATI				= 0x881C
+	INTENSITY_FLOAT16_ATI				= 0x881D
+	LUMINANCE_FLOAT16_ATI				= 0x881E
+	LUMINANCE_ALPHA_FLOAT16_ATI			= 0x881F
 
-# VERSION_2_0 enum: (Promoted for OpenGL 2.0)
-# ARB_draw_buffers enum:
-# ATI_draw_buffers enum:
-#	MAX_DRAW_BUFFERS				= 0x8824    # VERSION_2_0
-#	MAX_DRAW_BUFFERS_ARB				= 0x8824
-#	MAX_DRAW_BUFFERS_ATI				= 0x8824
-#	DRAW_BUFFER0					= 0x8825    # VERSION_2_0
-#	DRAW_BUFFER0_ARB				= 0x8825
-#	DRAW_BUFFER0_ATI				= 0x8825
-#	DRAW_BUFFER1					= 0x8826    # VERSION_2_0
-#	DRAW_BUFFER1_ARB				= 0x8826
-#	DRAW_BUFFER1_ATI				= 0x8826
-#	DRAW_BUFFER2					= 0x8827    # VERSION_2_0
-#	DRAW_BUFFER2_ARB				= 0x8827
-#	DRAW_BUFFER2_ATI				= 0x8827
-#	DRAW_BUFFER3					= 0x8828    # VERSION_2_0
-#	DRAW_BUFFER3_ARB				= 0x8828
-#	DRAW_BUFFER3_ATI				= 0x8828
-#	DRAW_BUFFER4					= 0x8829    # VERSION_2_0
-#	DRAW_BUFFER4_ARB				= 0x8829
-#	DRAW_BUFFER4_ATI				= 0x8829
-#	DRAW_BUFFER5					= 0x882A    # VERSION_2_0
-#	DRAW_BUFFER5_ARB				= 0x882A
-#	DRAW_BUFFER5_ATI				= 0x882A
-#	DRAW_BUFFER6					= 0x882B    # VERSION_2_0
-#	DRAW_BUFFER6_ARB				= 0x882B
-#	DRAW_BUFFER6_ATI				= 0x882B
-#	DRAW_BUFFER7					= 0x882C    # VERSION_2_0
-#	DRAW_BUFFER7_ARB				= 0x882C
-#	DRAW_BUFFER7_ATI				= 0x882C
-#	DRAW_BUFFER8					= 0x882D    # VERSION_2_0
-#	DRAW_BUFFER8_ARB				= 0x882D
-#	DRAW_BUFFER8_ATI				= 0x882D
-#	DRAW_BUFFER9					= 0x882E    # VERSION_2_0
-#	DRAW_BUFFER9_ARB				= 0x882E
-#	DRAW_BUFFER9_ATI				= 0x882E
-#	DRAW_BUFFER10					= 0x882F    # VERSION_2_0
-#	DRAW_BUFFER10_ARB				= 0x882F
-#	DRAW_BUFFER10_ATI				= 0x882F
-#	DRAW_BUFFER11					= 0x8830    # VERSION_2_0
-#	DRAW_BUFFER11_ARB				= 0x8830
-#	DRAW_BUFFER11_ATI				= 0x8830
-#	DRAW_BUFFER12					= 0x8831    # VERSION_2_0
-#	DRAW_BUFFER12_ARB				= 0x8831
-#	DRAW_BUFFER12_ATI				= 0x8831
-#	DRAW_BUFFER13					= 0x8832    # VERSION_2_0
-#	DRAW_BUFFER13_ARB				= 0x8832
-#	DRAW_BUFFER13_ATI				= 0x8832
-#	DRAW_BUFFER14					= 0x8833    # VERSION_2_0
-#	DRAW_BUFFER14_ARB				= 0x8833
-#	DRAW_BUFFER14_ATI				= 0x8833
-#	DRAW_BUFFER15					= 0x8834    # VERSION_2_0
-#	DRAW_BUFFER15_ARB				= 0x8834
-#	DRAW_BUFFER15_ATI				= 0x8834
+APPLE_float_pixels enum: (additional; see below)
+	RGBA_FLOAT32_APPLE				= 0x8814
+	RGB_FLOAT32_APPLE				= 0x8815
+	ALPHA_FLOAT32_APPLE				= 0x8816
+	INTENSITY_FLOAT32_APPLE				= 0x8817
+	LUMINANCE_FLOAT32_APPLE				= 0x8818
+	LUMINANCE_ALPHA_FLOAT32_APPLE			= 0x8819
+	RGBA_FLOAT16_APPLE				= 0x881A
+	RGB_FLOAT16_APPLE				= 0x881B
+	ALPHA_FLOAT16_APPLE				= 0x881C
+	INTENSITY_FLOAT16_APPLE				= 0x881D
+	LUMINANCE_FLOAT16_APPLE				= 0x881E
+	LUMINANCE_ALPHA_FLOAT16_APPLE			= 0x881F
 
-# ATI_pixel_format_float enum: (really WGL_ATI_pixel_format_float) (additional; see above)
-#	COLOR_CLEAR_UNCLAMPED_VALUE_ATI			= 0x8835
+ARB_color_buffer_float enum:
+	RGBA_FLOAT_MODE_ARB				= 0x8820    # Equivalent to TYPE_RGBA_FLOAT_ATI
 
+ATI_pixel_format_float enum: (really WGL_ATI_pixel_format_float)
+	TYPE_RGBA_FLOAT_ATI				= 0x8820
+
+# ATI_future_use: 0x8821-0x8822
+
+QCOM_writeonly_rendering enum: (OpenGL ES only)
+	WRITEONLY_RENDERING_QCOM			= 0x8823
+
+VERSION_2_0 enum: (Promoted for OpenGL 2.0)
+	MAX_DRAW_BUFFERS				= 0x8824    # VERSION_2_0
+	DRAW_BUFFER0					= 0x8825    # VERSION_2_0
+	DRAW_BUFFER1					= 0x8826    # VERSION_2_0
+	DRAW_BUFFER2					= 0x8827    # VERSION_2_0
+	DRAW_BUFFER3					= 0x8828    # VERSION_2_0
+	DRAW_BUFFER4					= 0x8829    # VERSION_2_0
+	DRAW_BUFFER5					= 0x882A    # VERSION_2_0
+	DRAW_BUFFER6					= 0x882B    # VERSION_2_0
+	DRAW_BUFFER7					= 0x882C    # VERSION_2_0
+	DRAW_BUFFER8					= 0x882D    # VERSION_2_0
+	DRAW_BUFFER9					= 0x882E    # VERSION_2_0
+	DRAW_BUFFER10					= 0x882F    # VERSION_2_0
+	DRAW_BUFFER11					= 0x8830    # VERSION_2_0
+	DRAW_BUFFER12					= 0x8831    # VERSION_2_0
+	DRAW_BUFFER13					= 0x8832    # VERSION_2_0
+	DRAW_BUFFER14					= 0x8833    # VERSION_2_0
+	DRAW_BUFFER15					= 0x8834    # VERSION_2_0
+
+ARB_draw_buffers enum:
+	MAX_DRAW_BUFFERS_ARB				= 0x8824
+	DRAW_BUFFER0_ARB				= 0x8825
+	DRAW_BUFFER1_ARB				= 0x8826
+	DRAW_BUFFER2_ARB				= 0x8827
+	DRAW_BUFFER3_ARB				= 0x8828
+	DRAW_BUFFER4_ARB				= 0x8829
+	DRAW_BUFFER5_ARB				= 0x882A
+	DRAW_BUFFER6_ARB				= 0x882B
+	DRAW_BUFFER7_ARB				= 0x882C
+	DRAW_BUFFER8_ARB				= 0x882D
+	DRAW_BUFFER9_ARB				= 0x882E
+	DRAW_BUFFER10_ARB				= 0x882F
+	DRAW_BUFFER11_ARB				= 0x8830
+	DRAW_BUFFER12_ARB				= 0x8831
+	DRAW_BUFFER13_ARB				= 0x8832
+	DRAW_BUFFER14_ARB				= 0x8833
+	DRAW_BUFFER15_ARB				= 0x8834
+
+ATI_draw_buffers enum:
+	MAX_DRAW_BUFFERS_ATI				= 0x8824
+	DRAW_BUFFER0_ATI				= 0x8825
+	DRAW_BUFFER1_ATI				= 0x8826
+	DRAW_BUFFER2_ATI				= 0x8827
+	DRAW_BUFFER3_ATI				= 0x8828
+	DRAW_BUFFER4_ATI				= 0x8829
+	DRAW_BUFFER5_ATI				= 0x882A
+	DRAW_BUFFER6_ATI				= 0x882B
+	DRAW_BUFFER7_ATI				= 0x882C
+	DRAW_BUFFER8_ATI				= 0x882D
+	DRAW_BUFFER9_ATI				= 0x882E
+	DRAW_BUFFER10_ATI				= 0x882F
+	DRAW_BUFFER11_ATI				= 0x8830
+	DRAW_BUFFER12_ATI				= 0x8831
+	DRAW_BUFFER13_ATI				= 0x8832
+	DRAW_BUFFER14_ATI				= 0x8833
+	DRAW_BUFFER15_ATI				= 0x8834
+
+ATI_pixel_format_float enum: (really WGL_ATI_pixel_format_float) (additional; see above)
+	COLOR_CLEAR_UNCLAMPED_VALUE_ATI			= 0x8835
+
 # ATI_future_use: 0x8836-0x883F
 
-# VERSION_2_0 enum: (Promoted for OpenGL 2.0)
-# EXT_blend_equation_separate enum:
-#	BLEND_EQUATION_ALPHA				= 0x883D    # VERSION_2_0
-#	BLEND_EQUATION_ALPHA_EXT			= 0x883D
+VERSION_2_0 enum: (Promoted for OpenGL 2.0)
+	BLEND_EQUATION_ALPHA				= 0x883D    # VERSION_2_0
 
+EXT_blend_equation_separate enum:
+	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
+# OpenGL ARB: 0x8840-0x884F
 
-# ARB_matrix_palette enum:
-#	MATRIX_PALETTE_ARB				= 0x8840
-#	MAX_MATRIX_PALETTE_STACK_DEPTH_ARB		= 0x8841
-#	MAX_PALETTE_MATRICES_ARB			= 0x8842
-#	CURRENT_PALETTE_MATRIX_ARB			= 0x8843
-#	MATRIX_INDEX_ARRAY_ARB				= 0x8844
-#	CURRENT_MATRIX_INDEX_ARB			= 0x8845
-#	MATRIX_INDEX_ARRAY_SIZE_ARB			= 0x8846
-#	MATRIX_INDEX_ARRAY_TYPE_ARB			= 0x8847
-#	MATRIX_INDEX_ARRAY_STRIDE_ARB			= 0x8848
-#	MATRIX_INDEX_ARRAY_POINTER_ARB			= 0x8849
+ARB_matrix_palette enum:
+	MATRIX_PALETTE_ARB				= 0x8840
+	MAX_MATRIX_PALETTE_STACK_DEPTH_ARB		= 0x8841
+	MAX_PALETTE_MATRICES_ARB			= 0x8842
+	CURRENT_PALETTE_MATRIX_ARB			= 0x8843
+	MATRIX_INDEX_ARRAY_ARB				= 0x8844
+	CURRENT_MATRIX_INDEX_ARB			= 0x8845
+	MATRIX_INDEX_ARRAY_SIZE_ARB			= 0x8846
+	MATRIX_INDEX_ARRAY_TYPE_ARB			= 0x8847
+	MATRIX_INDEX_ARRAY_STRIDE_ARB			= 0x8848
+	MATRIX_INDEX_ARRAY_POINTER_ARB			= 0x8849
 
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# ARB_depth_texture enum:
-#	TEXTURE_DEPTH_SIZE				= 0x884A
-#	TEXTURE_DEPTH_SIZE_ARB				= 0x884A
-#	DEPTH_TEXTURE_MODE				= 0x884B
-#	DEPTH_TEXTURE_MODE_ARB				= 0x884B
+# 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_3_0 enum: (aliases)
-# VERSION_1_4 enum: (Promoted for OpenGL 1.4)
-# ARB_shadow enum:
-# EXT_texture_array enum: (additional; see below)
-#	TEXTURE_COMPARE_MODE				= 0x884C
-#	TEXTURE_COMPARE_MODE_ARB			= 0x884C
-#	TEXTURE_COMPARE_FUNC				= 0x884D
-#	TEXTURE_COMPARE_FUNC_ARB			= 0x884D
-#	COMPARE_REF_TO_TEXTURE				= GL_COMPARE_R_TO_TEXTURE_ARB	# 3.0
-#	COMPARE_R_TO_TEXTURE				= 0x884E
-#	COMPARE_R_TO_TEXTURE_ARB			= 0x884E
-#	COMPARE_REF_DEPTH_TO_TEXTURE_EXT		= 0x884E
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	TEXTURE_DEPTH_SIZE				= 0x884A
+	DEPTH_TEXTURE_MODE				= 0x884B
 
-# ARB_future_use: 0x884F
+ARB_depth_texture enum:
+	TEXTURE_DEPTH_SIZE_ARB				= 0x884A
+	DEPTH_TEXTURE_MODE_ARB				= 0x884B
 
+VERSION_3_0 enum: (aliases)
+	COMPARE_REF_TO_TEXTURE				= 0x884E    # VERSION_3_0   # alias GL_COMPARE_R_TO_TEXTURE_ARB
+
+VERSION_1_4 enum: (Promoted for OpenGL 1.4)
+	TEXTURE_COMPARE_MODE				= 0x884C
+	TEXTURE_COMPARE_FUNC				= 0x884D
+	COMPARE_R_TO_TEXTURE				= 0x884E
+
+ARB_shadow enum:
+	TEXTURE_COMPARE_MODE_ARB			= 0x884C
+	TEXTURE_COMPARE_FUNC_ARB			= 0x884D
+	COMPARE_R_TO_TEXTURE_ARB			= 0x884E
+
+EXT_texture_array enum: (additional; see below)
+	COMPARE_REF_DEPTH_TO_TEXTURE_EXT		= 0x884E
+
+VERSION_3_2 enum:
+	use ARB_seamless_cube_map	    TEXTURE_CUBE_MAP_SEAMLESS
+
+ARB_seamless_cube_map enum:
+	TEXTURE_CUBE_MAP_SEAMLESS			= 0x884F
+
 ###############################################################################
 
 # NVIDIA: 0x8850-0x891F
 
-# NV_texture_shader3 enum:
-#	OFFSET_PROJECTIVE_TEXTURE_2D_NV			= 0x8850
-#	OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV		= 0x8851
-#	OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV		= 0x8852
-#	OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV	= 0x8853
-#	OFFSET_HILO_TEXTURE_2D_NV			= 0x8854
-#	OFFSET_HILO_TEXTURE_RECTANGLE_NV		= 0x8855
-#	OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV		= 0x8856
-#	OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV	= 0x8857
-#	DEPENDENT_HILO_TEXTURE_2D_NV			= 0x8858
-#	DEPENDENT_RGB_TEXTURE_3D_NV			= 0x8859
-#	DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV		= 0x885A
-#	DOT_PRODUCT_PASS_THROUGH_NV			= 0x885B
-#	DOT_PRODUCT_TEXTURE_1D_NV			= 0x885C
-#	DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV		= 0x885D
-#	HILO8_NV					= 0x885E
-#	SIGNED_HILO8_NV					= 0x885F
-#	FORCE_BLUE_TO_ONE_NV				= 0x8860
+NV_texture_shader3 enum:
+	OFFSET_PROJECTIVE_TEXTURE_2D_NV			= 0x8850
+	OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV		= 0x8851
+	OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV		= 0x8852
+	OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV	= 0x8853
+	OFFSET_HILO_TEXTURE_2D_NV			= 0x8854
+	OFFSET_HILO_TEXTURE_RECTANGLE_NV		= 0x8855
+	OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV		= 0x8856
+	OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV	= 0x8857
+	DEPENDENT_HILO_TEXTURE_2D_NV			= 0x8858
+	DEPENDENT_RGB_TEXTURE_3D_NV			= 0x8859
+	DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV		= 0x885A
+	DOT_PRODUCT_PASS_THROUGH_NV			= 0x885B
+	DOT_PRODUCT_TEXTURE_1D_NV			= 0x885C
+	DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV		= 0x885D
+	HILO8_NV					= 0x885E
+	SIGNED_HILO8_NV					= 0x885F
+	FORCE_BLUE_TO_ONE_NV				= 0x8860
 
-# VERSION_2_0 enum: (Promoted for OpenGL 2.0)
-# ARB_point_sprite enum:
-# NV_point_sprite enum:
-#	POINT_SPRITE					= 0x8861    # VERSION_2_0
-#	POINT_SPRITE_ARB				= 0x8861
-#	POINT_SPRITE_NV					= 0x8861
-#	COORD_REPLACE					= 0x8862    # VERSION_2_0
-#	COORD_REPLACE_ARB				= 0x8862
-#	COORD_REPLACE_NV				= 0x8862
+VERSION_2_0 enum: (Promoted for OpenGL 2.0)
+	POINT_SPRITE					= 0x8861    # VERSION_2_0
+	COORD_REPLACE					= 0x8862    # VERSION_2_0
 
-# NV_point_sprite enum:
-#	POINT_SPRITE_R_MODE_NV				= 0x8863
+ARB_point_sprite enum:
+	POINT_SPRITE_ARB				= 0x8861
+	COORD_REPLACE_ARB				= 0x8862
 
-# VERSION_1_5 enum: (Promoted for OpenGL 1.5)
-# ARB_occlusion_query enum:
-# NV_occlusion_query enum:
-#	QUERY_COUNTER_BITS				= 0x8864
-#	QUERY_COUNTER_BITS_ARB				= 0x8864
-#	PIXEL_COUNTER_BITS_NV				= 0x8864
-#	CURRENT_QUERY					= 0x8865
-#	CURRENT_QUERY_ARB				= 0x8865
-#	CURRENT_OCCLUSION_QUERY_ID_NV			= 0x8865
-#	QUERY_RESULT					= 0x8866
-#	QUERY_RESULT_ARB				= 0x8866
-#	PIXEL_COUNT_NV					= 0x8866
-#	QUERY_RESULT_AVAILABLE				= 0x8867
-#	QUERY_RESULT_AVAILABLE_ARB			= 0x8867
-#	PIXEL_COUNT_AVAILABLE_NV			= 0x8867
+NV_point_sprite enum:
+	POINT_SPRITE_NV					= 0x8861
+	COORD_REPLACE_NV				= 0x8862
 
-# NV_fragment_program enum:
-#	MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV	= 0x8868
+# Aliases ARB_point_sprite enums above
+OES_point_sprite enum: (OpenGL ES only)
+	POINT_SPRITE_ARB				= 0x8861
+	COORD_REPLACE_ARB				= 0x8862
 
-# VERSION_2_0 enum: (Promoted from ARB_vertex_shader)
-# ARB_vertex_program enum: (additional; see above)
-#	MAX_VERTEX_ATTRIBS				= 0x8869    # VERSION_2_0
-#	MAX_VERTEX_ATTRIBS_ARB				= 0x8869
-#	VERTEX_ATTRIB_ARRAY_NORMALIZED			= 0x886A    # VERSION_2_0
-#	VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB		= 0x886A
+NV_point_sprite enum:
+	POINT_SPRITE_R_MODE_NV				= 0x8863
 
+VERSION_1_5 enum: (Promoted for OpenGL 1.5)
+	QUERY_COUNTER_BITS				= 0x8864
+	CURRENT_QUERY					= 0x8865
+	QUERY_RESULT					= 0x8866
+	QUERY_RESULT_AVAILABLE				= 0x8867
+
+ARB_occlusion_query enum:
+	QUERY_COUNTER_BITS_ARB				= 0x8864
+	CURRENT_QUERY_ARB				= 0x8865
+	QUERY_RESULT_ARB				= 0x8866
+	QUERY_RESULT_AVAILABLE_ARB			= 0x8867
+
+NV_occlusion_query enum:
+	PIXEL_COUNTER_BITS_NV				= 0x8864
+	CURRENT_OCCLUSION_QUERY_ID_NV			= 0x8865
+	PIXEL_COUNT_NV					= 0x8866
+	PIXEL_COUNT_AVAILABLE_NV			= 0x8867
+
+NV_fragment_program enum:
+	MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV	= 0x8868
+
+VERSION_2_0 enum: (Promoted from ARB_vertex_shader)
+	MAX_VERTEX_ATTRIBS				= 0x8869    # VERSION_2_0
+	VERTEX_ATTRIB_ARRAY_NORMALIZED			= 0x886A    # VERSION_2_0
+
+ARB_vertex_program enum: (additional; see above)
+	MAX_VERTEX_ATTRIBS_ARB				= 0x8869
+	VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB		= 0x886A
+
 # NV_future_use: 0x886B-0x886D
 
-# NV_copy_depth_to_color enum:
-#	DEPTH_STENCIL_TO_RGBA_NV			= 0x886E
-#	DEPTH_STENCIL_TO_BGRA_NV			= 0x886F
+NV_copy_depth_to_color enum:
+	DEPTH_STENCIL_TO_RGBA_NV			= 0x886E
+	DEPTH_STENCIL_TO_BGRA_NV			= 0x886F
 
-# VERSION_2_0 enum: (Promoted from ARB_fragment_shader; only some values)
-# ARB_vertex_program enum: (additional; see above)
-# ARB_fragment_program enum: (additional; see above)
-# NV_fragment_program enum: (additional; see above)
-#	FRAGMENT_PROGRAM_NV				= 0x8870
-#	MAX_TEXTURE_COORDS				= 0x8871    # VERSION_2_0
-#	MAX_TEXTURE_COORDS_ARB				= 0x8871    # ARB_fragment_program
-#	MAX_TEXTURE_COORDS_NV				= 0x8871
-#	MAX_TEXTURE_IMAGE_UNITS				= 0x8872    # VERSION_2_0
-#	MAX_TEXTURE_IMAGE_UNITS_ARB			= 0x8872    # ARB_fragment_program
-#	MAX_TEXTURE_IMAGE_UNITS_NV			= 0x8872
-#	FRAGMENT_PROGRAM_BINDING_NV			= 0x8873
-#	PROGRAM_ERROR_STRING_ARB			= 0x8874    # ARB_vertex_program / ARB_fragment_program
-#	PROGRAM_ERROR_STRING_NV				= 0x8874
-#	PROGRAM_FORMAT_ASCII_ARB			= 0x8875    # ARB_vertex_program / ARB_fragment_program
-#	PROGRAM_FORMAT_ARB				= 0x8876    # ARB_vertex_program / ARB_fragment_program
+NV_fragment_program enum: (additional; see above)
+	FRAGMENT_PROGRAM_NV				= 0x8870
+	MAX_TEXTURE_COORDS_NV				= 0x8871
+	MAX_TEXTURE_IMAGE_UNITS_NV			= 0x8872
+	FRAGMENT_PROGRAM_BINDING_NV			= 0x8873
+	PROGRAM_ERROR_STRING_NV				= 0x8874
 
+VERSION_2_0 enum: (Promoted from ARB_fragment_shader; only some values)
+	MAX_TEXTURE_COORDS				= 0x8871    # VERSION_2_0
+	MAX_TEXTURE_IMAGE_UNITS				= 0x8872    # VERSION_2_0
+
+ARB_vertex_program enum: (additional; see above)
+ARB_fragment_program enum: (additional; see above)
+	MAX_TEXTURE_COORDS_ARB				= 0x8871    # ARB_fragment_program
+	MAX_TEXTURE_IMAGE_UNITS_ARB			= 0x8872    # ARB_fragment_program
+	PROGRAM_ERROR_STRING_ARB			= 0x8874    # ARB_vertex_program / ARB_fragment_program
+	PROGRAM_FORMAT_ASCII_ARB			= 0x8875    # ARB_vertex_program / ARB_fragment_program
+	PROGRAM_FORMAT_ARB				= 0x8876    # ARB_vertex_program / ARB_fragment_program
+
 # 0x8877 *should have been* assigned to PROGRAM_BINDING_ARB. Oops.
 
-# NV_pixel_data_range enum:
-#	WRITE_PIXEL_DATA_RANGE_NV			= 0x8878
-#	READ_PIXEL_DATA_RANGE_NV			= 0x8879
-#	WRITE_PIXEL_DATA_RANGE_LENGTH_NV		= 0x887A
-#	READ_PIXEL_DATA_RANGE_LENGTH_NV			= 0x887B
-#	WRITE_PIXEL_DATA_RANGE_POINTER_NV		= 0x887C
-#	READ_PIXEL_DATA_RANGE_POINTER_NV		= 0x887D
+NV_pixel_data_range enum:
+	WRITE_PIXEL_DATA_RANGE_NV			= 0x8878
+	READ_PIXEL_DATA_RANGE_NV			= 0x8879
+	WRITE_PIXEL_DATA_RANGE_LENGTH_NV		= 0x887A
+	READ_PIXEL_DATA_RANGE_LENGTH_NV			= 0x887B
+	WRITE_PIXEL_DATA_RANGE_POINTER_NV		= 0x887C
+	READ_PIXEL_DATA_RANGE_POINTER_NV		= 0x887D
 
 # NV_future_use: 0x887E-0x887F
 
-# NV_float_buffer enum:
-#	FLOAT_R_NV					= 0x8880
-#	FLOAT_RG_NV					= 0x8881
-#	FLOAT_RGB_NV					= 0x8882
-#	FLOAT_RGBA_NV					= 0x8883
-#	FLOAT_R16_NV					= 0x8884
-#	FLOAT_R32_NV					= 0x8885
-#	FLOAT_RG16_NV					= 0x8886
-#	FLOAT_RG32_NV					= 0x8887
-#	FLOAT_RGB16_NV					= 0x8888
-#	FLOAT_RGB32_NV					= 0x8889
-#	FLOAT_RGBA16_NV					= 0x888A
-#	FLOAT_RGBA32_NV					= 0x888B
-#	TEXTURE_FLOAT_COMPONENTS_NV			= 0x888C
-#	FLOAT_CLEAR_COLOR_VALUE_NV			= 0x888D
-#	FLOAT_RGBA_MODE_NV				= 0x888E
+NV_float_buffer enum:
+	FLOAT_R_NV					= 0x8880
+	FLOAT_RG_NV					= 0x8881
+	FLOAT_RGB_NV					= 0x8882
+	FLOAT_RGBA_NV					= 0x8883
+	FLOAT_R16_NV					= 0x8884
+	FLOAT_R32_NV					= 0x8885
+	FLOAT_RG16_NV					= 0x8886
+	FLOAT_RG32_NV					= 0x8887
+	FLOAT_RGB16_NV					= 0x8888
+	FLOAT_RGB32_NV					= 0x8889
+	FLOAT_RGBA16_NV					= 0x888A
+	FLOAT_RGBA32_NV					= 0x888B
+	TEXTURE_FLOAT_COMPONENTS_NV			= 0x888C
+	FLOAT_CLEAR_COLOR_VALUE_NV			= 0x888D
+	FLOAT_RGBA_MODE_NV				= 0x888E
 
-# NV_texture_expand_normal enum:
-#	TEXTURE_UNSIGNED_REMAP_MODE_NV			= 0x888F
+NV_texture_expand_normal enum:
+	TEXTURE_UNSIGNED_REMAP_MODE_NV			= 0x888F
 
-# EXT_depth_bounds_test enum:
-#	DEPTH_BOUNDS_TEST_EXT				= 0x8890
-#	DEPTH_BOUNDS_EXT				= 0x8891
+EXT_depth_bounds_test enum:
+	DEPTH_BOUNDS_TEST_EXT				= 0x8890
+	DEPTH_BOUNDS_EXT				= 0x8891
 
-# VERSION_1_5 enum: (Promoted for OpenGL 1.5)
-# ARB_vertex_buffer_object enum:
-#	ARRAY_BUFFER					= 0x8892
-#	ARRAY_BUFFER_ARB				= 0x8892
-#	ELEMENT_ARRAY_BUFFER				= 0x8893
-#	ELEMENT_ARRAY_BUFFER_ARB			= 0x8893
-#	ARRAY_BUFFER_BINDING				= 0x8894
-#	ARRAY_BUFFER_BINDING_ARB			= 0x8894
-#	ELEMENT_ARRAY_BUFFER_BINDING			= 0x8895
-#	ELEMENT_ARRAY_BUFFER_BINDING_ARB		= 0x8895
-#	VERTEX_ARRAY_BUFFER_BINDING			= 0x8896
-#	VERTEX_ARRAY_BUFFER_BINDING_ARB			= 0x8896
-#	NORMAL_ARRAY_BUFFER_BINDING			= 0x8897
-#	NORMAL_ARRAY_BUFFER_BINDING_ARB			= 0x8897
-#	COLOR_ARRAY_BUFFER_BINDING			= 0x8898
-#	COLOR_ARRAY_BUFFER_BINDING_ARB			= 0x8898
-#	INDEX_ARRAY_BUFFER_BINDING			= 0x8899
-#	INDEX_ARRAY_BUFFER_BINDING_ARB			= 0x8899
-#	TEXTURE_COORD_ARRAY_BUFFER_BINDING		= 0x889A
-#	TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB		= 0x889A
-#	EDGE_FLAG_ARRAY_BUFFER_BINDING			= 0x889B
-#	EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB		= 0x889B
-#	SECONDARY_COLOR_ARRAY_BUFFER_BINDING		= 0x889C
-#	SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB	= 0x889C
-#	FOG_COORD_ARRAY_BUFFER_BINDING			= GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#	FOG_COORDINATE_ARRAY_BUFFER_BINDING		= 0x889D
-#	FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB		= 0x889D
-#	WEIGHT_ARRAY_BUFFER_BINDING			= 0x889E
-#	WEIGHT_ARRAY_BUFFER_BINDING_ARB			= 0x889E
-#	VERTEX_ATTRIB_ARRAY_BUFFER_BINDING		= 0x889F
-#	VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB		= 0x889F
+VERSION_1_5 enum: (Promoted for OpenGL 1.5)
+	ARRAY_BUFFER					= 0x8892
+	ELEMENT_ARRAY_BUFFER				= 0x8893
+	ARRAY_BUFFER_BINDING				= 0x8894
+	ELEMENT_ARRAY_BUFFER_BINDING			= 0x8895
+	VERTEX_ARRAY_BUFFER_BINDING			= 0x8896
+	NORMAL_ARRAY_BUFFER_BINDING			= 0x8897
+	COLOR_ARRAY_BUFFER_BINDING			= 0x8898
+	INDEX_ARRAY_BUFFER_BINDING			= 0x8899
+	TEXTURE_COORD_ARRAY_BUFFER_BINDING		= 0x889A
+	EDGE_FLAG_ARRAY_BUFFER_BINDING			= 0x889B
+	SECONDARY_COLOR_ARRAY_BUFFER_BINDING		= 0x889C
+	FOG_COORD_ARRAY_BUFFER_BINDING			= 0x889D    # alias GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+	FOG_COORDINATE_ARRAY_BUFFER_BINDING		= 0x889D
+	WEIGHT_ARRAY_BUFFER_BINDING			= 0x889E
+	VERTEX_ATTRIB_ARRAY_BUFFER_BINDING		= 0x889F
 
-# ARB_vertex_program enum: (additional; see above)
-# ARB_fragment_program enum: (additional; see above)
-#	PROGRAM_INSTRUCTIONS_ARB			= 0x88A0
-#	MAX_PROGRAM_INSTRUCTIONS_ARB			= 0x88A1
-#	PROGRAM_NATIVE_INSTRUCTIONS_ARB			= 0x88A2
-#	MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB		= 0x88A3
-#	PROGRAM_TEMPORARIES_ARB				= 0x88A4
-#	MAX_PROGRAM_TEMPORARIES_ARB			= 0x88A5
-#	PROGRAM_NATIVE_TEMPORARIES_ARB			= 0x88A6
-#	MAX_PROGRAM_NATIVE_TEMPORARIES_ARB		= 0x88A7
-#	PROGRAM_PARAMETERS_ARB				= 0x88A8
-#	MAX_PROGRAM_PARAMETERS_ARB			= 0x88A9
-#	PROGRAM_NATIVE_PARAMETERS_ARB			= 0x88AA
-#	MAX_PROGRAM_NATIVE_PARAMETERS_ARB		= 0x88AB
-#	PROGRAM_ATTRIBS_ARB				= 0x88AC
-#	MAX_PROGRAM_ATTRIBS_ARB				= 0x88AD
-#	PROGRAM_NATIVE_ATTRIBS_ARB			= 0x88AE
-#	MAX_PROGRAM_NATIVE_ATTRIBS_ARB			= 0x88AF
-#	PROGRAM_ADDRESS_REGISTERS_ARB			= 0x88B0
-#	MAX_PROGRAM_ADDRESS_REGISTERS_ARB		= 0x88B1
-#	PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB		= 0x88B2
-#	MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB	= 0x88B3
-#	MAX_PROGRAM_LOCAL_PARAMETERS_ARB		= 0x88B4
-#	MAX_PROGRAM_ENV_PARAMETERS_ARB			= 0x88B5
-#	PROGRAM_UNDER_NATIVE_LIMITS_ARB			= 0x88B6
-#	TRANSPOSE_CURRENT_MATRIX_ARB			= 0x88B7
+ARB_vertex_buffer_object enum:
+	ARRAY_BUFFER_ARB				= 0x8892
+	ELEMENT_ARRAY_BUFFER_ARB			= 0x8893
+	ARRAY_BUFFER_BINDING_ARB			= 0x8894
+	ELEMENT_ARRAY_BUFFER_BINDING_ARB		= 0x8895
+	VERTEX_ARRAY_BUFFER_BINDING_ARB			= 0x8896
+	NORMAL_ARRAY_BUFFER_BINDING_ARB			= 0x8897
+	COLOR_ARRAY_BUFFER_BINDING_ARB			= 0x8898
+	INDEX_ARRAY_BUFFER_BINDING_ARB			= 0x8899
+	TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB		= 0x889A
+	EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB		= 0x889B
+	SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB	= 0x889C
+	FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB		= 0x889D
+	WEIGHT_ARRAY_BUFFER_BINDING_ARB			= 0x889E
+	VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB		= 0x889F
 
-# VERSION_1_5 enum: (Promoted for OpenGL 1.5)
-# ARB_vertex_buffer_object enum: (additional; see above)
-#	READ_ONLY					= 0x88B8
-#	READ_ONLY_ARB					= 0x88B8
-#	WRITE_ONLY					= 0x88B9
-#	WRITE_ONLY_ARB					= 0x88B9
-#	READ_WRITE					= 0x88BA
-#	READ_WRITE_ARB					= 0x88BA
-#	BUFFER_ACCESS					= 0x88BB
-#	BUFFER_ACCESS_ARB				= 0x88BB
-#	BUFFER_MAPPED					= 0x88BC
-#	BUFFER_MAPPED_ARB				= 0x88BC
-#	BUFFER_MAP_POINTER				= 0x88BD
-#	BUFFER_MAP_POINTER_ARB				= 0x88BD
+# 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
+	MAX_PROGRAM_INSTRUCTIONS_ARB			= 0x88A1
+	PROGRAM_NATIVE_INSTRUCTIONS_ARB			= 0x88A2
+	MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB		= 0x88A3
+	PROGRAM_TEMPORARIES_ARB				= 0x88A4
+	MAX_PROGRAM_TEMPORARIES_ARB			= 0x88A5
+	PROGRAM_NATIVE_TEMPORARIES_ARB			= 0x88A6
+	MAX_PROGRAM_NATIVE_TEMPORARIES_ARB		= 0x88A7
+	PROGRAM_PARAMETERS_ARB				= 0x88A8
+	MAX_PROGRAM_PARAMETERS_ARB			= 0x88A9
+	PROGRAM_NATIVE_PARAMETERS_ARB			= 0x88AA
+	MAX_PROGRAM_NATIVE_PARAMETERS_ARB		= 0x88AB
+	PROGRAM_ATTRIBS_ARB				= 0x88AC
+	MAX_PROGRAM_ATTRIBS_ARB				= 0x88AD
+	PROGRAM_NATIVE_ATTRIBS_ARB			= 0x88AE
+	MAX_PROGRAM_NATIVE_ATTRIBS_ARB			= 0x88AF
+	PROGRAM_ADDRESS_REGISTERS_ARB			= 0x88B0
+	MAX_PROGRAM_ADDRESS_REGISTERS_ARB		= 0x88B1
+	PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB		= 0x88B2
+	MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB	= 0x88B3
+	MAX_PROGRAM_LOCAL_PARAMETERS_ARB		= 0x88B4
+	MAX_PROGRAM_ENV_PARAMETERS_ARB			= 0x88B5
+	PROGRAM_UNDER_NATIVE_LIMITS_ARB			= 0x88B6
+	TRANSPOSE_CURRENT_MATRIX_ARB			= 0x88B7
+
+VERSION_1_5 enum: (Promoted for OpenGL 1.5)
+	READ_ONLY					= 0x88B8
+	WRITE_ONLY					= 0x88B9
+	READ_WRITE					= 0x88BA
+	BUFFER_ACCESS					= 0x88BB
+	BUFFER_MAPPED					= 0x88BC
+	BUFFER_MAP_POINTER				= 0x88BD
+
+ARB_vertex_buffer_object enum: (additional; see above)
+	READ_ONLY_ARB					= 0x88B8
+	WRITE_ONLY_ARB					= 0x88B9
+	READ_WRITE_ARB					= 0x88BA
+	BUFFER_ACCESS_ARB				= 0x88BB
+	BUFFER_MAPPED_ARB				= 0x88BC
+	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:
-#	TIME_ELAPSED_EXT				= 0x88BF
+EXT_timer_query enum:
+	TIME_ELAPSED_EXT				= 0x88BF
 
-# ARB_vertex_program enum: (additional; see above)
-# ARB_fragment_program enum: (additional; see above)
-#	MATRIX0_ARB					= 0x88C0
-#	MATRIX1_ARB					= 0x88C1
-#	MATRIX2_ARB					= 0x88C2
-#	MATRIX3_ARB					= 0x88C3
-#	MATRIX4_ARB					= 0x88C4
-#	MATRIX5_ARB					= 0x88C5
-#	MATRIX6_ARB					= 0x88C6
-#	MATRIX7_ARB					= 0x88C7
-#	MATRIX8_ARB					= 0x88C8
-#	MATRIX9_ARB					= 0x88C9
-#	MATRIX10_ARB					= 0x88CA
-#	MATRIX11_ARB					= 0x88CB
-#	MATRIX12_ARB					= 0x88CC
-#	MATRIX13_ARB					= 0x88CD
-#	MATRIX14_ARB					= 0x88CE
-#	MATRIX15_ARB					= 0x88CF
-#	MATRIX16_ARB					= 0x88D0
-#	MATRIX17_ARB					= 0x88D1
-#	MATRIX18_ARB					= 0x88D2
-#	MATRIX19_ARB					= 0x88D3
-#	MATRIX20_ARB					= 0x88D4
-#	MATRIX21_ARB					= 0x88D5
-#	MATRIX22_ARB					= 0x88D6
-#	MATRIX23_ARB					= 0x88D7
-#	MATRIX24_ARB					= 0x88D8
-#	MATRIX25_ARB					= 0x88D9
-#	MATRIX26_ARB					= 0x88DA
-#	MATRIX27_ARB					= 0x88DB
-#	MATRIX28_ARB					= 0x88DC
-#	MATRIX29_ARB					= 0x88DD
-#	MATRIX30_ARB					= 0x88DE
-#	MATRIX31_ARB					= 0x88DF
+ARB_vertex_program enum: (additional; see above)
+ARB_fragment_program enum: (additional; see above)
+	MATRIX0_ARB					= 0x88C0
+	MATRIX1_ARB					= 0x88C1
+	MATRIX2_ARB					= 0x88C2
+	MATRIX3_ARB					= 0x88C3
+	MATRIX4_ARB					= 0x88C4
+	MATRIX5_ARB					= 0x88C5
+	MATRIX6_ARB					= 0x88C6
+	MATRIX7_ARB					= 0x88C7
+	MATRIX8_ARB					= 0x88C8
+	MATRIX9_ARB					= 0x88C9
+	MATRIX10_ARB					= 0x88CA
+	MATRIX11_ARB					= 0x88CB
+	MATRIX12_ARB					= 0x88CC
+	MATRIX13_ARB					= 0x88CD
+	MATRIX14_ARB					= 0x88CE
+	MATRIX15_ARB					= 0x88CF
+	MATRIX16_ARB					= 0x88D0
+	MATRIX17_ARB					= 0x88D1
+	MATRIX18_ARB					= 0x88D2
+	MATRIX19_ARB					= 0x88D3
+	MATRIX20_ARB					= 0x88D4
+	MATRIX21_ARB					= 0x88D5
+	MATRIX22_ARB					= 0x88D6
+	MATRIX23_ARB					= 0x88D7
+	MATRIX24_ARB					= 0x88D8
+	MATRIX25_ARB					= 0x88D9
+	MATRIX26_ARB					= 0x88DA
+	MATRIX27_ARB					= 0x88DB
+	MATRIX28_ARB					= 0x88DC
+	MATRIX29_ARB					= 0x88DD
+	MATRIX30_ARB					= 0x88DE
+	MATRIX31_ARB					= 0x88DF
 
-# VERSION_1_5 enum: (Promoted for OpenGL 1.5)
-# ARB_vertex_buffer_object enum: (additional; see above)
-#	STREAM_DRAW					= 0x88E0
-#	STREAM_DRAW_ARB					= 0x88E0
-#	STREAM_READ					= 0x88E1
-#	STREAM_READ_ARB					= 0x88E1
-#	STREAM_COPY					= 0x88E2
-#	STREAM_COPY_ARB					= 0x88E2
-#	STATIC_DRAW					= 0x88E4
-#	STATIC_DRAW_ARB					= 0x88E4
-#	STATIC_READ					= 0x88E5
-#	STATIC_READ_ARB					= 0x88E5
-#	STATIC_COPY					= 0x88E6
-#	STATIC_COPY_ARB					= 0x88E6
-#	DYNAMIC_DRAW					= 0x88E8
-#	DYNAMIC_DRAW_ARB				= 0x88E8
-#	DYNAMIC_READ					= 0x88E9
-#	DYNAMIC_READ_ARB				= 0x88E9
-#	DYNAMIC_COPY					= 0x88EA
-#	DYNAMIC_COPY_ARB				= 0x88EA
+VERSION_1_5 enum: (Promoted for OpenGL 1.5)
+	STREAM_DRAW					= 0x88E0
+	STREAM_READ					= 0x88E1
+	STREAM_COPY					= 0x88E2
+	STATIC_DRAW					= 0x88E4
+	STATIC_READ					= 0x88E5
+	STATIC_COPY					= 0x88E6
+	DYNAMIC_DRAW					= 0x88E8
+	DYNAMIC_READ					= 0x88E9
+	DYNAMIC_COPY					= 0x88EA
 
-# VERSION_2_1 enum:
-# ARB_pixel_buffer_object enum:
-# EXT_pixel_buffer_object enum:
-#	PIXEL_PACK_BUFFER				= 0x88EB    # VERSION_2_1
-#	PIXEL_PACK_BUFFER_ARB				= 0x88EB    # ARB_pixel_buffer_object
-#	PIXEL_PACK_BUFFER_EXT				= 0x88EB    # EXT_pixel_buffer_object
-#	PIXEL_UNPACK_BUFFER				= 0x88EC    # VERSION_2_1
-#	PIXEL_UNPACK_BUFFER_ARB				= 0x88EC    # ARB_pixel_buffer_object
-#	PIXEL_UNPACK_BUFFER_EXT				= 0x88EC    # EXT_pixel_buffer_object
-#	PIXEL_PACK_BUFFER_BINDING			= 0x88ED    # VERSION_2_1
-#	PIXEL_PACK_BUFFER_BINDING_ARB			= 0x88ED    # ARB_pixel_buffer_object
-#	PIXEL_PACK_BUFFER_BINDING_EXT			= 0x88ED    # EXT_pixel_buffer_object
-#	PIXEL_UNPACK_BUFFER_BINDING			= 0x88EF    # VERSION_2_1
-#	PIXEL_UNPACK_BUFFER_BINDING_ARB			= 0x88EF    # ARB_pixel_buffer_object
-#	PIXEL_UNPACK_BUFFER_BINDING_EXT			= 0x88EF    # EXT_pixel_buffer_object
+ARB_vertex_buffer_object enum: (additional; see above)
+	STREAM_DRAW_ARB					= 0x88E0
+	STREAM_READ_ARB					= 0x88E1
+	STREAM_COPY_ARB					= 0x88E2
+	STATIC_DRAW_ARB					= 0x88E4
+	STATIC_READ_ARB					= 0x88E5
+	STATIC_COPY_ARB					= 0x88E6
+	DYNAMIC_DRAW_ARB				= 0x88E8
+	DYNAMIC_READ_ARB				= 0x88E9
+	DYNAMIC_COPY_ARB				= 0x88EA
 
+VERSION_2_1 enum:
+	PIXEL_PACK_BUFFER				= 0x88EB    # VERSION_2_1
+	PIXEL_UNPACK_BUFFER				= 0x88EC    # VERSION_2_1
+	PIXEL_PACK_BUFFER_BINDING			= 0x88ED    # VERSION_2_1
+	PIXEL_UNPACK_BUFFER_BINDING			= 0x88EF    # VERSION_2_1
+
+ARB_pixel_buffer_object enum:
+	PIXEL_PACK_BUFFER_ARB				= 0x88EB    # ARB_pixel_buffer_object
+	PIXEL_UNPACK_BUFFER_ARB				= 0x88EC    # ARB_pixel_buffer_object
+	PIXEL_PACK_BUFFER_BINDING_ARB			= 0x88ED    # ARB_pixel_buffer_object
+	PIXEL_UNPACK_BUFFER_BINDING_ARB			= 0x88EF    # ARB_pixel_buffer_object
+
+EXT_pixel_buffer_object enum:
+	PIXEL_PACK_BUFFER_EXT				= 0x88EB    # EXT_pixel_buffer_object
+	PIXEL_UNPACK_BUFFER_EXT				= 0x88EC    # EXT_pixel_buffer_object
+	PIXEL_PACK_BUFFER_BINDING_EXT			= 0x88ED    # EXT_pixel_buffer_object
+	PIXEL_UNPACK_BUFFER_BINDING_EXT			= 0x88EF    # EXT_pixel_buffer_object
+
 # ARB_future_use: 0x88E3, 0x88E7, 0x88EE
 # (for extending ARB_vertex_buffer_object):
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# EXT_packed_depth_stencil enum: (additional; see above)
-#	DEPTH24_STENCIL8				= 0x88F0    # 3.0 / ARB_fbo
-#	DEPTH24_STENCIL8_EXT				= 0x88F0
-#	TEXTURE_STENCIL_SIZE				= 0x88F1    # 3.0 / ARB_fbo
-#	TEXTURE_STENCIL_SIZE_EXT			= 0x88F1
+VERSION_3_0 enum:
+	use ARB_framebuffer_object	    DEPTH24_STENCIL8
+	use ARB_framebuffer_object	    TEXTURE_STENCIL_SIZE
 
-# EXT_stencil_clear_tag enum:
-#	STENCIL_TAG_BITS_EXT				= 0x88F2
-#	STENCIL_CLEAR_TAG_VALUE_EXT			= 0x88F3
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	DEPTH24_STENCIL8				= 0x88F0    # VERSION_3_0 / ARB_fbo
+	TEXTURE_STENCIL_SIZE				= 0x88F1    # VERSION_3_0 / ARB_fbo
 
-# NV_vertex_program2_option enum: (duplicated in NV_fragment_prgoram2 below)
-#	MAX_PROGRAM_EXEC_INSTRUCTIONS_NV		= 0x88F4
-#	MAX_PROGRAM_CALL_DEPTH_NV			= 0x88F5
+EXT_packed_depth_stencil enum: (additional; see above)
+	DEPTH24_STENCIL8_EXT				= 0x88F0
+	TEXTURE_STENCIL_SIZE_EXT			= 0x88F1
 
-# NV_fragment_program2 enum:
-#	MAX_PROGRAM_EXEC_INSTRUCTIONS_NV		= 0x88F4
-#	MAX_PROGRAM_CALL_DEPTH_NV			= 0x88F5
-#	MAX_PROGRAM_IF_DEPTH_NV				= 0x88F6
-#	MAX_PROGRAM_LOOP_DEPTH_NV			= 0x88F7
-#	MAX_PROGRAM_LOOP_COUNT_NV			= 0x88F8
+# 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
+
+NV_vertex_program2_option enum: (duplicated in NV_fragment_prgoram2 below)
+	MAX_PROGRAM_EXEC_INSTRUCTIONS_NV		= 0x88F4
+	MAX_PROGRAM_CALL_DEPTH_NV			= 0x88F5
+
+NV_fragment_program2 enum:
+	MAX_PROGRAM_EXEC_INSTRUCTIONS_NV		= 0x88F4
+	MAX_PROGRAM_CALL_DEPTH_NV			= 0x88F5
+	MAX_PROGRAM_IF_DEPTH_NV				= 0x88F6
+	MAX_PROGRAM_LOOP_DEPTH_NV			= 0x88F7
+	MAX_PROGRAM_LOOP_COUNT_NV			= 0x88F8
+
 # NV_future_use: 0x88F9-0x88FC
 
-# VERSION_3_0 enum:
-# NV_vertex_program4 enum:
-#	VERTEX_ATTRIB_ARRAY_INTEGER			= 0x88FD    # 3.0
-#	VERTEX_ATTRIB_ARRAY_INTEGER_NV			= 0x88FD
+VERSION_3_0 enum:
+	VERTEX_ATTRIB_ARRAY_INTEGER			= 0x88FD    # VERSION_3_0
 
-# ARB_instanced_arrays enum:
-#	VERTEX_ATTRIB_ARRAY_DIVISOR_ARB			= 0x88FE
+NV_vertex_program4 enum:
+	VERTEX_ATTRIB_ARRAY_INTEGER_NV			= 0x88FD
 
-# VERSION_3_0 enum:
-# EXT_texture_array enum: (additional; see below)
-#	MAX_ARRAY_TEXTURE_LAYERS			= 0x88FF    # 3.0
-#	MAX_ARRAY_TEXTURE_LAYERS_EXT			= 0x88FF
+ARB_instanced_arrays enum:
+	VERTEX_ATTRIB_ARRAY_DIVISOR_ARB			= 0x88FE
 
-# VERSION_3_0 enum:
-# NV_gpu_program4 enum:
-#	MIN_PROGRAM_TEXEL_OFFSET			= 0x8904    # 3.0
-#	MIN_PROGRAM_TEXEL_OFFSET_NV			= 0x8904
-#	MAX_PROGRAM_TEXEL_OFFSET			= 0x8905    # 3.0
-#	MAX_PROGRAM_TEXEL_OFFSET_NV			= 0x8905
-#	PROGRAM_ATTRIB_COMPONENTS_NV			= 0x8906
-#	PROGRAM_RESULT_COMPONENTS_NV			= 0x8907
-#	MAX_PROGRAM_ATTRIB_COMPONENTS_NV		= 0x8908
-#	MAX_PROGRAM_RESULT_COMPONENTS_NV		= 0x8909
+VERSION_3_0 enum:
+	MAX_ARRAY_TEXTURE_LAYERS			= 0x88FF    # VERSION_3_0
 
-# EXT_stencil_two_side enum:
-#	STENCIL_TEST_TWO_SIDE_EXT			= 0x8910
-#	ACTIVE_STENCIL_FACE_EXT				= 0x8911
+EXT_texture_array enum: (additional; see below)
+	MAX_ARRAY_TEXTURE_LAYERS_EXT			= 0x88FF
 
-# EXT_texture_mirror_clamp enum: (additional; see above):
-#	MIRROR_CLAMP_TO_BORDER_EXT			= 0x8912
+VERSION_3_0 enum:
+	MIN_PROGRAM_TEXEL_OFFSET			= 0x8904    # VERSION_3_0
+	MAX_PROGRAM_TEXEL_OFFSET			= 0x8905    # VERSION_3_0
 
+NV_gpu_program4 enum:
+	MIN_PROGRAM_TEXEL_OFFSET_NV			= 0x8904
+	MAX_PROGRAM_TEXEL_OFFSET_NV			= 0x8905
+	PROGRAM_ATTRIB_COMPONENTS_NV			= 0x8906
+	PROGRAM_RESULT_COMPONENTS_NV			= 0x8907
+	MAX_PROGRAM_ATTRIB_COMPONENTS_NV		= 0x8908
+	MAX_PROGRAM_RESULT_COMPONENTS_NV		= 0x8909
+
+EXT_stencil_two_side enum:
+	STENCIL_TEST_TWO_SIDE_EXT			= 0x8910
+	ACTIVE_STENCIL_FACE_EXT				= 0x8911
+
+EXT_texture_mirror_clamp enum: (additional; see above):
+	MIRROR_CLAMP_TO_BORDER_EXT			= 0x8912
+
 # NV_future_use: 0x8913
 
-# VERSION_1_5 enum: (Promoted for OpenGL 1.5)
-# ARB_occlusion_query enum: (additional; see above)
-#	SAMPLES_PASSED					= 0x8914
-#	SAMPLES_PASSED_ARB				= 0x8914
+VERSION_1_5 enum: (Promoted for OpenGL 1.5)
+	SAMPLES_PASSED					= 0x8914
 
-# NV_future_use: 0x8915-0x8919
+ARB_occlusion_query enum: (additional; see above)
+	SAMPLES_PASSED_ARB				= 0x8914
 
-# VERSION_3_0 enum:
-# ARB_color_buffer_float enum: (additional; see above)
-#	CLAMP_VERTEX_COLOR				= 0x891A    # 3.0
-#	CLAMP_VERTEX_COLOR_ARB				= 0x891A
-#	CLAMP_FRAGMENT_COLOR				= 0x891B    # 3.0
-#	CLAMP_FRAGMENT_COLOR_ARB			= 0x891B
-#	CLAMP_READ_COLOR				= 0x891C    # 3.0
-#	CLAMP_READ_COLOR_ARB				= 0x891C
-#	FIXED_ONLY					= 0x891D    # 3.0
-#	FIXED_ONLY_ARB					= 0x891D
+# NV_future_use: 0x8915
 
+VERSION_3_2 enum:
+	GEOMETRY_VERTICES_OUT				= 0x8916
+	GEOMETRY_INPUT_TYPE				= 0x8917
+	GEOMETRY_OUTPUT_TYPE				= 0x8918
+
+# NV_future_use: 0x8919
+
+VERSION_3_0 enum:
+	CLAMP_VERTEX_COLOR				= 0x891A    # VERSION_3_0
+	CLAMP_FRAGMENT_COLOR				= 0x891B    # VERSION_3_0
+	CLAMP_READ_COLOR				= 0x891C    # VERSION_3_0
+	FIXED_ONLY					= 0x891D    # VERSION_3_0
+
+ARB_color_buffer_float enum: (additional; see above)
+	CLAMP_VERTEX_COLOR_ARB				= 0x891A
+	CLAMP_FRAGMENT_COLOR_ARB			= 0x891B
+	CLAMP_READ_COLOR_ARB				= 0x891C
+	FIXED_ONLY_ARB					= 0x891D
+
 # NV_future_use: 0x891E-0x891F
 
 ###############################################################################
 
 # ATI: 0x8920-0x897F
-# ATI_fragment_shader enum:
-#	FRAGMENT_SHADER_ATI				= 0x8920
-#	REG_0_ATI					= 0x8921
-#	REG_1_ATI					= 0x8922
-#	REG_2_ATI					= 0x8923
-#	REG_3_ATI					= 0x8924
-#	REG_4_ATI					= 0x8925
-#	REG_5_ATI					= 0x8926
-#	REG_6_ATI					= 0x8927
-#	REG_7_ATI					= 0x8928
-#	REG_8_ATI					= 0x8929
-#	REG_9_ATI					= 0x892A
-#	REG_10_ATI					= 0x892B
-#	REG_11_ATI					= 0x892C
-#	REG_12_ATI					= 0x892D
-#	REG_13_ATI					= 0x892E
-#	REG_14_ATI					= 0x892F
-#	REG_15_ATI					= 0x8930
-#	REG_16_ATI					= 0x8931
-#	REG_17_ATI					= 0x8932
-#	REG_18_ATI					= 0x8933
-#	REG_19_ATI					= 0x8934
-#	REG_20_ATI					= 0x8935
-#	REG_21_ATI					= 0x8936
-#	REG_22_ATI					= 0x8937
-#	REG_23_ATI					= 0x8938
-#	REG_24_ATI					= 0x8939
-#	REG_25_ATI					= 0x893A
-#	REG_26_ATI					= 0x893B
-#	REG_27_ATI					= 0x893C
-#	REG_28_ATI					= 0x893D
-#	REG_29_ATI					= 0x893E
-#	REG_30_ATI					= 0x893F
-#	REG_31_ATI					= 0x8940
-#	CON_0_ATI					= 0x8941
-#	CON_1_ATI					= 0x8942
-#	CON_2_ATI					= 0x8943
-#	CON_3_ATI					= 0x8944
-#	CON_4_ATI					= 0x8945
-#	CON_5_ATI					= 0x8946
-#	CON_6_ATI					= 0x8947
-#	CON_7_ATI					= 0x8948
-#	CON_8_ATI					= 0x8949
-#	CON_9_ATI					= 0x894A
-#	CON_10_ATI					= 0x894B
-#	CON_11_ATI					= 0x894C
-#	CON_12_ATI					= 0x894D
-#	CON_13_ATI					= 0x894E
-#	CON_14_ATI					= 0x894F
-#	CON_15_ATI					= 0x8950
-#	CON_16_ATI					= 0x8951
-#	CON_17_ATI					= 0x8952
-#	CON_18_ATI					= 0x8953
-#	CON_19_ATI					= 0x8954
-#	CON_20_ATI					= 0x8955
-#	CON_21_ATI					= 0x8956
-#	CON_22_ATI					= 0x8957
-#	CON_23_ATI					= 0x8958
-#	CON_24_ATI					= 0x8959
-#	CON_25_ATI					= 0x895A
-#	CON_26_ATI					= 0x895B
-#	CON_27_ATI					= 0x895C
-#	CON_28_ATI					= 0x895D
-#	CON_29_ATI					= 0x895E
-#	CON_30_ATI					= 0x895F
-#	CON_31_ATI					= 0x8960
-#	MOV_ATI						= 0x8961
-#	ADD_ATI						= 0x8963
-#	MUL_ATI						= 0x8964
-#	SUB_ATI						= 0x8965
-#	DOT3_ATI					= 0x8966
-#	DOT4_ATI					= 0x8967
-#	MAD_ATI						= 0x8968
-#	LERP_ATI					= 0x8969
-#	CND_ATI						= 0x896A
-#	CND0_ATI					= 0x896B
-#	DOT2_ADD_ATI					= 0x896C
-#	SECONDARY_INTERPOLATOR_ATI			= 0x896D
-#	NUM_FRAGMENT_REGISTERS_ATI			= 0x896E
-#	NUM_FRAGMENT_CONSTANTS_ATI			= 0x896F
-#	NUM_PASSES_ATI					= 0x8970
-#	NUM_INSTRUCTIONS_PER_PASS_ATI			= 0x8971
-#	NUM_INSTRUCTIONS_TOTAL_ATI			= 0x8972
-#	NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI		= 0x8973
-#	NUM_LOOPBACK_COMPONENTS_ATI			= 0x8974
-#	COLOR_ALPHA_PAIRING_ATI				= 0x8975
-#	SWIZZLE_STR_ATI					= 0x8976
-#	SWIZZLE_STQ_ATI					= 0x8977
-#	SWIZZLE_STR_DR_ATI				= 0x8978
-#	SWIZZLE_STQ_DQ_ATI				= 0x8979
-#	SWIZZLE_STRQ_ATI				= 0x897A
-#	SWIZZLE_STRQ_DQ_ATI				= 0x897B
+
+ATI_fragment_shader enum:
+	FRAGMENT_SHADER_ATI				= 0x8920
+	REG_0_ATI					= 0x8921
+	REG_1_ATI					= 0x8922
+	REG_2_ATI					= 0x8923
+	REG_3_ATI					= 0x8924
+	REG_4_ATI					= 0x8925
+	REG_5_ATI					= 0x8926
+	REG_6_ATI					= 0x8927
+	REG_7_ATI					= 0x8928
+	REG_8_ATI					= 0x8929
+	REG_9_ATI					= 0x892A
+	REG_10_ATI					= 0x892B
+	REG_11_ATI					= 0x892C
+	REG_12_ATI					= 0x892D
+	REG_13_ATI					= 0x892E
+	REG_14_ATI					= 0x892F
+	REG_15_ATI					= 0x8930
+	REG_16_ATI					= 0x8931
+	REG_17_ATI					= 0x8932
+	REG_18_ATI					= 0x8933
+	REG_19_ATI					= 0x8934
+	REG_20_ATI					= 0x8935
+	REG_21_ATI					= 0x8936
+	REG_22_ATI					= 0x8937
+	REG_23_ATI					= 0x8938
+	REG_24_ATI					= 0x8939
+	REG_25_ATI					= 0x893A
+	REG_26_ATI					= 0x893B
+	REG_27_ATI					= 0x893C
+	REG_28_ATI					= 0x893D
+	REG_29_ATI					= 0x893E
+	REG_30_ATI					= 0x893F
+	REG_31_ATI					= 0x8940
+	CON_0_ATI					= 0x8941
+	CON_1_ATI					= 0x8942
+	CON_2_ATI					= 0x8943
+	CON_3_ATI					= 0x8944
+	CON_4_ATI					= 0x8945
+	CON_5_ATI					= 0x8946
+	CON_6_ATI					= 0x8947
+	CON_7_ATI					= 0x8948
+	CON_8_ATI					= 0x8949
+	CON_9_ATI					= 0x894A
+	CON_10_ATI					= 0x894B
+	CON_11_ATI					= 0x894C
+	CON_12_ATI					= 0x894D
+	CON_13_ATI					= 0x894E
+	CON_14_ATI					= 0x894F
+	CON_15_ATI					= 0x8950
+	CON_16_ATI					= 0x8951
+	CON_17_ATI					= 0x8952
+	CON_18_ATI					= 0x8953
+	CON_19_ATI					= 0x8954
+	CON_20_ATI					= 0x8955
+	CON_21_ATI					= 0x8956
+	CON_22_ATI					= 0x8957
+	CON_23_ATI					= 0x8958
+	CON_24_ATI					= 0x8959
+	CON_25_ATI					= 0x895A
+	CON_26_ATI					= 0x895B
+	CON_27_ATI					= 0x895C
+	CON_28_ATI					= 0x895D
+	CON_29_ATI					= 0x895E
+	CON_30_ATI					= 0x895F
+	CON_31_ATI					= 0x8960
+	MOV_ATI						= 0x8961
+	ADD_ATI						= 0x8963
+	MUL_ATI						= 0x8964
+	SUB_ATI						= 0x8965
+	DOT3_ATI					= 0x8966
+	DOT4_ATI					= 0x8967
+	MAD_ATI						= 0x8968
+	LERP_ATI					= 0x8969
+	CND_ATI						= 0x896A
+	CND0_ATI					= 0x896B
+	DOT2_ADD_ATI					= 0x896C
+	SECONDARY_INTERPOLATOR_ATI			= 0x896D
+	NUM_FRAGMENT_REGISTERS_ATI			= 0x896E
+	NUM_FRAGMENT_CONSTANTS_ATI			= 0x896F
+	NUM_PASSES_ATI					= 0x8970
+	NUM_INSTRUCTIONS_PER_PASS_ATI			= 0x8971
+	NUM_INSTRUCTIONS_TOTAL_ATI			= 0x8972
+	NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI		= 0x8973
+	NUM_LOOPBACK_COMPONENTS_ATI			= 0x8974
+	COLOR_ALPHA_PAIRING_ATI				= 0x8975
+	SWIZZLE_STR_ATI					= 0x8976
+	SWIZZLE_STQ_ATI					= 0x8977
+	SWIZZLE_STR_DR_ATI				= 0x8978
+	SWIZZLE_STQ_DQ_ATI				= 0x8979
+	SWIZZLE_STRQ_ATI				= 0x897A
+	SWIZZLE_STRQ_DQ_ATI				= 0x897B
 # ??? Not clear where to put new types of mask bits yet
-#	RED_BIT_ATI					= 0x00000001
-#	GREEN_BIT_ATI					= 0x00000002
-#	BLUE_BIT_ATI					= 0x00000004
-#	2X_BIT_ATI					= 0x00000001
-#	4X_BIT_ATI					= 0x00000002
-#	8X_BIT_ATI					= 0x00000004
-#	HALF_BIT_ATI					= 0x00000008
-#	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
+	RED_BIT_ATI					= 0x00000001
+	GREEN_BIT_ATI					= 0x00000002
+	BLUE_BIT_ATI					= 0x00000004
+	2X_BIT_ATI					= 0x00000001
+	4X_BIT_ATI					= 0x00000002
+	8X_BIT_ATI					= 0x00000004
+	HALF_BIT_ATI					= 0x00000008
+	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
 
 # ATI_future_use: 0x897C-0x897F
 
 ###############################################################################
 
-# Khronos OpenML WG: 0x8980-0x898F
+# Khronos OpenML WG / OpenGL ES WG: 0x8980-0x898F
 
-# OML_interlace enum:
-#	INTERLACE_OML					= 0x8980
-#	INTERLACE_READ_OML				= 0x8981
+OML_interlace enum:
+	INTERLACE_OML					= 0x8980
+	INTERLACE_READ_OML				= 0x8981
 
-# OML_subsample enum:
-#	FORMAT_SUBSAMPLE_24_24_OML			= 0x8982
-#	FORMAT_SUBSAMPLE_244_244_OML			= 0x8983
+OML_subsample enum:
+	FORMAT_SUBSAMPLE_24_24_OML			= 0x8982
+	FORMAT_SUBSAMPLE_244_244_OML			= 0x8983
 
-# OML_resample enum:
-#	PACK_RESAMPLE_OML				= 0x8984
-#	UNPACK_RESAMPLE_OML				= 0x8985
-#	RESAMPLE_REPLICATE_OML				= 0x8986
-#	RESAMPLE_ZERO_FILL_OML				= 0x8987
-#	RESAMPLE_AVERAGE_OML				= 0x8988
-#	RESAMPLE_DECIMATE_OML				= 0x8989
+OML_resample enum:
+	PACK_RESAMPLE_OML				= 0x8984
+	UNPACK_RESAMPLE_OML				= 0x8985
+	RESAMPLE_REPLICATE_OML				= 0x8986
+	RESAMPLE_ZERO_FILL_OML				= 0x8987
+	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:	0x898A-
-# OES_matrix_get enum:		0x898F
+OES_point_size_array enum: (OpenGL ES only)
+	POINT_SIZE_ARRAY_TYPE_OES			= 0x898A
+	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
+
 ###############################################################################
 
 # 3dlabs: 0x8990-0x899F
@@ -5392,27 +5862,143 @@
 ###############################################################################
 
 # Apple: 0x8A00-0x8A7F
-# APPLE_vertex_program_evaluators: 0x8A00-0x8A0F?
 
-# APPLE_fence enum:
-#	DRAW_PIXELS_APPLE				= 0x8A0A
-#	FENCE_APPLE					= 0x8A0B
+APPLE_vertex_program_evaluators enum:
+	VERTEX_ATTRIB_MAP1_APPLE			= 0x8A00
+	VERTEX_ATTRIB_MAP2_APPLE			= 0x8A01
+	VERTEX_ATTRIB_MAP1_SIZE_APPLE			= 0x8A02
+	VERTEX_ATTRIB_MAP1_COEFF_APPLE			= 0x8A03
+	VERTEX_ATTRIB_MAP1_ORDER_APPLE			= 0x8A04
+	VERTEX_ATTRIB_MAP1_DOMAIN_APPLE			= 0x8A05
+	VERTEX_ATTRIB_MAP2_SIZE_APPLE			= 0x8A06
+	VERTEX_ATTRIB_MAP2_COEFF_APPLE			= 0x8A07
+	VERTEX_ATTRIB_MAP2_ORDER_APPLE			= 0x8A08
+	VERTEX_ATTRIB_MAP2_DOMAIN_APPLE			= 0x8A09
 
-# APPLE_future_use: 0x8A0C-0x8A11
+APPLE_fence enum:
+	DRAW_PIXELS_APPLE				= 0x8A0A
+	FENCE_APPLE					= 0x8A0B
+
 ## From Jeremy 2006/10/18 (Bugzilla bug 632) - unknown extension name
-#	ELEMENT_ARRAY_APPLE				= 0x8A0C
-#	ELEMENT_ARRAY_TYPE_APPLE			= 0x8A0D
-#	ELEMENT_ARRAY_POINTER_APPLE			= 0x8A0E
-#	COLOR_FLOAT_APPLE				= 0x8A0F
+	ELEMENT_ARRAY_APPLE				= 0x8A0C
+	ELEMENT_ARRAY_TYPE_APPLE			= 0x8A0D
+	ELEMENT_ARRAY_POINTER_APPLE			= 0x8A0E
+
+APPLE_float_pixels enum:
+	COLOR_FLOAT_APPLE				= 0x8A0F
+
+# APPLE_future_use: 0x8A10
+## From Jeremy 2006/10/18 (Bugzilla bug 632) - unknown extension name
 #	MIN_PBUFFER_VIEWPORT_DIMS_APPLE			= 0x8A10
 #	ELEMENT_BUFFER_BINDING_APPLE			= 0x8A11
+# Apple says the extension that defined ELEMENT_BUFFER_BINDING_APPLE
+# never shipped and there's no actual collision with UNIFORM_BUFFER
 
-# APPLE_flush_buffer_range enum:
-#	BUFFER_SERIALIZED_MODIFY_APPLE			= 0x8A12
-#	BUFFER_FLUSHING_UNMAP_APPLE			= 0x8A13
+VERSION_3_1 enum:
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER
 
-# APPLE_future_use: 0x8A14-0x8A7F
+ARB_uniform_buffer_object enum: (additional; see below)
+	UNIFORM_BUFFER					= 0x8A11
 
+APPLE_flush_buffer_range enum:
+	BUFFER_SERIALIZED_MODIFY_APPLE			= 0x8A12
+	BUFFER_FLUSHING_UNMAP_APPLE			= 0x8A13
+
+APPLE_aux_depth_stencil enum:
+	AUX_DEPTH_STENCIL_APPLE				= 0x8A14
+
+APPLE_row_bytes enum:
+	PACK_ROW_BYTES_APPLE				= 0x8A15
+	UNPACK_ROW_BYTES_APPLE				= 0x8A16
+
+# APPLE_future_use: 0x8A17-0x8A18
+
+APPLE_object_purgeable enum:
+	RELEASED_APPLE					= 0x8A19
+	VOLATILE_APPLE					= 0x8A1A
+	RETAINED_APPLE					= 0x8A1B
+	UNDEFINED_APPLE					= 0x8A1C
+	PURGEABLE_APPLE					= 0x8A1D
+
+# APPLE_future_use: 0x8A1E
+
+APPLE_rgb_422 enum:
+	RGB_422_APPLE					= 0x8A1F
+	use APPLE_ycbcr_422		    UNSIGNED_SHORT_8_8_APPLE
+	use APPLE_ycbcr_422		    UNSIGNED_SHORT_8_8_REV_APPLE
+
+# APPLE_future_use: 0x8A20--0x8A27
+
+VERSION_3_1 enum:
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER_BINDING
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER_START
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER_SIZE
+	use ARB_uniform_buffer_object	    MAX_VERTEX_UNIFORM_BLOCKS
+	use ARB_uniform_buffer_object	    MAX_GEOMETRY_UNIFORM_BLOCKS
+	use ARB_uniform_buffer_object	    MAX_FRAGMENT_UNIFORM_BLOCKS
+	use ARB_uniform_buffer_object	    MAX_COMBINED_UNIFORM_BLOCKS
+	use ARB_uniform_buffer_object	    MAX_UNIFORM_BUFFER_BINDINGS
+	use ARB_uniform_buffer_object	    MAX_UNIFORM_BLOCK_SIZE
+	use ARB_uniform_buffer_object	    MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS
+	use ARB_uniform_buffer_object	    MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS
+	use ARB_uniform_buffer_object	    MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER_OFFSET_ALIGNMENT
+	use ARB_uniform_buffer_object	    ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH
+	use ARB_uniform_buffer_object	    ACTIVE_UNIFORM_BLOCKS
+	use ARB_uniform_buffer_object	    UNIFORM_TYPE
+	use ARB_uniform_buffer_object	    UNIFORM_SIZE
+	use ARB_uniform_buffer_object	    UNIFORM_NAME_LENGTH
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_INDEX
+	use ARB_uniform_buffer_object	    UNIFORM_OFFSET
+	use ARB_uniform_buffer_object	    UNIFORM_ARRAY_STRIDE
+	use ARB_uniform_buffer_object	    UNIFORM_MATRIX_STRIDE
+	use ARB_uniform_buffer_object	    UNIFORM_IS_ROW_MAJOR
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_BINDING
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_DATA_SIZE
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_NAME_LENGTH
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_ACTIVE_UNIFORMS
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER
+	use ARB_uniform_buffer_object	    INVALID_INDEX
+
+ARB_uniform_buffer_object enum:
+	UNIFORM_BUFFER_BINDING				= 0x8A28
+	UNIFORM_BUFFER_START				= 0x8A29
+	UNIFORM_BUFFER_SIZE				= 0x8A2A
+	MAX_VERTEX_UNIFORM_BLOCKS			= 0x8A2B
+	MAX_GEOMETRY_UNIFORM_BLOCKS			= 0x8A2C
+	MAX_FRAGMENT_UNIFORM_BLOCKS			= 0x8A2D
+	MAX_COMBINED_UNIFORM_BLOCKS			= 0x8A2E
+	MAX_UNIFORM_BUFFER_BINDINGS			= 0x8A2F
+	MAX_UNIFORM_BLOCK_SIZE				= 0x8A30
+	MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS		= 0x8A31
+	MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS	= 0x8A32
+	MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS	= 0x8A33
+	UNIFORM_BUFFER_OFFSET_ALIGNMENT			= 0x8A34
+	ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH		= 0x8A35
+	ACTIVE_UNIFORM_BLOCKS				= 0x8A36
+	UNIFORM_TYPE					= 0x8A37
+	UNIFORM_SIZE					= 0x8A38
+	UNIFORM_NAME_LENGTH				= 0x8A39
+	UNIFORM_BLOCK_INDEX				= 0x8A3A
+	UNIFORM_OFFSET					= 0x8A3B
+	UNIFORM_ARRAY_STRIDE				= 0x8A3C
+	UNIFORM_MATRIX_STRIDE				= 0x8A3D
+	UNIFORM_IS_ROW_MAJOR				= 0x8A3E
+	UNIFORM_BLOCK_BINDING				= 0x8A3F
+	UNIFORM_BLOCK_DATA_SIZE				= 0x8A40
+	UNIFORM_BLOCK_NAME_LENGTH			= 0x8A41
+	UNIFORM_BLOCK_ACTIVE_UNIFORMS			= 0x8A42
+	UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES		= 0x8A43
+	UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER	= 0x8A44
+	UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER	= 0x8A45
+	UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER	= 0x8A46
+	INVALID_INDEX					= 0xFFFFFFFFu
+
+# APPLE_future_use: 0x8A47-0x8A7F
+
 ###############################################################################
 
 # Matrox: 0x8A80-0x8AEF
@@ -5425,148 +6011,172 @@
 
 # ARB HLSL shader extensions: 0x8B30-0x8B8F
 
-# VERSION_2_0 enum: (Promoted for OpenGL 2.0; only some values; renaming in many cases)
-# ARB_shader_objects, ARB_vertex_shader, ARB_fragment_shader enum:
-# NV_vertex_program3 enum: (reuses 0x8B4C)
+
+VERSION_3_1 enum: (Promoted from ARB_shader_objects + ARB_texture_rectangle)
+	SAMPLER_2D_RECT					= 0x8B63    # ARB_shader_objects + ARB_texture_rectangle
+	SAMPLER_2D_RECT_SHADOW				= 0x8B64    # ARB_shader_objects + ARB_texture_rectangle
+
+#@@ separate extensions
+VERSION_2_0 enum: (Promoted for OpenGL 2.0; only some values; renaming in many cases)
+ARB_shader_objects, ARB_vertex_shader, ARB_fragment_shader enum:
+NV_vertex_program3 enum: (reuses 0x8B4C)
 ##Shader types + room for expansion
-#	FRAGMENT_SHADER					= 0x8B30    # VERSION_2_0
-#	FRAGMENT_SHADER_ARB				= 0x8B30    # ARB_fragment_shader
-#	VERTEX_SHADER					= 0x8B31    # VERSION_2_0
-#	VERTEX_SHADER_ARB				= 0x8B31    # ARB_vertex_shader
-# ARB_future_use: 0x8B32-0x8B3F
+	FRAGMENT_SHADER					= 0x8B30    # VERSION_2_0
+	FRAGMENT_SHADER_ARB				= 0x8B30    # ARB_fragment_shader
+	VERTEX_SHADER					= 0x8B31    # VERSION_2_0
+	VERTEX_SHADER_ARB				= 0x8B31    # ARB_vertex_shader
+# ARB_future_use: 0x8B32-0x8B3F (for shader types)
 ##Container types + room for expansion
-#	PROGRAM_OBJECT_ARB				= 0x8B40    # ARB_shader_objects
-# ARB_future_use: 0x8B41-0x8B47
+	PROGRAM_OBJECT_ARB				= 0x8B40    # ARB_shader_objects
+# ARB_future_use: 0x8B41-0x8B47 (for container types)
 ##Misc. shader enums
-#	SHADER_OBJECT_ARB				= 0x8B48    # ARB_shader_objects
-#	MAX_FRAGMENT_UNIFORM_COMPONENTS			= 0x8B49    # VERSION_2_0
-#	MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB		= 0x8B49    # ARB_fragment_shader
-#	MAX_VERTEX_UNIFORM_COMPONENTS			= 0x8B4A    # VERSION_2_0
-#	MAX_VERTEX_UNIFORM_COMPONENTS_ARB		= 0x8B4A    # ARB_vertex_shader
-#	MAX_VARYING_FLOATS				= 0x8B4B    # VERSION_2_0
-#	MAX_VARYING_FLOATS_ARB				= 0x8B4B    # ARB_vertex_shader
-#	MAX_VERTEX_TEXTURE_IMAGE_UNITS			= 0x8B4C    # VERSION_2_0
-#	MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB		= 0x8B4C    # ARB_vertex_shader, NV_vertex_program3
-#	MAX_COMBINED_TEXTURE_IMAGE_UNITS		= 0x8B4D    # VERSION_2_0
-#	MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB		= 0x8B4D    # ARB_vertex_shader
-#	OBJECT_TYPE_ARB					= 0x8B4E    # ARB_shader_objects
-#	SHADER_TYPE					= 0x8B4F    # VERSION_2_0 (renamed)
-#	OBJECT_SUBTYPE_ARB				= 0x8B4F    # ARB_shader_objects
+	SHADER_OBJECT_ARB				= 0x8B48    # ARB_shader_objects
+	MAX_FRAGMENT_UNIFORM_COMPONENTS			= 0x8B49    # VERSION_2_0
+	MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB		= 0x8B49    # ARB_fragment_shader
+	MAX_VERTEX_UNIFORM_COMPONENTS			= 0x8B4A    # VERSION_2_0
+	MAX_VERTEX_UNIFORM_COMPONENTS_ARB		= 0x8B4A    # ARB_vertex_shader
+	MAX_VARYING_FLOATS				= 0x8B4B    # VERSION_2_0
+	MAX_VARYING_FLOATS_ARB				= 0x8B4B    # ARB_vertex_shader
+	MAX_VERTEX_TEXTURE_IMAGE_UNITS			= 0x8B4C    # VERSION_2_0
+	MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB		= 0x8B4C    # ARB_vertex_shader, NV_vertex_program3
+	MAX_COMBINED_TEXTURE_IMAGE_UNITS		= 0x8B4D    # VERSION_2_0
+	MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB		= 0x8B4D    # ARB_vertex_shader
+	OBJECT_TYPE_ARB					= 0x8B4E    # ARB_shader_objects
+	SHADER_TYPE					= 0x8B4F    # VERSION_2_0 (renamed)
+	OBJECT_SUBTYPE_ARB				= 0x8B4F    # ARB_shader_objects
 ##Attribute types + room for expansion.
-#	FLOAT_VEC2					= 0x8B50    # VERSION_2_0
-#	FLOAT_VEC2_ARB					= 0x8B50    # ARB_shader_objects
-#	FLOAT_VEC3					= 0x8B51    # VERSION_2_0
-#	FLOAT_VEC3_ARB					= 0x8B51    # ARB_shader_objects
-#	FLOAT_VEC4					= 0x8B52    # VERSION_2_0
-#	FLOAT_VEC4_ARB					= 0x8B52    # ARB_shader_objects
-#	INT_VEC2					= 0x8B53    # VERSION_2_0
-#	INT_VEC2_ARB					= 0x8B53    # ARB_shader_objects
-#	INT_VEC3					= 0x8B54    # VERSION_2_0
-#	INT_VEC3_ARB					= 0x8B54    # ARB_shader_objects
-#	INT_VEC4					= 0x8B55    # VERSION_2_0
-#	INT_VEC4_ARB					= 0x8B55    # ARB_shader_objects
-#	BOOL						= 0x8B56    # VERSION_2_0
-#	BOOL_ARB					= 0x8B56    # ARB_shader_objects
-#	BOOL_VEC2					= 0x8B57    # VERSION_2_0
-#	BOOL_VEC2_ARB					= 0x8B57    # ARB_shader_objects
-#	BOOL_VEC3					= 0x8B58    # VERSION_2_0
-#	BOOL_VEC3_ARB					= 0x8B58    # ARB_shader_objects
-#	BOOL_VEC4					= 0x8B59    # VERSION_2_0
-#	BOOL_VEC4_ARB					= 0x8B59    # ARB_shader_objects
-#	FLOAT_MAT2					= 0x8B5A    # VERSION_2_0
-#	FLOAT_MAT2_ARB					= 0x8B5A    # ARB_shader_objects
-#	FLOAT_MAT3					= 0x8B5B    # VERSION_2_0
-#	FLOAT_MAT3_ARB					= 0x8B5B    # ARB_shader_objects
-#	FLOAT_MAT4					= 0x8B5C    # VERSION_2_0
-#	FLOAT_MAT4_ARB					= 0x8B5C    # ARB_shader_objects
-#	SAMPLER_1D					= 0x8B5D    # VERSION_2_0
-#	SAMPLER_1D_ARB					= 0x8B5D    # ARB_shader_objects
-#	SAMPLER_2D					= 0x8B5E    # VERSION_2_0
-#	SAMPLER_2D_ARB					= 0x8B5E    # ARB_shader_objects
-#	SAMPLER_3D					= 0x8B5F    # VERSION_2_0
-#	SAMPLER_3D_ARB					= 0x8B5F    # ARB_shader_objects
-#	SAMPLER_CUBE					= 0x8B60    # VERSION_2_0
-#	SAMPLER_CUBE_ARB				= 0x8B60    # ARB_shader_objects
-#	SAMPLER_1D_SHADOW				= 0x8B61    # VERSION_2_0
-#	SAMPLER_1D_SHADOW_ARB				= 0x8B61    # ARB_shader_objects
-#	SAMPLER_2D_SHADOW				= 0x8B62    # VERSION_2_0
-#	SAMPLER_2D_SHADOW_ARB				= 0x8B62    # ARB_shader_objects
-#	SAMPLER_2D_RECT_ARB				= 0x8B63    # ARB_shader_objects
-#	SAMPLER_2D_RECT_SHADOW_ARB			= 0x8B64    # ARB_shader_objects
-#	FLOAT_MAT2x3					= 0x8B65    # VERSION_2_1
-#	FLOAT_MAT2x4					= 0x8B66    # VERSION_2_1
-#	FLOAT_MAT3x2					= 0x8B67    # VERSION_2_1
-#	FLOAT_MAT3x4					= 0x8B68    # VERSION_2_1
-#	FLOAT_MAT4x2					= 0x8B69    # VERSION_2_1
-#	FLOAT_MAT4x3					= 0x8B6A    # VERSION_2_1
+	FLOAT_VEC2					= 0x8B50    # VERSION_2_0
+	FLOAT_VEC2_ARB					= 0x8B50    # ARB_shader_objects
+	FLOAT_VEC3					= 0x8B51    # VERSION_2_0
+	FLOAT_VEC3_ARB					= 0x8B51    # ARB_shader_objects
+	FLOAT_VEC4					= 0x8B52    # VERSION_2_0
+	FLOAT_VEC4_ARB					= 0x8B52    # ARB_shader_objects
+	INT_VEC2					= 0x8B53    # VERSION_2_0
+	INT_VEC2_ARB					= 0x8B53    # ARB_shader_objects
+	INT_VEC3					= 0x8B54    # VERSION_2_0
+	INT_VEC3_ARB					= 0x8B54    # ARB_shader_objects
+	INT_VEC4					= 0x8B55    # VERSION_2_0
+	INT_VEC4_ARB					= 0x8B55    # ARB_shader_objects
+	BOOL						= 0x8B56    # VERSION_2_0
+	BOOL_ARB					= 0x8B56    # ARB_shader_objects
+	BOOL_VEC2					= 0x8B57    # VERSION_2_0
+	BOOL_VEC2_ARB					= 0x8B57    # ARB_shader_objects
+	BOOL_VEC3					= 0x8B58    # VERSION_2_0
+	BOOL_VEC3_ARB					= 0x8B58    # ARB_shader_objects
+	BOOL_VEC4					= 0x8B59    # VERSION_2_0
+	BOOL_VEC4_ARB					= 0x8B59    # ARB_shader_objects
+	FLOAT_MAT2					= 0x8B5A    # VERSION_2_0
+	FLOAT_MAT2_ARB					= 0x8B5A    # ARB_shader_objects
+	FLOAT_MAT3					= 0x8B5B    # VERSION_2_0
+	FLOAT_MAT3_ARB					= 0x8B5B    # ARB_shader_objects
+	FLOAT_MAT4					= 0x8B5C    # VERSION_2_0
+	FLOAT_MAT4_ARB					= 0x8B5C    # ARB_shader_objects
+	SAMPLER_1D					= 0x8B5D    # VERSION_2_0
+	SAMPLER_1D_ARB					= 0x8B5D    # ARB_shader_objects
+	SAMPLER_2D					= 0x8B5E    # VERSION_2_0
+	SAMPLER_2D_ARB					= 0x8B5E    # ARB_shader_objects
+	SAMPLER_3D					= 0x8B5F    # VERSION_2_0
+	SAMPLER_3D_ARB					= 0x8B5F    # ARB_shader_objects
+	SAMPLER_CUBE					= 0x8B60    # VERSION_2_0
+	SAMPLER_CUBE_ARB				= 0x8B60    # ARB_shader_objects
+	SAMPLER_1D_SHADOW				= 0x8B61    # VERSION_2_0
+	SAMPLER_1D_SHADOW_ARB				= 0x8B61    # ARB_shader_objects
+	SAMPLER_2D_SHADOW				= 0x8B62    # VERSION_2_0
+	SAMPLER_2D_SHADOW_ARB				= 0x8B62    # ARB_shader_objects
+	SAMPLER_2D_RECT_ARB				= 0x8B63    # ARB_shader_objects
+	SAMPLER_2D_RECT_SHADOW_ARB			= 0x8B64    # ARB_shader_objects
+	FLOAT_MAT2x3					= 0x8B65    # VERSION_2_1
+	FLOAT_MAT2x4					= 0x8B66    # VERSION_2_1
+	FLOAT_MAT3x2					= 0x8B67    # VERSION_2_1
+	FLOAT_MAT3x4					= 0x8B68    # VERSION_2_1
+	FLOAT_MAT4x2					= 0x8B69    # VERSION_2_1
+	FLOAT_MAT4x3					= 0x8B6A    # VERSION_2_1
 # ARB_future_use: 0x8B6B-0x8B7F (for attribute types)
-#	DELETE_STATUS					= 0x8B80    # VERSION_2_0 (renamed)
-#	OBJECT_DELETE_STATUS_ARB			= 0x8B80    # ARB_shader_objects
-#	COMPILE_STATUS					= 0x8B81    # VERSION_2_0 (renamed)
-#	OBJECT_COMPILE_STATUS_ARB			= 0x8B81    # ARB_shader_objects
-#	LINK_STATUS					= 0x8B82    # VERSION_2_0 (renamed)
-#	OBJECT_LINK_STATUS_ARB				= 0x8B82    # ARB_shader_objects
-#	VALIDATE_STATUS					= 0x8B83    # VERSION_2_0 (renamed)
-#	OBJECT_VALIDATE_STATUS_ARB			= 0x8B83    # ARB_shader_objects
-#	INFO_LOG_LENGTH					= 0x8B84    # VERSION_2_0 (renamed)
-#	OBJECT_INFO_LOG_LENGTH_ARB			= 0x8B84    # ARB_shader_objects
-#	ATTACHED_SHADERS				= 0x8B85    # VERSION_2_0 (renamed)
-#	OBJECT_ATTACHED_OBJECTS_ARB			= 0x8B85    # ARB_shader_objects
-#	ACTIVE_UNIFORMS					= 0x8B86    # VERSION_2_0 (renamed)
-#	OBJECT_ACTIVE_UNIFORMS_ARB			= 0x8B86    # ARB_shader_objects
-#	ACTIVE_UNIFORM_MAX_LENGTH			= 0x8B87    # VERSION_2_0 (renamed)
-#	OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB		= 0x8B87    # ARB_shader_objects
-#	SHADER_SOURCE_LENGTH				= 0x8B88    # VERSION_2_0 (renamed)
-#	OBJECT_SHADER_SOURCE_LENGTH_ARB			= 0x8B88    # ARB_shader_objects
-#	ACTIVE_ATTRIBUTES				= 0x8B89    # VERSION_2_0 (renamed)
-#	OBJECT_ACTIVE_ATTRIBUTES_ARB			= 0x8B89    # ARB_vertex_shader
-#	ACTIVE_ATTRIBUTE_MAX_LENGTH			= 0x8B8A    # VERSION_2_0 (renamed)
-#	OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB		= 0x8B8A    # ARB_vertex_shader
-#	FRAGMENT_SHADER_DERIVATIVE_HINT			= 0x8B8B    # VERSION_2_0
-#	FRAGMENT_SHADER_DERIVATIVE_HINT_ARB		= 0x8B8B    # ARB_fragment_shader
-#	SHADING_LANGUAGE_VERSION			= 0x8B8C    # VERSION_2_0
-#	SHADING_LANGUAGE_VERSION_ARB			= 0x8B8C    # ARB_shading_language_100
+	DELETE_STATUS					= 0x8B80    # VERSION_2_0 (renamed)
+	OBJECT_DELETE_STATUS_ARB			= 0x8B80    # ARB_shader_objects
+	COMPILE_STATUS					= 0x8B81    # VERSION_2_0 (renamed)
+	OBJECT_COMPILE_STATUS_ARB			= 0x8B81    # ARB_shader_objects
+	LINK_STATUS					= 0x8B82    # VERSION_2_0 (renamed)
+	OBJECT_LINK_STATUS_ARB				= 0x8B82    # ARB_shader_objects
+	VALIDATE_STATUS					= 0x8B83    # VERSION_2_0 (renamed)
+	OBJECT_VALIDATE_STATUS_ARB			= 0x8B83    # ARB_shader_objects
+	INFO_LOG_LENGTH					= 0x8B84    # VERSION_2_0 (renamed)
+	OBJECT_INFO_LOG_LENGTH_ARB			= 0x8B84    # ARB_shader_objects
+	ATTACHED_SHADERS				= 0x8B85    # VERSION_2_0 (renamed)
+	OBJECT_ATTACHED_OBJECTS_ARB			= 0x8B85    # ARB_shader_objects
+	ACTIVE_UNIFORMS					= 0x8B86    # VERSION_2_0 (renamed)
+	OBJECT_ACTIVE_UNIFORMS_ARB			= 0x8B86    # ARB_shader_objects
+	ACTIVE_UNIFORM_MAX_LENGTH			= 0x8B87    # VERSION_2_0 (renamed)
+	OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB		= 0x8B87    # ARB_shader_objects
+	SHADER_SOURCE_LENGTH				= 0x8B88    # VERSION_2_0 (renamed)
+	OBJECT_SHADER_SOURCE_LENGTH_ARB			= 0x8B88    # ARB_shader_objects
+	ACTIVE_ATTRIBUTES				= 0x8B89    # VERSION_2_0 (renamed)
+	OBJECT_ACTIVE_ATTRIBUTES_ARB			= 0x8B89    # ARB_vertex_shader
+	ACTIVE_ATTRIBUTE_MAX_LENGTH			= 0x8B8A    # VERSION_2_0 (renamed)
+	OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB		= 0x8B8A    # ARB_vertex_shader
+	FRAGMENT_SHADER_DERIVATIVE_HINT			= 0x8B8B    # VERSION_2_0
+	FRAGMENT_SHADER_DERIVATIVE_HINT_ARB		= 0x8B8B    # ARB_fragment_shader
+	SHADING_LANGUAGE_VERSION			= 0x8B8C    # VERSION_2_0
+	SHADING_LANGUAGE_VERSION_ARB			= 0x8B8C    # ARB_shading_language_100
 
-# VERSION_3_0 enum:
-# ARB_geometry_shader4 enum: (additional; see below; note: no ARB suffixes)
-#	MAX_VARYING_COMPONENTS				= GL_MAX_VARYING_FLOATS     # 3.0
+# Aliases ARB_shader_objects enum above
+OES_texture3D enum: (OpenGL ES only; additional; see above)
+	SAMPLER_3D_OES					= 0x8B5F    # ARB_shader_objects
 
-# EXT_geometry_shader4 enum: (additional; see below)
-#	MAX_VARYING_COMPONENTS_EXT			= 0x8B4B
+# Aliases ARB_fragment_shader enum above
+OES_standard_derivatives enum: (OpenGL ES only)
+	FRAGMENT_SHADER_DERIVATIVE_HINT_OES		= 0x8B8B
 
-# VERSION_2_0 enum:
-#	CURRENT_PROGRAM					= 0x8B8D
+VERSION_3_0 enum:
+	MAX_VARYING_COMPONENTS				= 0x8B4B    # VERSION_3_0   # alias GL_MAX_VARYING_FLOATS
+
+ARB_geometry_shader4 enum: (additional; see below; note: no ARB suffixes)
+	use VERSION_3_0			    MAX_VARYING_COMPONENTS
+
+EXT_geometry_shader4 enum: (additional; see below)
+	MAX_VARYING_COMPONENTS_EXT			= 0x8B4B
+
+VERSION_2_0 enum:
+	CURRENT_PROGRAM					= 0x8B8D
+
+# Aliases CURRENT_PROGRAM
+EXT_separate_shader_objects enum:
+	ACTIVE_PROGRAM_EXT				= 0x8B8D
+
 # ARB_future_use: 0x8B8E-0x8B8F
 
 ###############################################################################
 
 # Khronos OpenGL ES WG: 0x8B90-0x8B9F
 
-# OES_compressed_paletted_texture enum:
-#	PALETTE4_RGB8_OES				= 0x8B90
-#	PALETTE4_RGBA8_OES				= 0x8B91
-#	PALETTE4_R5_G6_B5_OES				= 0x8B92
-#	PALETTE4_RGBA4_OES				= 0x8B93
-#	PALETTE4_RGB5_A1_OES				= 0x8B94
-#	PALETTE8_RGB8_OES				= 0x8B95
-#	PALETTE8_RGBA8_OES				= 0x8B96
-#	PALETTE8_R5_G6_B5_OES				= 0x8B97
-#	PALETTE8_RGBA4_OES				= 0x8B98
-#	PALETTE8_RGB5_A1_OES				= 0x8B99
+OES_compressed_paletted_texture enum: (OpenGL ES only)
+	PALETTE4_RGB8_OES				= 0x8B90
+	PALETTE4_RGBA8_OES				= 0x8B91
+	PALETTE4_R5_G6_B5_OES				= 0x8B92
+	PALETTE4_RGBA4_OES				= 0x8B93
+	PALETTE4_RGB5_A1_OES				= 0x8B94
+	PALETTE8_RGB8_OES				= 0x8B95
+	PALETTE8_RGBA8_OES				= 0x8B96
+	PALETTE8_R5_G6_B5_OES				= 0x8B97
+	PALETTE8_RGBA4_OES				= 0x8B98
+	PALETTE8_RGB5_A1_OES				= 0x8B99
 
-# OES_read_format enum:
-#	IMPLEMENTATION_COLOR_READ_TYPE_OES		= 0x8B9A
-#	IMPLEMENTATION_COLOR_READ_FORMAT_OES		= 0x8B9B
+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
-# These need to go in enumext.spec as well
-#	POINT_SIZE_ARRAY_OES				= 0x8B9C
-#	TEXTURE_CROP_RECT_OES				= 0x8B9D
+OES_point_size_array enum: (OpenGL ES only; additional; see above)
+	POINT_SIZE_ARRAY_OES				= 0x8B9C
 
-# More Khronos extensions, need to go in enumext.spec
-#	MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES		= 0x8B9E
-#	WEIGHT_INDEX_ARRAY_BUFFER_BINDING_OES		= 0x8B9F
+OES_draw_texture enum: (OpenGL ES only)
+	TEXTURE_CROP_RECT_OES				= 0x8B9D
 
+OES_matrix_palette enum: (OpenGL ES only)
+	MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES		= 0x8B9E
+
+OES_point_size_array enum: (OpenGL ES only; additional; see above)
+	POINT_SIZE_ARRAY_BUFFER_BINDING_OES		= 0x8B9F
+
 ###############################################################################
 
 # Seaweed: 0x8BA0-0x8BAF
@@ -5576,254 +6186,362 @@
 # Mesa: 0x8BB0-0x8BBF
 #   Probably one of the two 0x8BB4 enums should be 0x8BB5, but the
 #   extension spec is not complete in any event.
-# MESA_program_debug enum:
-#	FRAGMENT_PROGRAM_POSITION_MESA			= 0x8BB0
-#	FRAGMENT_PROGRAM_CALLBACK_MESA			= 0x8BB1
-#	FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA		= 0x8BB2
-#	FRAGMENT_PROGRAM_CALLBACK_DATA_MESA		= 0x8BB3
-#	VERTEX_PROGRAM_CALLBACK_MESA			= 0x8BB4
-#	VERTEX_PROGRAM_POSITION_MESA			= 0x8BB4
-#	VERTEX_PROGRAM_CALLBACK_FUNC_MESA		= 0x8BB6
-#	VERTEX_PROGRAM_CALLBACK_DATA_MESA		= 0x8BB7
+MESA_program_debug enum:
+	FRAGMENT_PROGRAM_POSITION_MESA			= 0x8BB0
+	FRAGMENT_PROGRAM_CALLBACK_MESA			= 0x8BB1
+	FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA		= 0x8BB2
+	FRAGMENT_PROGRAM_CALLBACK_DATA_MESA		= 0x8BB3
+	VERTEX_PROGRAM_CALLBACK_MESA			= 0x8BB4
+	VERTEX_PROGRAM_POSITION_MESA			= 0x8BB4
+	VERTEX_PROGRAM_CALLBACK_FUNC_MESA		= 0x8BB6
+	VERTEX_PROGRAM_CALLBACK_DATA_MESA		= 0x8BB7
 
 ###############################################################################
 
 # 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
+
+# ATI_future_use: 0x8BC7-0x8BD1
+
+QCOM_extended_get enum: (OpenGL ES only)
+	TEXTURE_WIDTH_QCOM				= 0x8BD2
+	TEXTURE_HEIGHT_QCOM				= 0x8BD3
+	TEXTURE_DEPTH_QCOM				= 0x8BD4
+	TEXTURE_INTERNAL_FORMAT_QCOM			= 0x8BD5
+	TEXTURE_FORMAT_QCOM				= 0x8BD6
+	TEXTURE_TYPE_QCOM				= 0x8BD7
+	TEXTURE_IMAGE_VALID_QCOM			= 0x8BD8
+	TEXTURE_NUM_LEVELS_QCOM				= 0x8BD9
+	TEXTURE_TARGET_QCOM				= 0x8BDA
+	TEXTURE_OBJECT_VALID_QCOM			= 0x8BDB
+	STATE_RESTORE					= 0x8BDC
+
+# ATI_future_use: 0x8BDD-0x8BFF
+
 ###############################################################################
 
 # Imagination Tech.: 0x8C00-0x8C0F
 
+IMG_texture_compression_pvrtc enum: (OpenGL ES only)
+	COMPRESSED_RGB_PVRTC_4BPPV1_IMG			= 0x8C00
+	COMPRESSED_RGB_PVRTC_2BPPV1_IMG			= 0x8C01
+	COMPRESSED_RGBA_PVRTC_4BPPV1_IMG		= 0x8C02
+	COMPRESSED_RGBA_PVRTC_2BPPV1_IMG		= 0x8C03
+
+IMG_texture_env_enhanced_fixed_function enum: (OpenGL ES only)
+	MODULATE_COLOR_IMG				= 0x8C04
+	RECIP_ADD_SIGNED_ALPHA_IMG			= 0x8C05
+	TEXTURE_ALPHA_MODULATE_IMG			= 0x8C06
+	FACTOR_ALPHA_MODULATE_IMG			= 0x8C07
+	FRAGMENT_ALPHA_MODULATE_IMG			= 0x8C08
+	ADD_BLEND_IMG					= 0x8C09
+
+IMG_shader_binary: (OpenGL ES only)
+	SGX_BINARY_IMG					= 0x8C0A
+
+# IMG_future_use: 0x8C0B-0x8C0F
+
 ###############################################################################
 
 # NVIDIA: 0x8C10-0x8C8F (Pat Brown)
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# ARB_texture_float enum: (additional; see above)
-#	TEXTURE_RED_TYPE				= 0x8C10    # 3.0 / ARB_fbo
-#	TEXTURE_RED_TYPE_ARB				= 0x8C10
-#	TEXTURE_GREEN_TYPE				= 0x8C11    # 3.0 / ARB_fbo
-#	TEXTURE_GREEN_TYPE_ARB				= 0x8C11
-#	TEXTURE_BLUE_TYPE				= 0x8C12    # 3.0 / ARB_fbo
-#	TEXTURE_BLUE_TYPE_ARB				= 0x8C12
-#	TEXTURE_ALPHA_TYPE				= 0x8C13    # 3.0 / ARB_fbo
-#	TEXTURE_ALPHA_TYPE_ARB				= 0x8C13
-#	TEXTURE_LUMINANCE_TYPE				= 0x8C14    # 3.0 / ARB_fbo
-#	TEXTURE_LUMINANCE_TYPE_ARB			= 0x8C14
-#	TEXTURE_INTENSITY_TYPE				= 0x8C15    # 3.0 / ARB_fbo
-#	TEXTURE_INTENSITY_TYPE_ARB			= 0x8C15
-#	TEXTURE_DEPTH_TYPE				= 0x8C16    # 3.0 / ARB_fbo
-#	TEXTURE_DEPTH_TYPE_ARB				= 0x8C16
-#	UNSIGNED_NORMALIZED				= 0x8C17    # 3.0 / ARB_fbo
-#	UNSIGNED_NORMALIZED_ARB				= 0x8C17
+VERSION_3_0 enum:
+	use ARB_framebuffer_object	    TEXTURE_RED_TYPE
+	use ARB_framebuffer_object	    TEXTURE_GREEN_TYPE
+	use ARB_framebuffer_object	    TEXTURE_BLUE_TYPE
+	use ARB_framebuffer_object	    TEXTURE_ALPHA_TYPE
+	use ARB_framebuffer_object	    TEXTURE_LUMINANCE_TYPE
+	use ARB_framebuffer_object	    TEXTURE_INTENSITY_TYPE
+	use ARB_framebuffer_object	    TEXTURE_DEPTH_TYPE
+	use ARB_framebuffer_object	    UNSIGNED_NORMALIZED
 
-# VERSION_3_0 enum:
-# EXT_texture_array enum:
-#	TEXTURE_1D_ARRAY				= 0x8C18    # 3.0
-#	TEXTURE_1D_ARRAY_EXT				= 0x8C18
-#	PROXY_TEXTURE_1D_ARRAY				= 0x8C19    # 3.0
-#	PROXY_TEXTURE_1D_ARRAY_EXT			= 0x8C19
-#	TEXTURE_2D_ARRAY				= 0x8C1A    # 3.0
-#	TEXTURE_2D_ARRAY_EXT				= 0x8C1A
-#	PROXY_TEXTURE_2D_ARRAY				= 0x8C1B    # 3.0
-#	PROXY_TEXTURE_2D_ARRAY_EXT			= 0x8C1B
-#	TEXTURE_BINDING_1D_ARRAY			= 0x8C1C    # 3.0
-#	TEXTURE_BINDING_1D_ARRAY_EXT			= 0x8C1C
-#	TEXTURE_BINDING_2D_ARRAY			= 0x8C1D    # 3.0
-#	TEXTURE_BINDING_2D_ARRAY_EXT			= 0x8C1D
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	TEXTURE_RED_TYPE				= 0x8C10    # VERSION_3_0 / ARB_fbo
+	TEXTURE_GREEN_TYPE				= 0x8C11    # VERSION_3_0 / ARB_fbo
+	TEXTURE_BLUE_TYPE				= 0x8C12    # VERSION_3_0 / ARB_fbo
+	TEXTURE_ALPHA_TYPE				= 0x8C13    # VERSION_3_0 / ARB_fbo
+	TEXTURE_LUMINANCE_TYPE				= 0x8C14    # VERSION_3_0 / ARB_fbo
+	TEXTURE_INTENSITY_TYPE				= 0x8C15    # VERSION_3_0 / ARB_fbo
+	TEXTURE_DEPTH_TYPE				= 0x8C16    # VERSION_3_0 / ARB_fbo
+	UNSIGNED_NORMALIZED				= 0x8C17    # VERSION_3_0 / ARB_fbo
 
+ARB_texture_float enum: (additional; see above)
+	TEXTURE_RED_TYPE_ARB				= 0x8C10
+	TEXTURE_GREEN_TYPE_ARB				= 0x8C11
+	TEXTURE_BLUE_TYPE_ARB				= 0x8C12
+	TEXTURE_ALPHA_TYPE_ARB				= 0x8C13
+	TEXTURE_LUMINANCE_TYPE_ARB			= 0x8C14
+	TEXTURE_INTENSITY_TYPE_ARB			= 0x8C15
+	TEXTURE_DEPTH_TYPE_ARB				= 0x8C16
+	UNSIGNED_NORMALIZED_ARB				= 0x8C17
+
+VERSION_3_0 enum:
+	TEXTURE_1D_ARRAY				= 0x8C18    # VERSION_3_0
+	PROXY_TEXTURE_1D_ARRAY				= 0x8C19    # VERSION_3_0
+	TEXTURE_2D_ARRAY				= 0x8C1A    # VERSION_3_0
+	PROXY_TEXTURE_2D_ARRAY				= 0x8C1B    # VERSION_3_0
+	TEXTURE_BINDING_1D_ARRAY			= 0x8C1C    # VERSION_3_0
+	TEXTURE_BINDING_2D_ARRAY			= 0x8C1D    # VERSION_3_0
+
+EXT_texture_array enum:
+	TEXTURE_1D_ARRAY_EXT				= 0x8C18
+	PROXY_TEXTURE_1D_ARRAY_EXT			= 0x8C19
+	TEXTURE_2D_ARRAY_EXT				= 0x8C1A
+	PROXY_TEXTURE_2D_ARRAY_EXT			= 0x8C1B
+	TEXTURE_BINDING_1D_ARRAY_EXT			= 0x8C1C
+	TEXTURE_BINDING_2D_ARRAY_EXT			= 0x8C1D
+
 # NV_future_use: 0x8C1E-0x8C25
 
-# ARB_geometry_shader4 enum: (additional; see below)
-# NV_geometry_program4 enum:
-#	GEOMETRY_PROGRAM_NV				= 0x8C26
-#	MAX_PROGRAM_OUTPUT_VERTICES_NV			= 0x8C27
-#	MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV		= 0x8C28
-#	MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB		= 0x8C29
-#	MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT		= 0x8C29
+VERSION_3_2 enum:
+	MAX_GEOMETRY_TEXTURE_IMAGE_UNITS		= 0x8C29
 
-# ARB_texture_buffer_object enum:
-# EXT_texture_buffer_object enum:
-#	TEXTURE_BUFFER_ARB				= 0x8C2A
-#	TEXTURE_BUFFER_EXT				= 0x8C2A
-#	MAX_TEXTURE_BUFFER_SIZE_ARB			= 0x8C2B
-#	MAX_TEXTURE_BUFFER_SIZE_EXT			= 0x8C2B
-#	TEXTURE_BINDING_BUFFER_ARB			= 0x8C2C
-#	TEXTURE_BINDING_BUFFER_EXT			= 0x8C2C
-#	TEXTURE_BUFFER_FORMAT_ARB			= 0x8C2E
-#	TEXTURE_BUFFER_DATA_STORE_BINDING_EXT		= 0x8C2D
-#	TEXTURE_BUFFER_FORMAT_ARB			= 0x8C2E
-#	TEXTURE_BUFFER_FORMAT_EXT			= 0x8C2E
+ARB_geometry_shader4 enum: (additional; see below)
+	MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB		= 0x8C29
 
-# NV_future_use: 0x8C2F-0x8C39
+NV_geometry_program4 enum:
+	GEOMETRY_PROGRAM_NV				= 0x8C26
+	MAX_PROGRAM_OUTPUT_VERTICES_NV			= 0x8C27
+	MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV		= 0x8C28
+	MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT		= 0x8C29
 
-# VERSION_3_0 enum:
-# EXT_packed_float enum:
-#	R11F_G11F_B10F					= 0x8C3A    # 3.0
-#	R11F_G11F_B10F_EXT				= 0x8C3A
-#	UNSIGNED_INT_10F_11F_11F_REV			= 0x8C3B    # 3.0
-#	UNSIGNED_INT_10F_11F_11F_REV_EXT		= 0x8C3B
-#	RGBA_SIGNED_COMPONENTS_EXT			= 0x8C3C
+VERSION_3_1 enum:
+	TEXTURE_BUFFER					= 0x8C2A
+	MAX_TEXTURE_BUFFER_SIZE				= 0x8C2B
+	TEXTURE_BINDING_BUFFER				= 0x8C2C
+	TEXTURE_BUFFER_DATA_STORE_BINDING		= 0x8C2D
+	TEXTURE_BUFFER_FORMAT				= 0x8C2E
 
-# VERSION_3_0 enum:
-# EXT_texture_shared_exponent enum:
-#	RGB9_E5						= 0x8C3D    # 3.0
-#	RGB9_E5_EXT					= 0x8C3D
-#	UNSIGNED_INT_5_9_9_9_REV			= 0x8C3E    # 3.0
-#	UNSIGNED_INT_5_9_9_9_REV_EXT			= 0x8C3E
-#	TEXTURE_SHARED_SIZE				= 0x8C3F    # 3.0
-#	TEXTURE_SHARED_SIZE_EXT				= 0x8C3F
+ARB_texture_buffer_object enum:
+	TEXTURE_BUFFER_ARB				= 0x8C2A
+	MAX_TEXTURE_BUFFER_SIZE_ARB			= 0x8C2B
+	TEXTURE_BINDING_BUFFER_ARB			= 0x8C2C
+	TEXTURE_BUFFER_DATA_STORE_BINDING_ARB		= 0x8C2D
+	TEXTURE_BUFFER_FORMAT_ARB			= 0x8C2E
 
-# VERSION_2_1 enum: (Generic formats promoted for OpenGL 2.1)
-# EXT_texture_sRGB enum:
-#	SRGB						= 0x8C40    # VERSION_2_1
-#	SRGB_EXT					= 0x8C40    # EXT_texture_sRGB
-#	SRGB8						= 0x8C41    # VERSION_2_1
-#	SRGB8_EXT					= 0x8C41    # EXT_texture_sRGB
-#	SRGB_ALPHA					= 0x8C42    # VERSION_2_1
-#	SRGB_ALPHA_EXT					= 0x8C42    # EXT_texture_sRGB
-#	SRGB8_ALPHA8					= 0x8C43    # VERSION_2_1
-#	SRGB8_ALPHA8_EXT				= 0x8C43    # EXT_texture_sRGB
-#	SLUMINANCE_ALPHA				= 0x8C44    # VERSION_2_1
-#	SLUMINANCE_ALPHA_EXT				= 0x8C44    # EXT_texture_sRGB
-#	SLUMINANCE8_ALPHA8				= 0x8C45    # VERSION_2_1
-#	SLUMINANCE8_ALPHA8_EXT				= 0x8C45    # EXT_texture_sRGB
-#	SLUMINANCE					= 0x8C46    # VERSION_2_1
-#	SLUMINANCE_EXT					= 0x8C46    # EXT_texture_sRGB
-#	SLUMINANCE8					= 0x8C47    # VERSION_2_1
-#	SLUMINANCE8_EXT					= 0x8C47    # EXT_texture_sRGB
-#	COMPRESSED_SRGB					= 0x8C48    # VERSION_2_1
-#	COMPRESSED_SRGB_EXT				= 0x8C48    # EXT_texture_sRGB
-#	COMPRESSED_SRGB_ALPHA				= 0x8C49    # VERSION_2_1
-#	COMPRESSED_SRGB_ALPHA_EXT			= 0x8C49    # EXT_texture_sRGB
-#	COMPRESSED_SLUMINANCE				= 0x8C4A    # VERSION_2_1
-#	COMPRESSED_SLUMINANCE_EXT			= 0x8C4A    # EXT_texture_sRGB
-#	COMPRESSED_SLUMINANCE_ALPHA			= 0x8C4B    # VERSION_2_1
-#	COMPRESSED_SLUMINANCE_ALPHA_EXT			= 0x8C4B    # EXT_texture_sRGB
-#	COMPRESSED_SRGB_S3TC_DXT1_EXT			= 0x8C4C
-#	COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT		= 0x8C4D
-#	COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT		= 0x8C4E
-#	COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT		= 0x8C4F
+EXT_texture_buffer_object enum:
+	TEXTURE_BUFFER_EXT				= 0x8C2A
+	MAX_TEXTURE_BUFFER_SIZE_EXT			= 0x8C2B
+	TEXTURE_BINDING_BUFFER_EXT			= 0x8C2C
+	TEXTURE_BUFFER_DATA_STORE_BINDING_EXT		= 0x8C2D
+	TEXTURE_BUFFER_FORMAT_EXT			= 0x8C2E
 
+# NV_future_use: 0x8C2F-0x8C35
+
+ARB_sample_shading enum:
+	SAMPLE_SHADING_ARB				= 0x8C36
+	MIN_SAMPLE_SHADING_VALUE_ARB			= 0x8C37
+
+# NV_future_use: 0x8C38-0x8C39
+
+VERSION_3_0 enum:
+	R11F_G11F_B10F					= 0x8C3A    # VERSION_3_0
+	UNSIGNED_INT_10F_11F_11F_REV			= 0x8C3B    # VERSION_3_0
+
+EXT_packed_float enum:
+	R11F_G11F_B10F_EXT				= 0x8C3A
+	UNSIGNED_INT_10F_11F_11F_REV_EXT		= 0x8C3B
+	RGBA_SIGNED_COMPONENTS_EXT			= 0x8C3C
+
+VERSION_3_0 enum:
+	RGB9_E5						= 0x8C3D    # VERSION_3_0
+	UNSIGNED_INT_5_9_9_9_REV			= 0x8C3E    # VERSION_3_0
+	TEXTURE_SHARED_SIZE				= 0x8C3F    # VERSION_3_0
+
+EXT_texture_shared_exponent enum:
+	RGB9_E5_EXT					= 0x8C3D
+	UNSIGNED_INT_5_9_9_9_REV_EXT			= 0x8C3E
+	TEXTURE_SHARED_SIZE_EXT				= 0x8C3F
+
+VERSION_2_1 enum: (Generic formats promoted for OpenGL 2.1)
+	SRGB						= 0x8C40    # VERSION_2_1
+	SRGB8						= 0x8C41    # VERSION_2_1
+	SRGB_ALPHA					= 0x8C42    # VERSION_2_1
+	SRGB8_ALPHA8					= 0x8C43    # VERSION_2_1
+	SLUMINANCE_ALPHA				= 0x8C44    # VERSION_2_1
+	SLUMINANCE8_ALPHA8				= 0x8C45    # VERSION_2_1
+	SLUMINANCE					= 0x8C46    # VERSION_2_1
+	SLUMINANCE8					= 0x8C47    # VERSION_2_1
+	COMPRESSED_SRGB					= 0x8C48    # VERSION_2_1
+	COMPRESSED_SRGB_ALPHA				= 0x8C49    # VERSION_2_1
+	COMPRESSED_SLUMINANCE				= 0x8C4A    # VERSION_2_1
+	COMPRESSED_SLUMINANCE_ALPHA			= 0x8C4B    # VERSION_2_1
+
+EXT_texture_sRGB enum:
+	SRGB_EXT					= 0x8C40    # EXT_texture_sRGB
+	SRGB8_EXT					= 0x8C41    # EXT_texture_sRGB
+	SRGB_ALPHA_EXT					= 0x8C42    # EXT_texture_sRGB
+	SRGB8_ALPHA8_EXT				= 0x8C43    # EXT_texture_sRGB
+	SLUMINANCE_ALPHA_EXT				= 0x8C44    # EXT_texture_sRGB
+	SLUMINANCE8_ALPHA8_EXT				= 0x8C45    # EXT_texture_sRGB
+	SLUMINANCE_EXT					= 0x8C46    # EXT_texture_sRGB
+	SLUMINANCE8_EXT					= 0x8C47    # EXT_texture_sRGB
+	COMPRESSED_SRGB_EXT				= 0x8C48    # EXT_texture_sRGB
+	COMPRESSED_SRGB_ALPHA_EXT			= 0x8C49    # EXT_texture_sRGB
+	COMPRESSED_SLUMINANCE_EXT			= 0x8C4A    # EXT_texture_sRGB
+	COMPRESSED_SLUMINANCE_ALPHA_EXT			= 0x8C4B    # EXT_texture_sRGB
+	COMPRESSED_SRGB_S3TC_DXT1_EXT			= 0x8C4C
+	COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT		= 0x8C4D
+	COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT		= 0x8C4E
+	COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT		= 0x8C4F
+
 # NV_future_use: 0x8C50-0x8C6F
 
-# EXT_texture_compression_latc enum:
-#	COMPRESSED_LUMINANCE_LATC1_EXT			= 0x8C70
-#	COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT		= 0x8C71
-#	COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT		= 0x8C72
-#	COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT	= 0x8C73
+EXT_texture_compression_latc enum:
+	COMPRESSED_LUMINANCE_LATC1_EXT			= 0x8C70
+	COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT		= 0x8C71
+	COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT		= 0x8C72
+	COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT	= 0x8C73
 
 # NV_future_use: 0x8C74-0x8C75
 
-# VERSION_3_0 enum:
-# EXT_transform_feedback enum:
-# NV_transform_feedback enum:
-#	TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH		= 0x8C76    # 3.0
-#	TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT	= 0x8C76
-#	BACK_PRIMARY_COLOR_NV				= 0x8C77
-#	BACK_SECONDARY_COLOR_NV				= 0x8C78
-#	TEXTURE_COORD_NV				= 0x8C79
-#	CLIP_DISTANCE_NV				= 0x8C7A
-#	VERTEX_ID_NV					= 0x8C7B
-#	PRIMITIVE_ID_NV					= 0x8C7C
-#	GENERIC_ATTRIB_NV				= 0x8C7D
-#	TRANSFORM_FEEDBACK_ATTRIBS_NV			= 0x8C7E
-#	TRANSFORM_FEEDBACK_BUFFER_MODE			= 0x8C7F    # 3.0
-#	TRANSFORM_FEEDBACK_BUFFER_MODE_EXT		= 0x8C7F
-#	TRANSFORM_FEEDBACK_BUFFER_MODE_NV		= 0x8C7F
-#	MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS	= 0x8C80    # 3.0
-#	MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT	= 0x8C80
-#	MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV	= 0x8C80
-#	ACTIVE_VARYINGS_NV				= 0x8C81
-#	ACTIVE_VARYING_MAX_LENGTH_NV			= 0x8C82
-#	TRANSFORM_FEEDBACK_VARYINGS			= 0x8C83    # 3.0
-#	TRANSFORM_FEEDBACK_VARYINGS_EXT			= 0x8C83
-#	TRANSFORM_FEEDBACK_VARYINGS_NV			= 0x8C83
-#	TRANSFORM_FEEDBACK_BUFFER_START			= 0x8C84    # 3.0
-#	TRANSFORM_FEEDBACK_BUFFER_START_EXT		= 0x8C84
-#	TRANSFORM_FEEDBACK_BUFFER_START_NV		= 0x8C84
-#	TRANSFORM_FEEDBACK_BUFFER_SIZE			= 0x8C85    # 3.0
-#	TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT		= 0x8C85
-#	TRANSFORM_FEEDBACK_BUFFER_SIZE_NV		= 0x8C85
-#	TRANSFORM_FEEDBACK_RECORD_NV			= 0x8C86
-#	PRIMITIVES_GENERATED				= 0x8C87    # 3.0
-#	PRIMITIVES_GENERATED_EXT			= 0x8C87
-#	PRIMITIVES_GENERATED_NV				= 0x8C87
-#	TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN		= 0x8C88    # 3.0
-#	TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT	= 0x8C88
-#	TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV	= 0x8C88
-#	RASTERIZER_DISCARD				= 0x8C89    # 3.0
-#	RASTERIZER_DISCARD_EXT				= 0x8C89
-#	RASTERIZER_DISCARD_NV				= 0x8C89
-#	MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS	  = 0x8C8A  # 3.0
-#	MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT = 0x8C8A
-#	MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV	= 0x8C8A
-#	MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS		= 0x8C8B    # 3.0
-#	MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT	= 0x8C8B
-#	MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV	= 0x8C8B
-#	INTERLEAVED_ATTRIBS				= 0x8C8C    # 3.0
-#	INTERLEAVED_ATTRIBS_EXT				= 0x8C8C
-#	INTERLEAVED_ATTRIBS_NV				= 0x8C8C
-#	SEPARATE_ATTRIBS				= 0x8C8D    # 3.0
-#	SEPARATE_ATTRIBS_EXT				= 0x8C8D
-#	SEPARATE_ATTRIBS_NV				= 0x8C8D
-#	TRANSFORM_FEEDBACK_BUFFER			= 0x8C8E    # 3.0
-#	TRANSFORM_FEEDBACK_BUFFER_EXT			= 0x8C8E
-#	TRANSFORM_FEEDBACK_BUFFER_NV			= 0x8C8E
-#	TRANSFORM_FEEDBACK_BUFFER_BINDING		= 0x8C8F    # 3.0
-#	TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT		= 0x8C8F
-#	TRANSFORM_FEEDBACK_BUFFER_BINDING_NV		= 0x8C8F
+#@@ separate extensions
+VERSION_3_0 enum:
+EXT_transform_feedback enum:
+NV_transform_feedback enum:
+	TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH		= 0x8C76    # VERSION_3_0
+	TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT	= 0x8C76
+	BACK_PRIMARY_COLOR_NV				= 0x8C77
+	BACK_SECONDARY_COLOR_NV				= 0x8C78
+	TEXTURE_COORD_NV				= 0x8C79
+	CLIP_DISTANCE_NV				= 0x8C7A
+	VERTEX_ID_NV					= 0x8C7B
+	PRIMITIVE_ID_NV					= 0x8C7C
+	GENERIC_ATTRIB_NV				= 0x8C7D
+	TRANSFORM_FEEDBACK_ATTRIBS_NV			= 0x8C7E
+	TRANSFORM_FEEDBACK_BUFFER_MODE			= 0x8C7F    # VERSION_3_0
+	TRANSFORM_FEEDBACK_BUFFER_MODE_EXT		= 0x8C7F
+	TRANSFORM_FEEDBACK_BUFFER_MODE_NV		= 0x8C7F
+	MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS	= 0x8C80    # VERSION_3_0
+	MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT	= 0x8C80
+	MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV	= 0x8C80
+	ACTIVE_VARYINGS_NV				= 0x8C81
+	ACTIVE_VARYING_MAX_LENGTH_NV			= 0x8C82
+	TRANSFORM_FEEDBACK_VARYINGS			= 0x8C83    # VERSION_3_0
+	TRANSFORM_FEEDBACK_VARYINGS_EXT			= 0x8C83
+	TRANSFORM_FEEDBACK_VARYINGS_NV			= 0x8C83
+	TRANSFORM_FEEDBACK_BUFFER_START			= 0x8C84    # VERSION_3_0
+	TRANSFORM_FEEDBACK_BUFFER_START_EXT		= 0x8C84
+	TRANSFORM_FEEDBACK_BUFFER_START_NV		= 0x8C84
+	TRANSFORM_FEEDBACK_BUFFER_SIZE			= 0x8C85    # VERSION_3_0
+	TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT		= 0x8C85
+	TRANSFORM_FEEDBACK_BUFFER_SIZE_NV		= 0x8C85
+	TRANSFORM_FEEDBACK_RECORD_NV			= 0x8C86
+	PRIMITIVES_GENERATED				= 0x8C87    # VERSION_3_0
+	PRIMITIVES_GENERATED_EXT			= 0x8C87
+	PRIMITIVES_GENERATED_NV				= 0x8C87
+	TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN		= 0x8C88    # VERSION_3_0
+	TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT	= 0x8C88
+	TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV	= 0x8C88
+	RASTERIZER_DISCARD				= 0x8C89    # VERSION_3_0
+	RASTERIZER_DISCARD_EXT				= 0x8C89
+	RASTERIZER_DISCARD_NV				= 0x8C89
+	MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS	= 0x8C8A    # VERSION_3_0
+	MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT = 0x8C8A
+	MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV	= 0x8C8A
+	MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS		= 0x8C8B    # VERSION_3_0
+	MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT	= 0x8C8B
+	MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV	= 0x8C8B
+	INTERLEAVED_ATTRIBS				= 0x8C8C    # VERSION_3_0
+	INTERLEAVED_ATTRIBS_EXT				= 0x8C8C
+	INTERLEAVED_ATTRIBS_NV				= 0x8C8C
+	SEPARATE_ATTRIBS				= 0x8C8D    # VERSION_3_0
+	SEPARATE_ATTRIBS_EXT				= 0x8C8D
+	SEPARATE_ATTRIBS_NV				= 0x8C8D
+	TRANSFORM_FEEDBACK_BUFFER			= 0x8C8E    # VERSION_3_0
+	TRANSFORM_FEEDBACK_BUFFER_EXT			= 0x8C8E
+	TRANSFORM_FEEDBACK_BUFFER_NV			= 0x8C8E
+	TRANSFORM_FEEDBACK_BUFFER_BINDING		= 0x8C8F    # VERSION_3_0
+	TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT		= 0x8C8F
+	TRANSFORM_FEEDBACK_BUFFER_BINDING_NV		= 0x8C8F
 
 ###############################################################################
 
 # ATI: 0x8C90-0x8C9F (Affie Munshi, OpenGL ES extensions)
 
+# AMD_future_use: 0x8C90-0x8C91
+
+AMD_compressed_ATC_texture enum: (OpenGL ES only)
+	ATC_RGB_AMD					= 0x8C92
+	ATC_RGBA_EXPLICIT_ALPHA_AMD			= 0x8C93
+
+# AMD_future_use: 0x8C94-0x8C9F
+
 ###############################################################################
 
 # OpenGL ARB: 0x8CA0-0x8CAF
 
-# VERSION_2_0 enum:
-#	POINT_SPRITE_COORD_ORIGIN			= 0x8CA0
-#	LOWER_LEFT					= 0x8CA1
-#	UPPER_LEFT					= 0x8CA2
-#	STENCIL_BACK_REF				= 0x8CA3
-#	STENCIL_BACK_VALUE_MASK				= 0x8CA4
-#	STENCIL_BACK_WRITEMASK				= 0x8CA5
+VERSION_2_0 enum:
+	POINT_SPRITE_COORD_ORIGIN			= 0x8CA0
+	LOWER_LEFT					= 0x8CA1
+	UPPER_LEFT					= 0x8CA2
+	STENCIL_BACK_REF				= 0x8CA3
+	STENCIL_BACK_VALUE_MASK				= 0x8CA4
+	STENCIL_BACK_WRITEMASK				= 0x8CA5
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# EXT_framebuffer_object enum: (additional; see below)
-#	FRAMEBUFFER_BINDING				= 0x8CA6    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_BINDING_EXT				= 0x8CA6
-#	DRAW_FRAMEBUFFER_BINDING			= GL_FRAMEBUFFER_BINDING    # 3.0 / ARB_fbo
-#	RENDERBUFFER_BINDING				= 0x8CA7    # 3.0 / ARB_fbo
-#	RENDERBUFFER_BINDING_EXT			= 0x8CA7
+VERSION_3_0 enum:
+	use ARB_framebuffer_object	    FRAMEBUFFER_BINDING
+	use ARB_framebuffer_object	    DRAW_FRAMEBUFFER_BINDING
+	use ARB_framebuffer_object	    RENDERBUFFER_BINDING
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# EXT_framebuffer_blit enum:
-#	READ_FRAMEBUFFER				= 0x8CA8    # 3.0 / ARB_fbo
-#	READ_FRAMEBUFFER_EXT				= 0x8CA8
-#	DRAW_FRAMEBUFFER				= 0x8CA9    # 3.0 / ARB_fbo
-#	DRAW_FRAMEBUFFER_EXT				= 0x8CA9
-#	DRAW_FRAMEBUFFER_BINDING_EXT			= GL_FRAMEBUFFER_BINDING_EXT
-#	READ_FRAMEBUFFER_BINDING			= 0x8CAA    # 3.0 / ARB_fbo
-#	READ_FRAMEBUFFER_BINDING_EXT			= 0x8CAA
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	FRAMEBUFFER_BINDING				= 0x8CA6    # VERSION_3_0 / ARB_fbo
+	DRAW_FRAMEBUFFER_BINDING			= 0x8CA6    # VERSION_3_0 / ARB_fbo # alias GL_FRAMEBUFFER_BINDING
+	RENDERBUFFER_BINDING				= 0x8CA7    # VERSION_3_0 / ARB_fbo
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# EXT_framebuffer_multisample enum:
-# NV_framebuffer_multisample_coverage enum: (additional; see below)
-#	RENDERBUFFER_SAMPLES				= 0x8CAB    # 3.0 / ARB_fbo
-#	RENDERBUFFER_SAMPLES_EXT			= 0x8CAB
-#	RENDERBUFFER_COVERAGE_SAMPLES_NV		= 0x8CAB
+EXT_framebuffer_object enum: (additional; see below)
+	FRAMEBUFFER_BINDING_EXT				= 0x8CA6
+	RENDERBUFFER_BINDING_EXT			= 0x8CA7
 
-# VERSION_3_0 enum:
-# ARB_depth_buffer_float enum: (note: no ARB suffixes)
+EXT_framebuffer_blit enum: (additional; see below)
+	DRAW_FRAMEBUFFER_BINDING_EXT			= 0x8CA6    # EXT_framebuffer_blit  # alias GL_FRAMEBUFFER_BINDING_EXT
+
+# 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:
+	use ARB_framebuffer_object	    READ_FRAMEBUFFER
+	use ARB_framebuffer_object	    DRAW_FRAMEBUFFER
+	use ARB_framebuffer_object	    READ_FRAMEBUFFER_BINDING
+
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	READ_FRAMEBUFFER				= 0x8CA8    # VERSION_3_0 / ARB_fbo
+	DRAW_FRAMEBUFFER				= 0x8CA9    # VERSION_3_0 / ARB_fbo
+	READ_FRAMEBUFFER_BINDING			= 0x8CAA    # VERSION_3_0 / ARB_fbo
+
+EXT_framebuffer_blit enum:
+	READ_FRAMEBUFFER_EXT				= 0x8CA8
+	DRAW_FRAMEBUFFER_EXT				= 0x8CA9
+	DRAW_FRAMEBUFFER_BINDING_EXT			= 0x8CA6    # alias GL_FRAMEBUFFER_BINDING_EXT
+	READ_FRAMEBUFFER_BINDING_EXT			= 0x8CAA
+
+VERSION_3_0 enum:
+	use ARB_framebuffer_object	    RENDERBUFFER_SAMPLES
+
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+	RENDERBUFFER_SAMPLES				= 0x8CAB    # VERSION_3_0 / ARB_fbo
+
+EXT_framebuffer_multisample enum:
+	RENDERBUFFER_SAMPLES_EXT			= 0x8CAB
+
+NV_framebuffer_multisample_coverage enum: (additional; see below)
+	RENDERBUFFER_COVERAGE_SAMPLES_NV		= 0x8CAB
+
 # All enums except external format are incompatible with NV_depth_buffer_float
-#	DEPTH_COMPONENT32F				= 0x8CAC
-#	DEPTH32F_STENCIL8				= 0x8CAD
+VERSION_3_0 enum:
+ARB_depth_buffer_float enum: (note: no ARB suffixes)
+	DEPTH_COMPONENT32F				= 0x8CAC
+	DEPTH32F_STENCIL8				= 0x8CAD
 
 # ARB_future_use: 0x8CAF
 
@@ -5835,431 +6553,576 @@
 
 # OpenGL ARB: 0x8CD0-0x8D5F (Framebuffer object specification + headroom)
 
-# VERSION_3_0 enum:
-# ARB_geometry_shader4 enum: (additional; see below; note: no ARB suffixes)
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# EXT_framebuffer_object enum: (additional; see above)
-#	FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE		= 0x8CD0    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT		= 0x8CD0
-#	FRAMEBUFFER_ATTACHMENT_OBJECT_NAME		= 0x8CD1    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT		= 0x8CD1
-#	FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL		= 0x8CD2    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT	= 0x8CD2
-#	FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE	 = 0x8CD3   # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT = 0x8CD3
-#	FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER		= 0x8CD4    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT	= 0x8CD4
-#	FRAMEBUFFER_COMPLETE				= 0x8CD5    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_COMPLETE_EXT			= 0x8CD5
-#	FRAMEBUFFER_INCOMPLETE_ATTACHMENT		= 0x8CD6    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT		= 0x8CD6
-#	FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT	= 0x8CD7    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT	= 0x8CD7
+#@@ separate extensions
+VERSION_3_0 enum:
+ARB_geometry_shader4 enum: (additional; see below; note: no ARB suffixes)
+ARB_framebuffer_object enum: (note: no ARB suffixes)
+EXT_framebuffer_object enum: (additional; see above)
+	FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE		= 0x8CD0    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT		= 0x8CD0
+	FRAMEBUFFER_ATTACHMENT_OBJECT_NAME		= 0x8CD1    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT		= 0x8CD1
+	FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL		= 0x8CD2    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT	= 0x8CD2
+	FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE	= 0x8CD3    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT = 0x8CD3
+	FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER		= 0x8CD4    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT	= 0x8CD4
+	FRAMEBUFFER_COMPLETE				= 0x8CD5    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_COMPLETE_EXT			= 0x8CD5
+	FRAMEBUFFER_INCOMPLETE_ATTACHMENT		= 0x8CD6    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT		= 0x8CD6
+	FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT	= 0x8CD7    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT	= 0x8CD7
 ## Removed 2005/09/26 in revision #117 of the extension:
 ##	  FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT = 0x8CD8
-#	FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT		= 0x8CD9
-#	FRAMEBUFFER_INCOMPLETE_FORMATS_EXT		= 0x8CDA
-#	FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER		= 0x8CDB    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT		= 0x8CDB
-#	FRAMEBUFFER_INCOMPLETE_READ_BUFFER		= 0x8CDC    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT		= 0x8CDC
-#	FRAMEBUFFER_UNSUPPORTED				= 0x8CDD    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_UNSUPPORTED_EXT			= 0x8CDD
+	FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT		= 0x8CD9
+	FRAMEBUFFER_INCOMPLETE_FORMATS_EXT		= 0x8CDA
+	FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER		= 0x8CDB    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT		= 0x8CDB
+	FRAMEBUFFER_INCOMPLETE_READ_BUFFER		= 0x8CDC    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT		= 0x8CDC
+	FRAMEBUFFER_UNSUPPORTED				= 0x8CDD    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_UNSUPPORTED_EXT			= 0x8CDD
 ## Removed 2005/05/31 in revision #113 of the extension:
 ## FRAMEBUFFER_STATUS_ERROR_EXT			   = 0x8CDE
-#	MAX_COLOR_ATTACHMENTS				= 0x8CDF    # 3.0 / ARB_fbo
-#	MAX_COLOR_ATTACHMENTS_EXT			= 0x8CDF
-#	COLOR_ATTACHMENT0				= 0x8CE0    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT0_EXT				= 0x8CE0
-#	COLOR_ATTACHMENT1				= 0x8CE1    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT1_EXT				= 0x8CE1
-#	COLOR_ATTACHMENT2				= 0x8CE2    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT2_EXT				= 0x8CE2
-#	COLOR_ATTACHMENT3				= 0x8CE3    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT3_EXT				= 0x8CE3
-#	COLOR_ATTACHMENT4				= 0x8CE4    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT4_EXT				= 0x8CE4
-#	COLOR_ATTACHMENT5				= 0x8CE5    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT5_EXT				= 0x8CE5
-#	COLOR_ATTACHMENT6				= 0x8CE6    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT6_EXT				= 0x8CE6
-#	COLOR_ATTACHMENT7				= 0x8CE7    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT7_EXT				= 0x8CE7
-#	COLOR_ATTACHMENT8				= 0x8CE8    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT8_EXT				= 0x8CE8
-#	COLOR_ATTACHMENT9				= 0x8CE9    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT9_EXT				= 0x8CE9
-#	COLOR_ATTACHMENT10				= 0x8CEA    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT10_EXT				= 0x8CEA
-#	COLOR_ATTACHMENT11				= 0x8CEB    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT11_EXT				= 0x8CEB
-#	COLOR_ATTACHMENT12				= 0x8CEC    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT12_EXT				= 0x8CEC
-#	COLOR_ATTACHMENT13				= 0x8CED    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT13_EXT				= 0x8CED
-#	COLOR_ATTACHMENT14				= 0x8CEE    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT14_EXT				= 0x8CEE
-#	COLOR_ATTACHMENT15				= 0x8CEF    # 3.0 / ARB_fbo
-#	COLOR_ATTACHMENT15_EXT				= 0x8CEF
+	MAX_COLOR_ATTACHMENTS				= 0x8CDF    # VERSION_3_0 / ARB_fbo
+	MAX_COLOR_ATTACHMENTS_EXT			= 0x8CDF
+	COLOR_ATTACHMENT0				= 0x8CE0    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT0_EXT				= 0x8CE0
+	COLOR_ATTACHMENT1				= 0x8CE1    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT1_EXT				= 0x8CE1
+	COLOR_ATTACHMENT2				= 0x8CE2    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT2_EXT				= 0x8CE2
+	COLOR_ATTACHMENT3				= 0x8CE3    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT3_EXT				= 0x8CE3
+	COLOR_ATTACHMENT4				= 0x8CE4    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT4_EXT				= 0x8CE4
+	COLOR_ATTACHMENT5				= 0x8CE5    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT5_EXT				= 0x8CE5
+	COLOR_ATTACHMENT6				= 0x8CE6    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT6_EXT				= 0x8CE6
+	COLOR_ATTACHMENT7				= 0x8CE7    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT7_EXT				= 0x8CE7
+	COLOR_ATTACHMENT8				= 0x8CE8    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT8_EXT				= 0x8CE8
+	COLOR_ATTACHMENT9				= 0x8CE9    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT9_EXT				= 0x8CE9
+	COLOR_ATTACHMENT10				= 0x8CEA    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT10_EXT				= 0x8CEA
+	COLOR_ATTACHMENT11				= 0x8CEB    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT11_EXT				= 0x8CEB
+	COLOR_ATTACHMENT12				= 0x8CEC    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT12_EXT				= 0x8CEC
+	COLOR_ATTACHMENT13				= 0x8CED    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT13_EXT				= 0x8CED
+	COLOR_ATTACHMENT14				= 0x8CEE    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT14_EXT				= 0x8CEE
+	COLOR_ATTACHMENT15				= 0x8CEF    # VERSION_3_0 / ARB_fbo
+	COLOR_ATTACHMENT15_EXT				= 0x8CEF
 # 0x8CF0-0x8CFF reserved for color attachments 16-31, if needed
-#	DEPTH_ATTACHMENT				= 0x8D00    # 3.0 / ARB_fbo
-#	DEPTH_ATTACHMENT_EXT				= 0x8D00
+	DEPTH_ATTACHMENT				= 0x8D00    # VERSION_3_0 / ARB_fbo
+	DEPTH_ATTACHMENT_EXT				= 0x8D00
 # 0x8D01-0x8D1F reserved for depth attachments 1-31, if needed
-#	STENCIL_ATTACHMENT				= 0x8D20    # 3.0 / ARB_fbo
-#	STENCIL_ATTACHMENT_EXT				= 0x8D20
+	STENCIL_ATTACHMENT				= 0x8D20    # VERSION_3_0 / ARB_fbo
+	STENCIL_ATTACHMENT_EXT				= 0x8D20
 # 0x8D21-0x8D3F reserved for stencil attachments 1-31, if needed
-#	FRAMEBUFFER					= 0x8D40    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_EXT					= 0x8D40
-#	RENDERBUFFER					= 0x8D41    # 3.0 / ARB_fbo
-#	RENDERBUFFER_EXT				= 0x8D41
-#	RENDERBUFFER_WIDTH				= 0x8D42    # 3.0 / ARB_fbo
-#	RENDERBUFFER_WIDTH_EXT				= 0x8D42
-#	RENDERBUFFER_HEIGHT				= 0x8D43    # 3.0 / ARB_fbo
-#	RENDERBUFFER_HEIGHT_EXT				= 0x8D43
-#	RENDERBUFFER_INTERNAL_FORMAT			= 0x8D44    # 3.0 / ARB_fbo
-#	RENDERBUFFER_INTERNAL_FORMAT_EXT		= 0x8D44
+	FRAMEBUFFER					= 0x8D40    # VERSION_3_0 / ARB_fbo
+	FRAMEBUFFER_EXT					= 0x8D40
+	RENDERBUFFER					= 0x8D41    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_EXT				= 0x8D41
+	RENDERBUFFER_WIDTH				= 0x8D42    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_WIDTH_EXT				= 0x8D42
+	RENDERBUFFER_HEIGHT				= 0x8D43    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_HEIGHT_EXT				= 0x8D43
+	RENDERBUFFER_INTERNAL_FORMAT			= 0x8D44    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_INTERNAL_FORMAT_EXT		= 0x8D44
 # 0x8D45 unused (reserved for STENCIL_INDEX_EXT, but now use core STENCIL_INDEX instead)
-#	STENCIL_INDEX1					= 0x8D46    # 3.0 / ARB_fbo
-#	STENCIL_INDEX1_EXT				= 0x8D46
-#	STENCIL_INDEX4					= 0x8D47    # 3.0 / ARB_fbo
-#	STENCIL_INDEX4_EXT				= 0x8D47
-#	STENCIL_INDEX8					= 0x8D48    # 3.0 / ARB_fbo
-#	STENCIL_INDEX8_EXT				= 0x8D48
-#	STENCIL_INDEX16					= 0x8D49    # 3.0 / ARB_fbo
-#	STENCIL_INDEX16_EXT				= 0x8D49
+	STENCIL_INDEX1					= 0x8D46    # VERSION_3_0 / ARB_fbo
+	STENCIL_INDEX1_EXT				= 0x8D46
+	STENCIL_INDEX4					= 0x8D47    # VERSION_3_0 / ARB_fbo
+	STENCIL_INDEX4_EXT				= 0x8D47
+	STENCIL_INDEX8					= 0x8D48    # VERSION_3_0 / ARB_fbo
+	STENCIL_INDEX8_EXT				= 0x8D48
+	STENCIL_INDEX16					= 0x8D49    # VERSION_3_0 / ARB_fbo
+	STENCIL_INDEX16_EXT				= 0x8D49
 # 0x8D4A-0x8D4D reserved for additional stencil formats
 # Added 2005/05/31 in revision #113 of the extension:
-#	RENDERBUFFER_RED_SIZE				= 0x8D50    # 3.0 / ARB_fbo
-#	RENDERBUFFER_RED_SIZE_EXT			= 0x8D50
-#	RENDERBUFFER_GREEN_SIZE				= 0x8D51    # 3.0 / ARB_fbo
-#	RENDERBUFFER_GREEN_SIZE_EXT			= 0x8D51
-#	RENDERBUFFER_BLUE_SIZE				= 0x8D52    # 3.0 / ARB_fbo
-#	RENDERBUFFER_BLUE_SIZE_EXT			= 0x8D52
-#	RENDERBUFFER_ALPHA_SIZE				= 0x8D53    # 3.0 / ARB_fbo
-#	RENDERBUFFER_ALPHA_SIZE_EXT			= 0x8D53
-#	RENDERBUFFER_DEPTH_SIZE				= 0x8D54    # 3.0 / ARB_fbo
-#	RENDERBUFFER_DEPTH_SIZE_EXT			= 0x8D54
-#	RENDERBUFFER_STENCIL_SIZE			= 0x8D55    # 3.0 / ARB_fbo
-#	RENDERBUFFER_STENCIL_SIZE_EXT			= 0x8D55
+	RENDERBUFFER_RED_SIZE				= 0x8D50    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_RED_SIZE_EXT			= 0x8D50
+	RENDERBUFFER_GREEN_SIZE				= 0x8D51    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_GREEN_SIZE_EXT			= 0x8D51
+	RENDERBUFFER_BLUE_SIZE				= 0x8D52    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_BLUE_SIZE_EXT			= 0x8D52
+	RENDERBUFFER_ALPHA_SIZE				= 0x8D53    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_ALPHA_SIZE_EXT			= 0x8D53
+	RENDERBUFFER_DEPTH_SIZE				= 0x8D54    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_DEPTH_SIZE_EXT			= 0x8D54
+	RENDERBUFFER_STENCIL_SIZE			= 0x8D55    # VERSION_3_0 / ARB_fbo
+	RENDERBUFFER_STENCIL_SIZE_EXT			= 0x8D55
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_object enum: (note: no ARB suffixes)
-# EXT_framebuffer_multisample enum: (additional; see above)
+# Aliases EXT_framebuffer_object enum above
+# @@@??? does this appear in OES_texture3D, or OES_framebuffer_object?
+# extension spec & gl2ext.h disagree!
+OES_texture3D enum: (OpenGL ES only; additional; see above)
+	FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES	= 0x8CD4
+
+# 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)
 # Added 2006/10/10 in revision #6b of the extension.
-#	FRAMEBUFFER_INCOMPLETE_MULTISAMPLE		= 0x8D56    # 3.0 / ARB_fbo
-#	FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT		= 0x8D56
-#	MAX_SAMPLES					= 0x8D57    # 3.0 / ARB_fbo
-#	MAX_SAMPLES_EXT					= 0x8D57
+	FRAMEBUFFER_INCOMPLETE_MULTISAMPLE		= 0x8D56    # VERSION_3_0 / ARB_fbo
+	MAX_SAMPLES					= 0x8D57    # VERSION_3_0 / ARB_fbo
+
+EXT_framebuffer_multisample enum: (additional; see above)
+	FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT		= 0x8D56
+	MAX_SAMPLES_EXT					= 0x8D57
+
 # 0x8D58-0x8D5F reserved for additional FBO enums
 
-# NV_geometry_program4 enum: (additional; see above)
-#	FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT	= 0x8CD4
+NV_geometry_program4 enum: (additional; see above)
+	FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT	= 0x8CD4
 
 ###############################################################################
 
 # 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 enum: (OpenGL ES only)
+	ETC1_RGB8_OES					= 0x8D64
+
+OES_EGL_image_external enum: (OpenGL ES only) (bug 4621)
+	TEXTURE_EXTERNAL_OES				= 0x8D65
+	SAMPLER_EXTERNAL_OES				= 0x8D66
+	TEXTURE_BINDING_EXTERNAL_OES			= 0x8D67
+	REQUIRED_TEXTURE_IMAGE_UNITS_OES		= 0x8D68
+
+# Khronos_future_use: 0x8D69-0x8D6F
+
 ###############################################################################
 
 # NVIDIA: 0x8D70-0x8DEF
 # Reserved per email from Pat Brown 2005/10/13
 
-# VERSION_3_0 enum:
-# EXT_texture_integer enum:
-#	RGBA32UI					= 0x8D70    # 3.0
-#	RGBA32UI_EXT					= 0x8D70
-#	RGB32UI						= 0x8D71    # 3.0
-#	RGB32UI_EXT					= 0x8D71
-#	ALPHA32UI_EXT					= 0x8D72
-#	INTENSITY32UI_EXT				= 0x8D73
-#	LUMINANCE32UI_EXT				= 0x8D74
-#	LUMINANCE_ALPHA32UI_EXT				= 0x8D75
-#	RGBA16UI					= 0x8D76    # 3.0
-#	RGBA16UI_EXT					= 0x8D76
-#	RGB16UI						= 0x8D77    # 3.0
-#	RGB16UI_EXT					= 0x8D77
-#	ALPHA16UI_EXT					= 0x8D78
-#	INTENSITY16UI_EXT				= 0x8D79
-#	LUMINANCE16UI_EXT				= 0x8D7A
-#	LUMINANCE_ALPHA16UI_EXT				= 0x8D7B
-#	RGBA8UI						= 0x8D7C    # 3.0
-#	RGBA8UI_EXT					= 0x8D7C
-#	RGB8UI						= 0x8D7D    # 3.0
-#	RGB8UI_EXT					= 0x8D7D
-#	ALPHA8UI_EXT					= 0x8D7E
-#	INTENSITY8UI_EXT				= 0x8D7F
-#	LUMINANCE8UI_EXT				= 0x8D80
-#	LUMINANCE_ALPHA8UI_EXT				= 0x8D81
-#	RGBA32I						= 0x8D82    # 3.0
-#	RGBA32I_EXT					= 0x8D82
-#	RGB32I						= 0x8D83    # 3.0
-#	RGB32I_EXT					= 0x8D83
-#	ALPHA32I_EXT					= 0x8D84
-#	INTENSITY32I_EXT				= 0x8D85
-#	LUMINANCE32I_EXT				= 0x8D86
-#	LUMINANCE_ALPHA32I_EXT				= 0x8D87
-#	RGBA16I						= 0x8D88    # 3.0
-#	RGBA16I_EXT					= 0x8D88
-#	RGB16I						= 0x8D89    # 3.0
-#	RGB16I_EXT					= 0x8D89
-#	ALPHA16I_EXT					= 0x8D8A
-#	INTENSITY16I_EXT				= 0x8D8B
-#	LUMINANCE16I_EXT				= 0x8D8C
-#	LUMINANCE_ALPHA16I_EXT				= 0x8D8D
-#	RGBA8I						= 0x8D8E    # 3.0
-#	RGBA8I_EXT					= 0x8D8E
-#	RGB8I						= 0x8D8F    # 3.0
-#	RGB8I_EXT					= 0x8D8F
-#	ALPHA8I_EXT					= 0x8D90
-#	INTENSITY8I_EXT					= 0x8D91
-#	LUMINANCE8I_EXT					= 0x8D92
-#	LUMINANCE_ALPHA8I_EXT				= 0x8D93
-#	RED_INTEGER					= 0x8D94    # 3.0
-#	RED_INTEGER_EXT					= 0x8D94
-#	GREEN_INTEGER					= 0x8D95    # 3.0
-#	GREEN_INTEGER_EXT				= 0x8D95
-#	BLUE_INTEGER					= 0x8D96    # 3.0
-#	BLUE_INTEGER_EXT				= 0x8D96
-#	ALPHA_INTEGER					= 0x8D97    # 3.0
-#	ALPHA_INTEGER_EXT				= 0x8D97
-#	RGB_INTEGER					= 0x8D98    # 3.0
-#	RGB_INTEGER_EXT					= 0x8D98
-#	RGBA_INTEGER					= 0x8D99    # 3.0
-#	RGBA_INTEGER_EXT				= 0x8D99
-#	BGR_INTEGER					= 0x8D9A    # 3.0
-#	BGR_INTEGER_EXT					= 0x8D9A
-#	BGRA_INTEGER					= 0x8D9B    # 3.0
-#	BGRA_INTEGER_EXT				= 0x8D9B
-#	LUMINANCE_INTEGER_EXT				= 0x8D9C
-#	LUMINANCE_ALPHA_INTEGER_EXT			= 0x8D9D
-#	RGBA_INTEGER_MODE_EXT				= 0x8D9E
+#@@ separate extensions
+VERSION_3_0 enum:
+EXT_texture_integer enum:
+	RGBA32UI					= 0x8D70    # VERSION_3_0
+	RGBA32UI_EXT					= 0x8D70
+	RGB32UI						= 0x8D71    # VERSION_3_0
+	RGB32UI_EXT					= 0x8D71
+	ALPHA32UI_EXT					= 0x8D72
+	INTENSITY32UI_EXT				= 0x8D73
+	LUMINANCE32UI_EXT				= 0x8D74
+	LUMINANCE_ALPHA32UI_EXT				= 0x8D75
+	RGBA16UI					= 0x8D76    # VERSION_3_0
+	RGBA16UI_EXT					= 0x8D76
+	RGB16UI						= 0x8D77    # VERSION_3_0
+	RGB16UI_EXT					= 0x8D77
+	ALPHA16UI_EXT					= 0x8D78
+	INTENSITY16UI_EXT				= 0x8D79
+	LUMINANCE16UI_EXT				= 0x8D7A
+	LUMINANCE_ALPHA16UI_EXT				= 0x8D7B
+	RGBA8UI						= 0x8D7C    # VERSION_3_0
+	RGBA8UI_EXT					= 0x8D7C
+	RGB8UI						= 0x8D7D    # VERSION_3_0
+	RGB8UI_EXT					= 0x8D7D
+	ALPHA8UI_EXT					= 0x8D7E
+	INTENSITY8UI_EXT				= 0x8D7F
+	LUMINANCE8UI_EXT				= 0x8D80
+	LUMINANCE_ALPHA8UI_EXT				= 0x8D81
+	RGBA32I						= 0x8D82    # VERSION_3_0
+	RGBA32I_EXT					= 0x8D82
+	RGB32I						= 0x8D83    # VERSION_3_0
+	RGB32I_EXT					= 0x8D83
+	ALPHA32I_EXT					= 0x8D84
+	INTENSITY32I_EXT				= 0x8D85
+	LUMINANCE32I_EXT				= 0x8D86
+	LUMINANCE_ALPHA32I_EXT				= 0x8D87
+	RGBA16I						= 0x8D88    # VERSION_3_0
+	RGBA16I_EXT					= 0x8D88
+	RGB16I						= 0x8D89    # VERSION_3_0
+	RGB16I_EXT					= 0x8D89
+	ALPHA16I_EXT					= 0x8D8A
+	INTENSITY16I_EXT				= 0x8D8B
+	LUMINANCE16I_EXT				= 0x8D8C
+	LUMINANCE_ALPHA16I_EXT				= 0x8D8D
+	RGBA8I						= 0x8D8E    # VERSION_3_0
+	RGBA8I_EXT					= 0x8D8E
+	RGB8I						= 0x8D8F    # VERSION_3_0
+	RGB8I_EXT					= 0x8D8F
+	ALPHA8I_EXT					= 0x8D90
+	INTENSITY8I_EXT					= 0x8D91
+	LUMINANCE8I_EXT					= 0x8D92
+	LUMINANCE_ALPHA8I_EXT				= 0x8D93
+	RED_INTEGER					= 0x8D94    # VERSION_3_0
+	RED_INTEGER_EXT					= 0x8D94
+	GREEN_INTEGER					= 0x8D95    # VERSION_3_0
+	GREEN_INTEGER_EXT				= 0x8D95
+	BLUE_INTEGER					= 0x8D96    # VERSION_3_0
+	BLUE_INTEGER_EXT				= 0x8D96
+	ALPHA_INTEGER					= 0x8D97    # VERSION_3_0
+	ALPHA_INTEGER_EXT				= 0x8D97
+	RGB_INTEGER					= 0x8D98    # VERSION_3_0
+	RGB_INTEGER_EXT					= 0x8D98
+	RGBA_INTEGER					= 0x8D99    # VERSION_3_0
+	RGBA_INTEGER_EXT				= 0x8D99
+	BGR_INTEGER					= 0x8D9A    # VERSION_3_0
+	BGR_INTEGER_EXT					= 0x8D9A
+	BGRA_INTEGER					= 0x8D9B    # VERSION_3_0
+	BGRA_INTEGER_EXT				= 0x8D9B
+	LUMINANCE_INTEGER_EXT				= 0x8D9C
+	LUMINANCE_ALPHA_INTEGER_EXT			= 0x8D9D
+	RGBA_INTEGER_MODE_EXT				= 0x8D9E
 
 # NV_future_use: 0x8D9F
 
-# NV_parameter_buffer_object enum:
-#	MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV	= 0x8DA0
-#	MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV		= 0x8DA1
-#	VERTEX_PROGRAM_PARAMETER_BUFFER_NV		= 0x8DA2
-#	GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV		= 0x8DA3
-#	FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV		= 0x8DA4
+NV_parameter_buffer_object enum:
+	MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV	= 0x8DA0
+	MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV		= 0x8DA1
+	VERTEX_PROGRAM_PARAMETER_BUFFER_NV		= 0x8DA2
+	GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV		= 0x8DA3
+	FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV		= 0x8DA4
 
-# NV_gpu_program4 enum: (additional; see above)
-#	MAX_PROGRAM_GENERIC_ATTRIBS_NV			= 0x8DA5
-#	MAX_PROGRAM_GENERIC_RESULTS_NV			= 0x8DA6
+NV_gpu_program4 enum: (additional; see above)
+	MAX_PROGRAM_GENERIC_ATTRIBS_NV			= 0x8DA5
+	MAX_PROGRAM_GENERIC_RESULTS_NV			= 0x8DA6
 
-# ARB_geometry_shader4 enum: (additional; see below)
-# NV_geometry_program4 enum: (additional; see above)
-#	FRAMEBUFFER_ATTACHMENT_LAYERED_ARB		= 0x8DA7
-#	FRAMEBUFFER_ATTACHMENT_LAYERED_EXT		= 0x8DA7
-#	FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB	= 0x8DA8
-#	FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT	= 0x8DA8
-#	FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB		= 0x8DA9
-#	FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT		= 0x8DA9
+VERSION_3_2 enum:
+	FRAMEBUFFER_ATTACHMENT_LAYERED			= 0x8DA7
+	FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS		= 0x8DA8
 
+ARB_geometry_shader4 enum: (additional; see below)
+	FRAMEBUFFER_ATTACHMENT_LAYERED_ARB		= 0x8DA7
+	FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB	= 0x8DA8
+	FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB		= 0x8DA9
+
+NV_geometry_program4 enum: (additional; see above)
+	FRAMEBUFFER_ATTACHMENT_LAYERED_EXT		= 0x8DA7
+	FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT	= 0x8DA8
+	FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT		= 0x8DA9
+
 # NV_future_use: 0x8DAA
-# NV_future_use: 0x8DAE
 
-# VERSION_3_0 enum:
-# ARB_depth_buffer_float enum: (additional; see above; some values different from NV; note: no ARB suffixes)
-# NV_depth_buffer_float enum:
-#	DEPTH_COMPONENT32F_NV				= 0x8DAB
-#	DEPTH32F_STENCIL8_NV				= 0x8DAC
-#	FLOAT_32_UNSIGNED_INT_24_8_REV_NV		= 0x8DAD
-#	FLOAT_32_UNSIGNED_INT_24_8_REV			= 0x8DAD
-#	DEPTH_BUFFER_FLOAT_MODE_NV			= 0x8DAF
+VERSION_3_0 enum:
+ARB_depth_buffer_float enum: (additional; see above; some values different from NV; note: no ARB suffixes)
+	FLOAT_32_UNSIGNED_INT_24_8_REV			= 0x8DAD
 
+NV_depth_buffer_float enum:
+	DEPTH_COMPONENT32F_NV				= 0x8DAB
+	DEPTH32F_STENCIL8_NV				= 0x8DAC
+	FLOAT_32_UNSIGNED_INT_24_8_REV_NV		= 0x8DAD
+	DEPTH_BUFFER_FLOAT_MODE_NV			= 0x8DAF
+
+# NV_future_use: 0x8DAE
 # NV_future_use: 0x8DB0-0x8DB8
 
-# VERSION_3_0 enum:
-# ARB_framebuffer_sRGB enum: (note: no ARB suffixes)
-# EXT_framebuffer_sRGB enum:
-#	FRAMEBUFFER_SRGB				= 0x8DB9    # 3.0 / ARB_sRGB
-#	FRAMEBUFFER_SRGB_EXT				= 0x8DB9
-#	FRAMEBUFFER_SRGB_CAPABLE_EXT			= 0x8DBA
+VERSION_3_0 enum:
+ARB_framebuffer_sRGB enum: (note: no ARB suffixes)
+	FRAMEBUFFER_SRGB				= 0x8DB9    # VERSION_3_0 / ARB_sRGB
 
-# VERSION_3_0 enum:
-# ARB_texture_compression_rgtc enum: (note: no ARB suffixes)
-# EXT_texture_compression_rgtc enum:
-#	COMPRESSED_RED_RGTC1				= 0x8DBB    # 3.0 / ARB_tcrgtc
-#	COMPRESSED_RED_RGTC1_EXT			= 0x8DBB
-#	COMPRESSED_SIGNED_RED_RGTC1			= 0x8DBC    # 3.0 / ARB_tcrgtc
-#	COMPRESSED_SIGNED_RED_RGTC1_EXT			= 0x8DBC
-#	COMPRESSED_RG_RGTC2				= 0x8DBD    # 3.0 / ARB_tcrgtc
-#	COMPRESSED_RED_GREEN_RGTC2_EXT			= 0x8DBD
-#	COMPRESSED_SIGNED_RG_RGTC2			= 0x8DBE    # 3.0 / ARB_tcrgtc
-#	COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT		= 0x8DBE
+EXT_framebuffer_sRGB enum:
+	FRAMEBUFFER_SRGB_EXT				= 0x8DB9
+	FRAMEBUFFER_SRGB_CAPABLE_EXT			= 0x8DBA
 
+VERSION_3_0 enum:
+ARB_texture_compression_rgtc enum: (note: no ARB suffixes)
+	COMPRESSED_RED_RGTC1				= 0x8DBB    # VERSION_3_0 / ARB_tcrgtc
+	COMPRESSED_SIGNED_RED_RGTC1			= 0x8DBC    # VERSION_3_0 / ARB_tcrgtc
+	COMPRESSED_RG_RGTC2				= 0x8DBD    # VERSION_3_0 / ARB_tcrgtc
+	COMPRESSED_SIGNED_RG_RGTC2			= 0x8DBE    # VERSION_3_0 / ARB_tcrgtc
+
+EXT_texture_compression_rgtc enum:
+	COMPRESSED_RED_RGTC1_EXT			= 0x8DBB
+	COMPRESSED_SIGNED_RED_RGTC1_EXT			= 0x8DBC
+	COMPRESSED_RED_GREEN_RGTC2_EXT			= 0x8DBD
+	COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT		= 0x8DBE
+
 # NV_future_use: 0x8DBF
 
-# VERSION_3_0 enum:
-# EXT_gpu_shader4 enum:
-#	SAMPLER_1D_ARRAY				= 0x8DC0    # 3.0
-#	SAMPLER_1D_ARRAY_EXT				= 0x8DC0
-#	SAMPLER_2D_ARRAY				= 0x8DC1    # 3.0
-#	SAMPLER_2D_ARRAY_EXT				= 0x8DC1
-#	SAMPLER_BUFFER_EXT				= 0x8DC2
-#	SAMPLER_1D_ARRAY_SHADOW				= 0x8DC3    # 3.0
-#	SAMPLER_1D_ARRAY_SHADOW_EXT			= 0x8DC3
-#	SAMPLER_2D_ARRAY_SHADOW				= 0x8DC4    # 3.0
-#	SAMPLER_2D_ARRAY_SHADOW_EXT			= 0x8DC4
-#	SAMPLER_CUBE_SHADOW				= 0x8DC5    # 3.0
-#	SAMPLER_CUBE_SHADOW_EXT				= 0x8DC5
-#	UNSIGNED_INT_VEC2				= 0x8DC6    # 3.0
-#	UNSIGNED_INT_VEC2_EXT				= 0x8DC6
-#	UNSIGNED_INT_VEC3				= 0x8DC7    # 3.0
-#	UNSIGNED_INT_VEC3_EXT				= 0x8DC7
-#	UNSIGNED_INT_VEC4				= 0x8DC8    # 3.0
-#	UNSIGNED_INT_VEC4_EXT				= 0x8DC8
-#	INT_SAMPLER_1D					= 0x8DC9    # 3.0
-#	INT_SAMPLER_1D_EXT				= 0x8DC9
-#	INT_SAMPLER_2D					= 0x8DCA    # 3.0
-#	INT_SAMPLER_2D_EXT				= 0x8DCA
-#	INT_SAMPLER_3D					= 0x8DCB    # 3.0
-#	INT_SAMPLER_3D_EXT				= 0x8DCB
-#	INT_SAMPLER_CUBE				= 0x8DCC    # 3.0
-#	INT_SAMPLER_CUBE_EXT				= 0x8DCC
-#	INT_SAMPLER_2D_RECT_EXT				= 0x8DCD
-#	INT_SAMPLER_1D_ARRAY				= 0x8DCE    # 3.0
-#	INT_SAMPLER_1D_ARRAY_EXT			= 0x8DCE
-#	INT_SAMPLER_2D_ARRAY				= 0x8DCF    # 3.0
-#	INT_SAMPLER_2D_ARRAY_EXT			= 0x8DCF
-#	INT_SAMPLER_BUFFER_EXT				= 0x8DD0
-#	UNSIGNED_INT_SAMPLER_1D				= 0x8DD1    # 3.0
-#	UNSIGNED_INT_SAMPLER_1D_EXT			= 0x8DD1
-#	UNSIGNED_INT_SAMPLER_2D				= 0x8DD2    # 3.0
-#	UNSIGNED_INT_SAMPLER_2D_EXT			= 0x8DD2
-#	UNSIGNED_INT_SAMPLER_3D				= 0x8DD3    # 3.0
-#	UNSIGNED_INT_SAMPLER_3D_EXT			= 0x8DD3
-#	UNSIGNED_INT_SAMPLER_CUBE			= 0x8DD4    # 3.0
-#	UNSIGNED_INT_SAMPLER_CUBE_EXT			= 0x8DD4
-#	UNSIGNED_INT_SAMPLER_2D_RECT_EXT		= 0x8DD5
-#	UNSIGNED_INT_SAMPLER_1D_ARRAY			= 0x8DD6    # 3.0
-#	UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT		= 0x8DD6
-#	UNSIGNED_INT_SAMPLER_2D_ARRAY			= 0x8DD7    # 3.0
-#	UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT		= 0x8DD7
-#	UNSIGNED_INT_SAMPLER_BUFFER_EXT			= 0x8DD8
+VERSION_3_0 enum:
+	SAMPLER_1D_ARRAY				= 0x8DC0    # VERSION_3_0
+	SAMPLER_2D_ARRAY				= 0x8DC1    # VERSION_3_0
+	SAMPLER_1D_ARRAY_SHADOW				= 0x8DC3    # VERSION_3_0
+	SAMPLER_2D_ARRAY_SHADOW				= 0x8DC4    # VERSION_3_0
+	SAMPLER_CUBE_SHADOW				= 0x8DC5    # VERSION_3_0
+	UNSIGNED_INT_VEC2				= 0x8DC6    # VERSION_3_0
+	UNSIGNED_INT_VEC3				= 0x8DC7    # VERSION_3_0
+	UNSIGNED_INT_VEC4				= 0x8DC8    # VERSION_3_0
+	INT_SAMPLER_1D					= 0x8DC9    # VERSION_3_0
+	INT_SAMPLER_2D					= 0x8DCA    # VERSION_3_0
+	INT_SAMPLER_3D					= 0x8DCB    # VERSION_3_0
+	INT_SAMPLER_CUBE				= 0x8DCC    # VERSION_3_0
+	INT_SAMPLER_1D_ARRAY				= 0x8DCE    # VERSION_3_0
+	INT_SAMPLER_2D_ARRAY				= 0x8DCF    # VERSION_3_0
+	UNSIGNED_INT_SAMPLER_1D				= 0x8DD1    # VERSION_3_0
+	UNSIGNED_INT_SAMPLER_2D				= 0x8DD2    # VERSION_3_0
+	UNSIGNED_INT_SAMPLER_3D				= 0x8DD3    # VERSION_3_0
+	UNSIGNED_INT_SAMPLER_CUBE			= 0x8DD4    # VERSION_3_0
+	UNSIGNED_INT_SAMPLER_1D_ARRAY			= 0x8DD6    # VERSION_3_0
+	UNSIGNED_INT_SAMPLER_2D_ARRAY			= 0x8DD7    # VERSION_3_0
 
-# ARB_geometry_shader4 enum:
-# EXT_geometry_shader4 enum:
-#	GEOMETRY_SHADER_ARB				= 0x8DD9
-#	GEOMETRY_SHADER_EXT				= 0x8DD9
+VERSION_3_1 enum: (Promoted from EXT_gpu_shader4 + ARB_texture_rectangle / ARB_uniform_buffer_object)
+	SAMPLER_BUFFER					= 0x8DC2    # EXT_gpu_shader4 + ARB_texture_buffer_object
+	INT_SAMPLER_2D_RECT				= 0x8DCD    # EXT_gpu_shader4 + ARB_texture_rectangle
+	INT_SAMPLER_BUFFER				= 0x8DD0    # EXT_gpu_shader4 + ARB_texture_buffer_object
+	UNSIGNED_INT_SAMPLER_2D_RECT			= 0x8DD5    # EXT_gpu_shader4 + ARB_texture_rectangle
+	UNSIGNED_INT_SAMPLER_BUFFER			= 0x8DD8    # EXT_gpu_shader4 + ARB_texture_buffer_object
 
-# ARB_geometry_shader4 enum: (additional; see above)
-# NV_geometry_program4 enum: (additional; see above)
-#	GEOMETRY_VERTICES_OUT_ARB			= 0x8DDA
-#	GEOMETRY_VERTICES_OUT_EXT			= 0x8DDA
-#	GEOMETRY_INPUT_TYPE_ARB				= 0x8DDB
-#	GEOMETRY_INPUT_TYPE_EXT				= 0x8DDB
-#	GEOMETRY_OUTPUT_TYPE_ARB			= 0x8DDC
-#	GEOMETRY_OUTPUT_TYPE_EXT			= 0x8DDC
+EXT_gpu_shader4 enum:
+	SAMPLER_1D_ARRAY_EXT				= 0x8DC0
+	SAMPLER_2D_ARRAY_EXT				= 0x8DC1
+	SAMPLER_BUFFER_EXT				= 0x8DC2
+	SAMPLER_1D_ARRAY_SHADOW_EXT			= 0x8DC3
+	SAMPLER_2D_ARRAY_SHADOW_EXT			= 0x8DC4
+	SAMPLER_CUBE_SHADOW_EXT				= 0x8DC5
+	UNSIGNED_INT_VEC2_EXT				= 0x8DC6
+	UNSIGNED_INT_VEC3_EXT				= 0x8DC7
+	UNSIGNED_INT_VEC4_EXT				= 0x8DC8
+	INT_SAMPLER_1D_EXT				= 0x8DC9
+	INT_SAMPLER_2D_EXT				= 0x8DCA
+	INT_SAMPLER_3D_EXT				= 0x8DCB
+	INT_SAMPLER_CUBE_EXT				= 0x8DCC
+	INT_SAMPLER_2D_RECT_EXT				= 0x8DCD
+	INT_SAMPLER_1D_ARRAY_EXT			= 0x8DCE
+	INT_SAMPLER_2D_ARRAY_EXT			= 0x8DCF
+	INT_SAMPLER_BUFFER_EXT				= 0x8DD0
+	UNSIGNED_INT_SAMPLER_1D_EXT			= 0x8DD1
+	UNSIGNED_INT_SAMPLER_2D_EXT			= 0x8DD2
+	UNSIGNED_INT_SAMPLER_3D_EXT			= 0x8DD3
+	UNSIGNED_INT_SAMPLER_CUBE_EXT			= 0x8DD4
+	UNSIGNED_INT_SAMPLER_2D_RECT_EXT		= 0x8DD5
+	UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT		= 0x8DD6
+	UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT		= 0x8DD7
+	UNSIGNED_INT_SAMPLER_BUFFER_EXT			= 0x8DD8
 
-# ARB_geometry_shader4 enum: (additional; see above)
-# EXT_geometry_shader4 enum: (additional; see above)
-#	MAX_GEOMETRY_VARYING_COMPONENTS_ARB		= 0x8DDD
-#	MAX_GEOMETRY_VARYING_COMPONENTS_EXT		= 0x8DDD
-#	MAX_VERTEX_VARYING_COMPONENTS_ARB		= 0x8DDE
-#	MAX_VERTEX_VARYING_COMPONENTS_EXT		= 0x8DDE
-#	MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB		= 0x8DDF
-#	MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT		= 0x8DDF
-#	MAX_GEOMETRY_OUTPUT_VERTICES_ARB		= 0x8DE0
-#	MAX_GEOMETRY_OUTPUT_VERTICES_EXT		= 0x8DE0
-#	MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB	= 0x8DE1
-#	MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT	= 0x8DE1
+VERSION_3_2 enum:
+	GEOMETRY_SHADER					= 0x8DD9
 
-# EXT_bindable_uniform enum:
-#	MAX_VERTEX_BINDABLE_UNIFORMS_EXT		= 0x8DE2
-#	MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT		= 0x8DE3
-#	MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT		= 0x8DE4
+ARB_geometry_shader4 enum:
+	GEOMETRY_SHADER_ARB				= 0x8DD9
 
+EXT_geometry_shader4 enum:
+	GEOMETRY_SHADER_EXT				= 0x8DD9
+
+ARB_geometry_shader4 enum: (additional; see above)
+	GEOMETRY_VERTICES_OUT_ARB			= 0x8DDA
+	GEOMETRY_INPUT_TYPE_ARB				= 0x8DDB
+	GEOMETRY_OUTPUT_TYPE_ARB			= 0x8DDC
+
+NV_geometry_program4 enum: (additional; see above)
+	GEOMETRY_VERTICES_OUT_EXT			= 0x8DDA
+	GEOMETRY_INPUT_TYPE_EXT				= 0x8DDB
+	GEOMETRY_OUTPUT_TYPE_EXT			= 0x8DDC
+
+ARB_geometry_shader4 enum: (additional; see above)
+	MAX_GEOMETRY_VARYING_COMPONENTS_ARB		= 0x8DDD
+	MAX_VERTEX_VARYING_COMPONENTS_ARB		= 0x8DDE
+	MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB		= 0x8DDF
+	MAX_GEOMETRY_OUTPUT_VERTICES_ARB		= 0x8DE0
+	MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB	= 0x8DE1
+
+VERSION_3_2 enum:
+	MAX_GEOMETRY_UNIFORM_COMPONENTS			= 0x8DDF
+	MAX_GEOMETRY_OUTPUT_VERTICES			= 0x8DE0
+	MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS		= 0x8DE1
+
+EXT_geometry_shader4 enum: (additional; see above)
+	MAX_GEOMETRY_VARYING_COMPONENTS_EXT		= 0x8DDD
+	MAX_VERTEX_VARYING_COMPONENTS_EXT		= 0x8DDE
+	MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT		= 0x8DDF
+	MAX_GEOMETRY_OUTPUT_VERTICES_EXT		= 0x8DE0
+	MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT	= 0x8DE1
+
+EXT_bindable_uniform enum:
+	MAX_VERTEX_BINDABLE_UNIFORMS_EXT		= 0x8DE2
+	MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT		= 0x8DE3
+	MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT		= 0x8DE4
+
 # NV_future_use: 0x8DE5-0x8DEC
 
-# EXT_bindable_uniform enum: (additional; see above)
-#	MAX_BINDABLE_UNIFORM_SIZE_EXT			= 0x8DED
-#	UNIFORM_BUFFER_EXT				= 0x8DEE
-#	UNIFORM_BUFFER_BINDING_EXT			= 0x8DEF
+EXT_bindable_uniform enum: (additional; see above)
+	MAX_BINDABLE_UNIFORM_SIZE_EXT			= 0x8DED
+	UNIFORM_BUFFER_EXT				= 0x8DEE
+	UNIFORM_BUFFER_BINDING_EXT			= 0x8DEF
 
 ###############################################################################
 
 # 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
+
 ###############################################################################
 
 # NVIDIA: 0x8E10-0x8E8F
 # Reserved per email from Michael Gold 2006/8/7
 
-# NV_framebuffer_multisample_coverage enum:
-#	RENDERBUFFER_COLOR_SAMPLES_NV			= 0x8E10
-#	MAX_MULTISAMPLE_COVERAGE_MODES_NV		= 0x8E11
-#	MULTISAMPLE_COVERAGE_MODES_NV			= 0x8E12
+NV_framebuffer_multisample_coverage enum:
+	RENDERBUFFER_COLOR_SAMPLES_NV			= 0x8E10
+	MAX_MULTISAMPLE_COVERAGE_MODES_NV		= 0x8E11
+	MULTISAMPLE_COVERAGE_MODES_NV			= 0x8E12
 
-# VERSION_3_0 enum:
-# GL_NV_conditional_render enum:
-#	QUERY_WAIT					= 0x8E13   # 3.0
-#	QUERY_WAIT_NV					= 0x8E13
-#	QUERY_NO_WAIT					= 0x8E14   # 3.0
-#	QUERY_NO_WAIT_NV				= 0x8E14
-#	QUERY_BY_REGION_WAIT				= 0x8E15   # 3.0
-#	QUERY_BY_REGION_WAIT_NV				= 0x8E15
-#	QUERY_BY_REGION_NO_WAIT				= 0x8E16   # 3.0
-#	QUERY_BY_REGION_NO_WAIT_NV			= 0x8E16
+VERSION_3_0 enum:
+	QUERY_WAIT					= 0x8E13    # VERSION_3_0
+	QUERY_NO_WAIT					= 0x8E14    # VERSION_3_0
+	QUERY_BY_REGION_WAIT				= 0x8E15    # VERSION_3_0
+	QUERY_BY_REGION_NO_WAIT				= 0x8E16    # VERSION_3_0
 
+GL_NV_conditional_render enum:
+	QUERY_WAIT_NV					= 0x8E13
+	QUERY_NO_WAIT_NV				= 0x8E14
+	QUERY_BY_REGION_WAIT_NV				= 0x8E15
+	QUERY_BY_REGION_NO_WAIT_NV			= 0x8E16
+
 # NV_future_use: 0x8E17-0x8E21
 
-# NV_transform_feedback2 enum:
-#     TRANSFORM_FEEDBACK_NV				= 0x8E22
-#     TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV		= 0x8E23
-#     TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV		= 0x8E24
-#     TRANSFORM_FEEDBACK_BINDING_NV			= 0x8E25
+NV_transform_feedback2 enum:
+      TRANSFORM_FEEDBACK_NV				= 0x8E22
+      TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV		= 0x8E23
+      TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV		= 0x8E24
+      TRANSFORM_FEEDBACK_BINDING_NV			= 0x8E25
 
-# NV_present_video enum:
-#	FRAME_NV					= 0x8E26
-#	FIELDS_NV					= 0x8E27
-#	CURRENT_TIME_NV					= 0x8E28
-#	NUM_FILL_STREAMS_NV				= 0x8E29
-#	PRESENT_TIME_NV					= 0x8E2A
-#	PRESENT_DURATION_NV				= 0x8E2B
+NV_present_video enum:
+	FRAME_NV					= 0x8E26
+	FIELDS_NV					= 0x8E27
+	CURRENT_TIME_NV					= 0x8E28
+	NUM_FILL_STREAMS_NV				= 0x8E29
+	PRESENT_TIME_NV					= 0x8E2A
+	PRESENT_DURATION_NV				= 0x8E2B
 
 # NV_future_use: 0x8E2C
 
-# EXT_direct_state_access enum:
-#	PROGRAM_MATRIX_EXT				= 0x8E2D
-#	TRANSPOSE_PROGRAM_MATRIX_EXT			= 0x8E2E
-#	PROGRAM_MATRIX_STACK_DEPTH_EXT			= 0x8E2F
+EXT_direct_state_access enum:
+	PROGRAM_MATRIX_EXT				= 0x8E2D
+	TRANSPOSE_PROGRAM_MATRIX_EXT			= 0x8E2E
+	PROGRAM_MATRIX_STACK_DEPTH_EXT			= 0x8E2F
 
 # NV_future_use: 0x8E30-0x8E41
 
-# EXT_texture_swizzle enum:
-#	TEXTURE_SWIZZLE_R_EXT				= 0x8E42
-#	TEXTURE_SWIZZLE_G_EXT				= 0x8E43
-#	TEXTURE_SWIZZLE_B_EXT				= 0x8E44
-#	TEXTURE_SWIZZLE_A_EXT				= 0x8E45
-#	TEXTURE_SWIZZLE_RGBA_EXT			= 0x8E46
+EXT_texture_swizzle enum:
+	TEXTURE_SWIZZLE_R_EXT				= 0x8E42
+	TEXTURE_SWIZZLE_G_EXT				= 0x8E43
+	TEXTURE_SWIZZLE_B_EXT				= 0x8E44
+	TEXTURE_SWIZZLE_A_EXT				= 0x8E45
+	TEXTURE_SWIZZLE_RGBA_EXT			= 0x8E46
 
-# NV_future_use: 0x8E47-0x8E4F
+# NV_future_use: 0x8E47-0x8E4B
 
-# NV_explicit_multisample enum:
-#	SAMPLE_POSITION_NV				= 0x8E50
-#	SAMPLE_MASK_NV					= 0x8E51
-#	SAMPLE_MASK_VALUE_NV				= 0x8E52
-#	TEXTURE_BINDING_RENDERBUFFER_NV			= 0x8E53
-#	TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV	= 0x8E54
-#	MAX_SAMPLE_MASK_WORDS_NV			= 0x8E59
-#	TEXTURE_RENDERBUFFER_NV				= 0x8E55
-#	SAMPLER_RENDERBUFFER_NV				= 0x8E56
-#	INT_SAMPLER_RENDERBUFFER_NV			= 0x8E57
-#	UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV		= 0x8E58
+VERSION_3_2 enum:
+	use ARB_provoking_vertex	    QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION
+	use ARB_provoking_vertex	    FIRST_VERTEX_CONVENTION
+	use ARB_provoking_vertex	    LAST_VERTEX_CONVENTION
+	use ARB_provoking_vertex	    PROVOKING_VERTEX
 
-# NV_future_use: 0x8E59-0x8E8F
+ARB_provoking_vertex enum:
+	QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION	= 0x8E4C
+	FIRST_VERTEX_CONVENTION				= 0x8E4D
+	LAST_VERTEX_CONVENTION				= 0x8E4E
+	PROVOKING_VERTEX				= 0x8E4F
 
+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
+
+VERSION_3_2 enum:
+	use ARB_texture_multisample	    SAMPLE_POSITION
+	use ARB_texture_multisample	    SAMPLE_MASK
+	use ARB_texture_multisample	    SAMPLE_MASK_VALUE
+	use ARB_texture_multisample	    MAX_SAMPLE_MASK_WORDS
+
+ARB_texture_multisample enum:
+	SAMPLE_POSITION					= 0x8E50
+	SAMPLE_MASK					= 0x8E51
+	SAMPLE_MASK_VALUE				= 0x8E52
+	MAX_SAMPLE_MASK_WORDS				= 0x8E59
+
+NV_explicit_multisample enum:
+	SAMPLE_POSITION_NV				= 0x8E50
+	SAMPLE_MASK_NV					= 0x8E51
+	SAMPLE_MASK_VALUE_NV				= 0x8E52
+	TEXTURE_BINDING_RENDERBUFFER_NV			= 0x8E53
+	TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV	= 0x8E54
+	TEXTURE_RENDERBUFFER_NV				= 0x8E55
+	SAMPLER_RENDERBUFFER_NV				= 0x8E56
+	INT_SAMPLER_RENDERBUFFER_NV			= 0x8E57
+	UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV		= 0x8E58
+	MAX_SAMPLE_MASK_WORDS_NV			= 0x8E59
+
+# NV_future_use: 0x8E5A-0x8E5D
+
+ARB_texture_gather enum:
+	MIN_PROGRAM_TEXTURE_GATHER_OFFSET		= 0x8E5E
+	MAX_PROGRAM_TEXTURE_GATHER_OFFSET		= 0x8E5F
+
+# NV_future_use: 0x8E60-0x8E8F
+
 ###############################################################################
 
 # QNX: 0x8E90-0x8E9F
-# https://cvs.khronos.org/bugzilla/show_bug.cgi?id=696
 # For GL_QNX_texture_tiling, GL_QNX_complex_polygon, GL_QNX_stippled_lines
+# (Khronos bug 696)
 
 # QNX_future_use: 0x8E90-0x8E9F
 
@@ -6281,6 +7144,49 @@
 # NVIDIA: 0x8ED0-0x8F4F
 # Assigned for Pat Brown (Khronos bug 3191)
 
+# NV_future_use: 0x8ED0-0x8F1C
+
+NV_shader_buffer_load enum:
+	BUFFER_GPU_ADDRESS_NV				= 0x8F1D
+
+NV_vertex_buffer_unified_memory enum:
+	VERTEX_ATTRIB_ARRAY_UNIFIED_NV			= 0x8F1E
+	ELEMENT_ARRAY_UNIFIED_NV			= 0x8F1F
+	VERTEX_ATTRIB_ARRAY_ADDRESS_NV			= 0x8F20
+	VERTEX_ARRAY_ADDRESS_NV				= 0x8F21
+	NORMAL_ARRAY_ADDRESS_NV				= 0x8F22
+	COLOR_ARRAY_ADDRESS_NV				= 0x8F23
+	INDEX_ARRAY_ADDRESS_NV				= 0x8F24
+	TEXTURE_COORD_ARRAY_ADDRESS_NV			= 0x8F25
+	EDGE_FLAG_ARRAY_ADDRESS_NV			= 0x8F26
+	SECONDARY_COLOR_ARRAY_ADDRESS_NV		= 0x8F27
+	FOG_COORD_ARRAY_ADDRESS_NV			= 0x8F28
+	ELEMENT_ARRAY_ADDRESS_NV			= 0x8F29
+	VERTEX_ATTRIB_ARRAY_LENGTH_NV			= 0x8F2A
+	VERTEX_ARRAY_LENGTH_NV				= 0x8F2B
+	NORMAL_ARRAY_LENGTH_NV				= 0x8F2C
+	COLOR_ARRAY_LENGTH_NV				= 0x8F2D
+	INDEX_ARRAY_LENGTH_NV				= 0x8F2E
+	TEXTURE_COORD_ARRAY_LENGTH_NV			= 0x8F2F
+	EDGE_FLAG_ARRAY_LENGTH_NV			= 0x8F30
+	SECONDARY_COLOR_ARRAY_LENGTH_NV			= 0x8F31
+	FOG_COORD_ARRAY_LENGTH_NV			= 0x8F32
+	ELEMENT_ARRAY_LENGTH_NV				= 0x8F33
+
+NV_shader_buffer_load enum: (additional; see above)
+	GPU_ADDRESS_NV					= 0x8F34
+	MAX_SHADER_BUFFER_ADDRESS_NV			= 0x8F35
+
+ARB_copy_buffer enum:
+	COPY_READ_BUFFER				= 0x8F36
+	COPY_WRITE_BUFFER				= 0x8F37
+
+VERSION_3_1 enum:
+	use ARB_copy_buffer		    COPY_READ_BUFFER
+	use ARB_copy_buffer		    COPY_WRITE_BUFFER
+
+# NVIDIA_future_use: 0x8F38-0x8F4F
+
 ###############################################################################
 
 # 3Dlabs: 0x8F50-0x8F5F
@@ -6302,17 +7208,248 @@
 # 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    # VERSION_3_1
+	RG_SNORM					= 0x8F91    # VERSION_3_1
+	RGB_SNORM					= 0x8F92    # VERSION_3_1
+	RGBA_SNORM					= 0x8F93    # VERSION_3_1
+	R8_SNORM					= 0x8F94    # VERSION_3_1
+	RG8_SNORM					= 0x8F95    # VERSION_3_1
+	RGB8_SNORM					= 0x8F96    # VERSION_3_1
+	RGBA8_SNORM					= 0x8F97    # VERSION_3_1
+	R16_SNORM					= 0x8F98    # VERSION_3_1
+	RG16_SNORM					= 0x8F99    # VERSION_3_1
+	RGB16_SNORM					= 0x8F9A    # VERSION_3_1
+	RGBA16_SNORM					= 0x8F9B    # VERSION_3_1
+	SIGNED_NORMALIZED				= 0x8F9C    # VERSION_3_1
+	PRIMITIVE_RESTART				= 0x8F9D    # Different from NV_primitive_restart value
+	PRIMITIVE_RESTART_INDEX				= 0x8F9E    # Different from NV_primitive_restart value
+
+ARB_texture_gather enum: (additional; see above)
+	MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS		= 0x8F9F
+
+###############################################################################
+
+# Qualcomm: 0x8FA0-0x8FBF
+# Assigned for Maurice Ribble (Khronos bug 4512)
+
+QCOM_driver_control enum: (OpenGL ES only)
+	PERFMON_GLOBAL_MODE_QCOM			= 0x8FA0
+
+# QCOM_future_use: 0x8FA1-0x8FBF
+
+###############################################################################
+
+# Vivante: 0x8FC0-0x8FDF
+# Assigned for Frido Garritsen	(Khronos bug 4526)
+
+###############################################################################
+
+# NVIDIA: 0x8FE0-0x8FFF
+# Assigned for Pat Brown (Khronos bug 4935)
+
+# NV_future_use: 0x8FE0-0x8FFF
+
+###############################################################################
+
+# AMD: 0x9000-0x901F
+# 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
+
+ARB_texture_cube_map_array enum:
+	TEXTURE_CUBE_MAP_ARRAY				= 0x9009
+	TEXTURE_BINDING_CUBE_MAP_ARRAY			= 0x900A
+	PROXY_TEXTURE_CUBE_MAP_ARRAY			= 0x900B
+	SAMPLER_CUBE_MAP_ARRAY				= 0x900C
+	SAMPLER_CUBE_MAP_ARRAY_SHADOW			= 0x900D
+	INT_SAMPLER_CUBE_MAP_ARRAY			= 0x900E
+	UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY		= 0x900F
+
+# AMD_future_use: 0x9008-0x900F
+
+EXT_texture_snorm enum:
+	ALPHA_SNORM					= 0x9010
+	LUMINANCE_SNORM					= 0x9011
+	LUMINANCE_ALPHA_SNORM				= 0x9012
+	INTENSITY_SNORM					= 0x9013
+	ALPHA8_SNORM					= 0x9014
+	LUMINANCE8_SNORM				= 0x9015
+	LUMINANCE8_ALPHA8_SNORM				= 0x9016
+	INTENSITY8_SNORM				= 0x9017
+	ALPHA16_SNORM					= 0x9018
+	LUMINANCE16_SNORM				= 0x9019
+	LUMINANCE16_ALPHA16_SNORM			= 0x901A
+	INTENSITY16_SNORM				= 0x901B
+
+# AMD_future_use: 0x901C-0x901F
+
+###############################################################################
+
+# NVIDIA: 0x9020-0x90FF
+# Assigned for Pat Brown (Khronos bug 4935)
+
+NV_video_capture enum:
+	  VIDEO_BUFFER_NV				  = 0x9020
+	  VIDEO_BUFFER_BINDING_NV			  = 0x9021
+	  FIELD_UPPER_NV				  = 0x9022
+	  FIELD_LOWER_NV				  = 0x9023
+	  NUM_VIDEO_CAPTURE_STREAMS_NV			  = 0x9024
+	  NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV		  = 0x9025
+	  VIDEO_CAPTURE_TO_422_SUPPORTED_NV		  = 0x9026
+	  LAST_VIDEO_CAPTURE_STATUS_NV			  = 0x9027
+	  VIDEO_BUFFER_PITCH_NV				  = 0x9028
+	  VIDEO_COLOR_CONVERSION_MATRIX_NV		  = 0x9029
+	  VIDEO_COLOR_CONVERSION_MAX_NV			  = 0x902A
+	  VIDEO_COLOR_CONVERSION_MIN_NV			  = 0x902B
+	  VIDEO_COLOR_CONVERSION_OFFSET_NV		  = 0x902C
+	  VIDEO_BUFFER_INTERNAL_FORMAT_NV		  = 0x902D
+	  PARTIAL_SUCCESS_NV				  = 0x902E
+	  SUCCESS_NV					  = 0x902F
+	  FAILURE_NV					  = 0x9030
+	  YCBYCR8_422_NV				  = 0x9031
+	  YCBAYCR8A_4224_NV				  = 0x9032
+	  Z6Y10Z6CB10Z6Y10Z6CR10_422_NV			  = 0x9033
+	  Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV	  = 0x9034
+	  Z4Y12Z4CB12Z4Y12Z4CR12_422_NV			  = 0x9035
+	  Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV	  = 0x9036
+	  Z4Y12Z4CB12Z4CR12_444_NV			  = 0x9037
+	  VIDEO_CAPTURE_FRAME_WIDTH_NV			  = 0x9038
+	  VIDEO_CAPTURE_FRAME_HEIGHT_NV			  = 0x9039
+	  VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV		  = 0x903A
+	  VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV		  = 0x903B
+	  VIDEO_CAPTURE_SURFACE_ORIGIN_NV		  = 0x903C
+
+# NV_future_use: 0x903D-0x90FF
+
+###############################################################################
+
+# OpenGL ARB: 0x9100-0x912F
+
+VERSION_3_2 enum:
+	use ARB_texture_multisample	    TEXTURE_2D_MULTISAMPLE
+	use ARB_texture_multisample	    PROXY_TEXTURE_2D_MULTISAMPLE
+	use ARB_texture_multisample	    TEXTURE_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    TEXTURE_BINDING_2D_MULTISAMPLE
+	use ARB_texture_multisample	    TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    TEXTURE_SAMPLES
+	use ARB_texture_multisample	    TEXTURE_FIXED_SAMPLE_LOCATIONS
+	use ARB_texture_multisample	    SAMPLER_2D_MULTISAMPLE
+	use ARB_texture_multisample	    INT_SAMPLER_2D_MULTISAMPLE
+	use ARB_texture_multisample	    UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE
+	use ARB_texture_multisample	    SAMPLER_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    INT_SAMPLER_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    MAX_COLOR_TEXTURE_SAMPLES
+	use ARB_texture_multisample	    MAX_DEPTH_TEXTURE_SAMPLES
+	use ARB_texture_multisample	    MAX_INTEGER_SAMPLES
+
+ARB_texture_multisample enum:
+	TEXTURE_2D_MULTISAMPLE				= 0x9100
+	PROXY_TEXTURE_2D_MULTISAMPLE			= 0x9101
+	TEXTURE_2D_MULTISAMPLE_ARRAY			= 0x9102
+	PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY		= 0x9103
+	TEXTURE_BINDING_2D_MULTISAMPLE			= 0x9104
+	TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY		= 0x9105
+	TEXTURE_SAMPLES					= 0x9106
+	TEXTURE_FIXED_SAMPLE_LOCATIONS			= 0x9107
+	SAMPLER_2D_MULTISAMPLE				= 0x9108
+	INT_SAMPLER_2D_MULTISAMPLE			= 0x9109
+	UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE		= 0x910A
+	SAMPLER_2D_MULTISAMPLE_ARRAY			= 0x910B
+	INT_SAMPLER_2D_MULTISAMPLE_ARRAY		= 0x910C
+	UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY	= 0x910D
+	MAX_COLOR_TEXTURE_SAMPLES			= 0x910E
+	MAX_DEPTH_TEXTURE_SAMPLES			= 0x910F
+	MAX_INTEGER_SAMPLES				= 0x9110
+
+VERSION_3_2 enum:
+	use ARB_sync			    MAX_SERVER_WAIT_TIMEOUT
+	use ARB_sync			    OBJECT_TYPE
+	use ARB_sync			    SYNC_CONDITION
+	use ARB_sync			    SYNC_STATUS
+	use ARB_sync			    SYNC_FLAGS
+	use ARB_sync			    SYNC_FENCE
+	use ARB_sync			    SYNC_GPU_COMMANDS_COMPLETE
+	use ARB_sync			    UNSIGNALED
+	use ARB_sync			    SIGNALED
+	use ARB_sync			    ALREADY_SIGNALED
+	use ARB_sync			    TIMEOUT_EXPIRED
+	use ARB_sync			    CONDITION_SATISFIED
+	use ARB_sync			    WAIT_FAILED
+	use ARB_sync			    TIMEOUT_IGNORED
+	use ARB_sync			    SYNC_FLUSH_COMMANDS_BIT
+	use ARB_sync			    TIMEOUT_IGNORED
+
+ARB_sync enum:
+	MAX_SERVER_WAIT_TIMEOUT				= 0x9111
+	OBJECT_TYPE					= 0x9112
+	SYNC_CONDITION					= 0x9113
+	SYNC_STATUS					= 0x9114
+	SYNC_FLAGS					= 0x9115
+	SYNC_FENCE					= 0x9116
+	SYNC_GPU_COMMANDS_COMPLETE			= 0x9117
+	UNSIGNALED					= 0x9118
+	SIGNALED					= 0x9119
+	ALREADY_SIGNALED				= 0x911A
+	TIMEOUT_EXPIRED					= 0x911B
+	CONDITION_SATISFIED				= 0x911C
+	WAIT_FAILED					= 0x911D
+	SYNC_FLUSH_COMMANDS_BIT				= 0x00000001
+	TIMEOUT_IGNORED					= 0xFFFFFFFFFFFFFFFFull
+
+VERSION_3_0 enum:
+	BUFFER_ACCESS_FLAGS				= 0x911F
+	BUFFER_MAP_LENGTH				= 0x9120
+	BUFFER_MAP_OFFSET				= 0x9121
+
+VERSION_3_2 enum:
+	MAX_VERTEX_OUTPUT_COMPONENTS			= 0x9122
+	MAX_GEOMETRY_INPUT_COMPONENTS			= 0x9123
+	MAX_GEOMETRY_OUTPUT_COMPONENTS			= 0x9124
+	MAX_FRAGMENT_INPUT_COMPONENTS			= 0x9125
+
+VERSION_3_2 enum:
+	CONTEXT_CORE_PROFILE_BIT			= 0x00000001
+	CONTEXT_COMPATIBILITY_PROFILE_BIT		= 0x00000002
+	CONTEXT_PROFILE_MASK				= 0x9126
+
+# ARB_future_use: 0x9127-0x912F
+
+###############################################################################
+
+# Imagination Tech.: 0x9130-0x913F (bug 882)
+
+IMG_program_binary: (OpenGL ES only)
+	SGX_PROGRAM_BINARY_IMG				= 0x9130
+
+# IMG_future_use: 0x9131-0x913F
+
+###############################################################################
 ### 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: 0x9140-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)

Modified: AppleSGLX/trunk/specs/enumext.spec
===================================================================
--- AppleSGLX/trunk/specs/enumext.spec	2010-01-10 03:11:22 UTC (rev 404)
+++ AppleSGLX/trunk/specs/enumext.spec	2010-01-13 05:04:59 UTC (rev 405)
@@ -1,11 +1,13 @@
 # List of GL enumerants for glext.h header
 #
-# This is NOT the master GL enumerant registry (enum.spec).
+# This is derived from the master GL enumerant registry (enum.spec).
 #
 # Unlike enum.spec, enumext.spec is
-#   (1) In order by extension number
-#   (2) Includes only extensions and 1.2/1.3 core enumerants, since
-#	it's assumed all <gl.h> today support at least OpenGL 1.1
+#   (1) Grouped by GL core version or extension number
+#   (2) While it includes all extension and core enumerants, the
+#	generator scripts for glext.h leave out VERSION_1_1
+#	tokens since it's assumed all <gl.h> today support at least
+#	OpenGL 1.1
 #   (3) Has no 'Extensions' section, since enums are always
 #	conditionally protected against multiple definition
 #	by glextenum.pl.
@@ -15,12 +17,605 @@
 # glext.h version number - this should be automatically updated,
 #   when changing either enum or template spec files.
 
-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
+###############################################################################
+#
+# OpenGL 1.0/1.1 enums (there is no VERSION_1_0 token)
+#
+###############################################################################
 
+VERSION_1_1 enum:
+passthru: /* AttribMask */
+	DEPTH_BUFFER_BIT				= 0x00000100	# AttribMask
+	STENCIL_BUFFER_BIT				= 0x00000400	# AttribMask
+	COLOR_BUFFER_BIT				= 0x00004000	# AttribMask
+passthru: /* Boolean */
+	FALSE						= 0		# Boolean
+	TRUE						= 1		# Boolean
+passthru: /* BeginMode */
+	POINTS						= 0x0000	# BeginMode
+	LINES						= 0x0001	# BeginMode
+	LINE_LOOP					= 0x0002	# BeginMode
+	LINE_STRIP					= 0x0003	# BeginMode
+	TRIANGLES					= 0x0004	# BeginMode
+	TRIANGLE_STRIP					= 0x0005	# BeginMode
+	TRIANGLE_FAN					= 0x0006	# BeginMode
+passthru: /* AlphaFunction */
+	NEVER						= 0x0200	# AlphaFunction
+	LESS						= 0x0201	# AlphaFunction
+	EQUAL						= 0x0202	# AlphaFunction
+	LEQUAL						= 0x0203	# AlphaFunction
+	GREATER						= 0x0204	# AlphaFunction
+	NOTEQUAL					= 0x0205	# AlphaFunction
+	GEQUAL						= 0x0206	# AlphaFunction
+	ALWAYS						= 0x0207	# AlphaFunction
+passthru: /* BlendingFactorDest */
+	ZERO						= 0		# BlendingFactorDest
+	ONE						= 1		# BlendingFactorDest
+	SRC_COLOR					= 0x0300	# BlendingFactorDest
+	ONE_MINUS_SRC_COLOR				= 0x0301	# BlendingFactorDest
+	SRC_ALPHA					= 0x0302	# BlendingFactorDest
+	ONE_MINUS_SRC_ALPHA				= 0x0303	# BlendingFactorDest
+	DST_ALPHA					= 0x0304	# BlendingFactorDest
+	ONE_MINUS_DST_ALPHA				= 0x0305	# BlendingFactorDest
+passthru: /* BlendingFactorSrc */
+	DST_COLOR					= 0x0306	# BlendingFactorSrc
+	ONE_MINUS_DST_COLOR				= 0x0307	# BlendingFactorSrc
+	SRC_ALPHA_SATURATE				= 0x0308	# BlendingFactorSrc
+passthru: /* DrawBufferMode */
+	NONE						= 0		# DrawBufferMode
+	FRONT_LEFT					= 0x0400	# DrawBufferMode
+	FRONT_RIGHT					= 0x0401	# DrawBufferMode
+	BACK_LEFT					= 0x0402	# DrawBufferMode
+	BACK_RIGHT					= 0x0403	# DrawBufferMode
+	FRONT						= 0x0404	# DrawBufferMode
+	BACK						= 0x0405	# DrawBufferMode
+	LEFT						= 0x0406	# DrawBufferMode
+	RIGHT						= 0x0407	# DrawBufferMode
+	FRONT_AND_BACK					= 0x0408	# DrawBufferMode
+passthru: /* ErrorCode */
+	NO_ERROR					= 0		# ErrorCode
+	INVALID_ENUM					= 0x0500	# ErrorCode
+	INVALID_VALUE					= 0x0501	# ErrorCode
+	INVALID_OPERATION				= 0x0502	# ErrorCode
+	OUT_OF_MEMORY					= 0x0505	# ErrorCode
+passthru: /* FrontFaceDirection */
+	CW						= 0x0900	# FrontFaceDirection
+	CCW						= 0x0901	# FrontFaceDirection
+passthru: /* GetPName */
+	POINT_SIZE					= 0x0B11 # 1 F	# GetPName
+	POINT_SIZE_RANGE				= 0x0B12 # 2 F	# GetPName
+	POINT_SIZE_GRANULARITY				= 0x0B13 # 1 F	# GetPName
+	LINE_SMOOTH					= 0x0B20 # 1 I	# GetPName
+	LINE_WIDTH					= 0x0B21 # 1 F	# GetPName
+	LINE_WIDTH_RANGE				= 0x0B22 # 2 F	# GetPName
+	LINE_WIDTH_GRANULARITY				= 0x0B23 # 1 F	# GetPName
+	POLYGON_SMOOTH					= 0x0B41 # 1 I	# GetPName
+	CULL_FACE					= 0x0B44 # 1 I	# GetPName
+	CULL_FACE_MODE					= 0x0B45 # 1 I	# GetPName
+	FRONT_FACE					= 0x0B46 # 1 I	# GetPName
+	DEPTH_RANGE					= 0x0B70 # 2 F	# GetPName
+	DEPTH_TEST					= 0x0B71 # 1 I	# GetPName
+	DEPTH_WRITEMASK					= 0x0B72 # 1 I	# GetPName
+	DEPTH_CLEAR_VALUE				= 0x0B73 # 1 F	# GetPName
+	DEPTH_FUNC					= 0x0B74 # 1 I	# GetPName
+	STENCIL_TEST					= 0x0B90 # 1 I	# GetPName
+	STENCIL_CLEAR_VALUE				= 0x0B91 # 1 I	# GetPName
+	STENCIL_FUNC					= 0x0B92 # 1 I	# GetPName
+	STENCIL_VALUE_MASK				= 0x0B93 # 1 I	# GetPName
+	STENCIL_FAIL					= 0x0B94 # 1 I	# GetPName
+	STENCIL_PASS_DEPTH_FAIL				= 0x0B95 # 1 I	# GetPName
+	STENCIL_PASS_DEPTH_PASS				= 0x0B96 # 1 I	# GetPName
+	STENCIL_REF					= 0x0B97 # 1 I	# GetPName
+	STENCIL_WRITEMASK				= 0x0B98 # 1 I	# GetPName
+	VIEWPORT					= 0x0BA2 # 4 I	# GetPName
+	DITHER						= 0x0BD0 # 1 I	# GetPName
+	BLEND_DST					= 0x0BE0 # 1 I	# GetPName
+	BLEND_SRC					= 0x0BE1 # 1 I	# GetPName
+	BLEND						= 0x0BE2 # 1 I	# GetPName
+	LOGIC_OP_MODE					= 0x0BF0 # 1 I	# GetPName
+	COLOR_LOGIC_OP					= 0x0BF2 # 1 I	# GetPName
+	DRAW_BUFFER					= 0x0C01 # 1 I	# GetPName
+	READ_BUFFER					= 0x0C02 # 1 I	# GetPName
+	SCISSOR_BOX					= 0x0C10 # 4 I	# GetPName
+	SCISSOR_TEST					= 0x0C11 # 1 I	# GetPName
+	COLOR_CLEAR_VALUE				= 0x0C22 # 4 F	# GetPName
+	COLOR_WRITEMASK					= 0x0C23 # 4 I	# GetPName
+	DOUBLEBUFFER					= 0x0C32 # 1 I	# GetPName
+	STEREO						= 0x0C33 # 1 I	# GetPName
+	LINE_SMOOTH_HINT				= 0x0C52 # 1 I	# GetPName
+	POLYGON_SMOOTH_HINT				= 0x0C53 # 1 I	# GetPName
+	UNPACK_SWAP_BYTES				= 0x0CF0 # 1 I	# GetPName
+	UNPACK_LSB_FIRST				= 0x0CF1 # 1 I	# GetPName
+	UNPACK_ROW_LENGTH				= 0x0CF2 # 1 I	# GetPName
+	UNPACK_SKIP_ROWS				= 0x0CF3 # 1 I	# GetPName
+	UNPACK_SKIP_PIXELS				= 0x0CF4 # 1 I	# GetPName
+	UNPACK_ALIGNMENT				= 0x0CF5 # 1 I	# GetPName
+	PACK_SWAP_BYTES					= 0x0D00 # 1 I	# GetPName
+	PACK_LSB_FIRST					= 0x0D01 # 1 I	# GetPName
+	PACK_ROW_LENGTH					= 0x0D02 # 1 I	# GetPName
+	PACK_SKIP_ROWS					= 0x0D03 # 1 I	# GetPName
+	PACK_SKIP_PIXELS				= 0x0D04 # 1 I	# GetPName
+	PACK_ALIGNMENT					= 0x0D05 # 1 I	# GetPName
+	MAX_TEXTURE_SIZE				= 0x0D33 # 1 I	# GetPName
+	MAX_VIEWPORT_DIMS				= 0x0D3A # 2 F	# GetPName
+	SUBPIXEL_BITS					= 0x0D50 # 1 I	# GetPName
+	TEXTURE_1D					= 0x0DE0 # 1 I	# GetPName
+	TEXTURE_2D					= 0x0DE1 # 1 I	# GetPName
+	POLYGON_OFFSET_UNITS				= 0x2A00 # 1 F	# GetPName
+	POLYGON_OFFSET_POINT				= 0x2A01 # 1 I	# GetPName
+	POLYGON_OFFSET_LINE				= 0x2A02 # 1 I	# GetPName
+	POLYGON_OFFSET_FILL				= 0x8037 # 1 I	# GetPName
+	POLYGON_OFFSET_FACTOR				= 0x8038 # 1 F	# GetPName
+	TEXTURE_BINDING_1D				= 0x8068 # 1 I	# GetPName
+	TEXTURE_BINDING_2D				= 0x8069 # 1 I	# GetPName
+passthru: /* GetTextureParameter */
+	TEXTURE_WIDTH					= 0x1000	# GetTextureParameter
+	TEXTURE_HEIGHT					= 0x1001	# GetTextureParameter
+	TEXTURE_INTERNAL_FORMAT				= 0x1003	# GetTextureParameter
+	TEXTURE_BORDER_COLOR				= 0x1004	# GetTextureParameter
+	TEXTURE_RED_SIZE				= 0x805C	# GetTextureParameter
+	TEXTURE_GREEN_SIZE				= 0x805D	# GetTextureParameter
+	TEXTURE_BLUE_SIZE				= 0x805E	# GetTextureParameter
+	TEXTURE_ALPHA_SIZE				= 0x805F	# GetTextureParameter
+passthru: /* HintMode */
+	DONT_CARE					= 0x1100	# HintMode
+	FASTEST						= 0x1101	# HintMode
+	NICEST						= 0x1102	# HintMode
+passthru: /* DataType */
+	BYTE						= 0x1400	# DataType
+	UNSIGNED_BYTE					= 0x1401	# DataType
+	SHORT						= 0x1402	# DataType
+	UNSIGNED_SHORT					= 0x1403	# DataType
+	INT						= 0x1404	# DataType
+	UNSIGNED_INT					= 0x1405	# DataType
+	FLOAT						= 0x1406	# DataType
+	DOUBLE						= 0x140A	# DataType
+passthru: /* LogicOp */
+	CLEAR						= 0x1500	# LogicOp
+	AND						= 0x1501	# LogicOp
+	AND_REVERSE					= 0x1502	# LogicOp
+	COPY						= 0x1503	# LogicOp
+	AND_INVERTED					= 0x1504	# LogicOp
+	NOOP						= 0x1505	# LogicOp
+	XOR						= 0x1506	# LogicOp
+	OR						= 0x1507	# LogicOp
+	NOR						= 0x1508	# LogicOp
+	EQUIV						= 0x1509	# LogicOp
+	INVERT						= 0x150A	# LogicOp
+	OR_REVERSE					= 0x150B	# LogicOp
+	COPY_INVERTED					= 0x150C	# LogicOp
+	OR_INVERTED					= 0x150D	# LogicOp
+	NAND						= 0x150E	# LogicOp
+	SET						= 0x150F	# LogicOp
+passthru: /* MatrixMode (for gl3.h, FBO attachment type) */
+	TEXTURE						= 0x1702	# MatrixMode
+passthru: /* PixelCopyType */
+	COLOR						= 0x1800	# PixelCopyType
+	DEPTH						= 0x1801	# PixelCopyType
+	STENCIL						= 0x1802	# PixelCopyType
+passthru: /* PixelFormat */
+	STENCIL_INDEX					= 0x1901	# PixelFormat
+	DEPTH_COMPONENT					= 0x1902	# PixelFormat
+	RED						= 0x1903	# PixelFormat
+	GREEN						= 0x1904	# PixelFormat
+	BLUE						= 0x1905	# PixelFormat
+	ALPHA						= 0x1906	# PixelFormat
+	RGB						= 0x1907	# PixelFormat
+	RGBA						= 0x1908	# PixelFormat
+passthru: /* PolygonMode */
+	POINT						= 0x1B00	# PolygonMode
+	LINE						= 0x1B01	# PolygonMode
+	FILL						= 0x1B02	# PolygonMode
+passthru: /* StencilOp */
+	KEEP						= 0x1E00	# StencilOp
+	REPLACE						= 0x1E01	# StencilOp
+	INCR						= 0x1E02	# StencilOp
+	DECR						= 0x1E03	# StencilOp
+passthru: /* StringName */
+	VENDOR						= 0x1F00	# StringName
+	RENDERER					= 0x1F01	# StringName
+	VERSION						= 0x1F02	# StringName
+	EXTENSIONS					= 0x1F03	# StringName
+passthru: /* TextureMagFilter */
+	NEAREST						= 0x2600	# TextureMagFilter
+	LINEAR						= 0x2601	# TextureMagFilter
+passthru: /* TextureMinFilter */
+	NEAREST_MIPMAP_NEAREST				= 0x2700	# TextureMinFilter
+	LINEAR_MIPMAP_NEAREST				= 0x2701	# TextureMinFilter
+	NEAREST_MIPMAP_LINEAR				= 0x2702	# TextureMinFilter
+	LINEAR_MIPMAP_LINEAR				= 0x2703	# TextureMinFilter
+passthru: /* TextureParameterName */
+	TEXTURE_MAG_FILTER				= 0x2800	# TextureParameterName
+	TEXTURE_MIN_FILTER				= 0x2801	# TextureParameterName
+	TEXTURE_WRAP_S					= 0x2802	# TextureParameterName
+	TEXTURE_WRAP_T					= 0x2803	# TextureParameterName
+passthru: /* TextureTarget */
+	PROXY_TEXTURE_1D				= 0x8063	# TextureTarget
+	PROXY_TEXTURE_2D				= 0x8064	# TextureTarget
+passthru: /* TextureWrapMode */
+	REPEAT						= 0x2901	# TextureWrapMode
+passthru: /* PixelInternalFormat */
+	R3_G3_B2					= 0x2A10	# PixelInternalFormat
+	RGB4						= 0x804F	# PixelInternalFormat
+	RGB5						= 0x8050	# PixelInternalFormat
+	RGB8						= 0x8051	# PixelInternalFormat
+	RGB10						= 0x8052	# PixelInternalFormat
+	RGB12						= 0x8053	# PixelInternalFormat
+	RGB16						= 0x8054	# PixelInternalFormat
+	RGBA2						= 0x8055	# PixelInternalFormat
+	RGBA4						= 0x8056	# PixelInternalFormat
+	RGB5_A1						= 0x8057	# PixelInternalFormat
+	RGBA8						= 0x8058	# PixelInternalFormat
+	RGB10_A2					= 0x8059	# PixelInternalFormat
+	RGBA12						= 0x805A	# PixelInternalFormat
+	RGBA16						= 0x805B	# PixelInternalFormat
+
+VERSION_1_1_DEPRECATED enum:
+passthru: /* AttribMask */
+	CURRENT_BIT					= 0x00000001	# AttribMask
+	POINT_BIT					= 0x00000002	# AttribMask
+	LINE_BIT					= 0x00000004	# AttribMask
+	POLYGON_BIT					= 0x00000008	# AttribMask
+	POLYGON_STIPPLE_BIT				= 0x00000010	# AttribMask
+	PIXEL_MODE_BIT					= 0x00000020	# AttribMask
+	LIGHTING_BIT					= 0x00000040	# AttribMask
+	FOG_BIT						= 0x00000080	# AttribMask
+	ACCUM_BUFFER_BIT				= 0x00000200	# AttribMask
+	VIEWPORT_BIT					= 0x00000800	# AttribMask
+	TRANSFORM_BIT					= 0x00001000	# AttribMask
+	ENABLE_BIT					= 0x00002000	# AttribMask
+	HINT_BIT					= 0x00008000	# AttribMask
+	EVAL_BIT					= 0x00010000	# AttribMask
+	LIST_BIT					= 0x00020000	# AttribMask
+	TEXTURE_BIT					= 0x00040000	# AttribMask
+	SCISSOR_BIT					= 0x00080000	# AttribMask
+	ALL_ATTRIB_BITS					= 0xFFFFFFFF	# AttribMask
+passthru: /* ClientAttribMask */
+	CLIENT_PIXEL_STORE_BIT				= 0x00000001	# ClientAttribMask
+	CLIENT_VERTEX_ARRAY_BIT				= 0x00000002	# ClientAttribMask
+	CLIENT_ALL_ATTRIB_BITS				= 0xFFFFFFFF	# ClientAttribMask
+passthru: /* BeginMode */
+	QUADS						= 0x0007	# BeginMode
+	QUAD_STRIP					= 0x0008	# BeginMode
+	POLYGON						= 0x0009	# BeginMode
+passthru: /* AccumOp */
+	ACCUM						= 0x0100	# AccumOp
+	LOAD						= 0x0101	# AccumOp
+	RETURN						= 0x0102	# AccumOp
+	MULT						= 0x0103	# AccumOp
+	ADD						= 0x0104	# AccumOp
+passthru: /* DrawBufferMode */
+	AUX0						= 0x0409	# DrawBufferMode
+	AUX1						= 0x040A	# DrawBufferMode
+	AUX2						= 0x040B	# DrawBufferMode
+	AUX3						= 0x040C	# DrawBufferMode
+passthru: /* ErrorCode */
+	STACK_OVERFLOW					= 0x0503	# ErrorCode
+	STACK_UNDERFLOW					= 0x0504	# ErrorCode
+passthru: /* FeedbackType */
+	2D						= 0x0600	# FeedbackType
+	3D						= 0x0601	# FeedbackType
+	3D_COLOR					= 0x0602	# FeedbackType
+	3D_COLOR_TEXTURE				= 0x0603	# FeedbackType
+	4D_COLOR_TEXTURE				= 0x0604	# FeedbackType
+passthru: /* FeedBackToken */
+	PASS_THROUGH_TOKEN				= 0x0700	# FeedBackToken
+	POINT_TOKEN					= 0x0701	# FeedBackToken
+	LINE_TOKEN					= 0x0702	# FeedBackToken
+	POLYGON_TOKEN					= 0x0703	# FeedBackToken
+	BITMAP_TOKEN					= 0x0704	# FeedBackToken
+	DRAW_PIXEL_TOKEN				= 0x0705	# FeedBackToken
+	COPY_PIXEL_TOKEN				= 0x0706	# FeedBackToken
+	LINE_RESET_TOKEN				= 0x0707	# FeedBackToken
+passthru: /* FogMode */
+	EXP						= 0x0800	# FogMode
+	EXP2						= 0x0801	# FogMode
+passthru: /* GetMapQuery */
+	COEFF						= 0x0A00	# GetMapQuery
+	ORDER						= 0x0A01	# GetMapQuery
+	DOMAIN						= 0x0A02	# GetMapQuery
+passthru: /* GetPixelMap */
+	PIXEL_MAP_I_TO_I				= 0x0C70	# GetPixelMap
+	PIXEL_MAP_S_TO_S				= 0x0C71	# GetPixelMap
+	PIXEL_MAP_I_TO_R				= 0x0C72	# GetPixelMap
+	PIXEL_MAP_I_TO_G				= 0x0C73	# GetPixelMap
+	PIXEL_MAP_I_TO_B				= 0x0C74	# GetPixelMap
+	PIXEL_MAP_I_TO_A				= 0x0C75	# GetPixelMap
+	PIXEL_MAP_R_TO_R				= 0x0C76	# GetPixelMap
+	PIXEL_MAP_G_TO_G				= 0x0C77	# GetPixelMap
+	PIXEL_MAP_B_TO_B				= 0x0C78	# GetPixelMap
+	PIXEL_MAP_A_TO_A				= 0x0C79	# GetPixelMap
+passthru: /* GetPointervPName */
+	VERTEX_ARRAY_POINTER				= 0x808E	# GetPointervPName
+	NORMAL_ARRAY_POINTER				= 0x808F	# GetPointervPName
+	COLOR_ARRAY_POINTER				= 0x8090	# GetPointervPName
+	INDEX_ARRAY_POINTER				= 0x8091	# GetPointervPName
+	TEXTURE_COORD_ARRAY_POINTER			= 0x8092	# GetPointervPName
+	EDGE_FLAG_ARRAY_POINTER				= 0x8093	# GetPointervPName
+	FEEDBACK_BUFFER_POINTER				= 0x0DF0	# GetPointervPName
+	SELECTION_BUFFER_POINTER			= 0x0DF3	# GetPointervPName
+passthru: /* GetPName */
+	CURRENT_COLOR					= 0x0B00 # 4 F	# GetPName
+	CURRENT_INDEX					= 0x0B01 # 1 F	# GetPName
+	CURRENT_NORMAL					= 0x0B02 # 3 F	# GetPName
+	CURRENT_TEXTURE_COORDS				= 0x0B03 # 4 F	# GetPName
+	CURRENT_RASTER_COLOR				= 0x0B04 # 4 F	# GetPName
+	CURRENT_RASTER_INDEX				= 0x0B05 # 1 F	# GetPName
+	CURRENT_RASTER_TEXTURE_COORDS			= 0x0B06 # 4 F	# GetPName
+	CURRENT_RASTER_POSITION				= 0x0B07 # 4 F	# GetPName
+	CURRENT_RASTER_POSITION_VALID			= 0x0B08 # 1 I	# GetPName
+	CURRENT_RASTER_DISTANCE				= 0x0B09 # 1 F	# GetPName
+	POINT_SMOOTH					= 0x0B10 # 1 I	# GetPName
+	LINE_STIPPLE					= 0x0B24 # 1 I	# GetPName
+	LINE_STIPPLE_PATTERN				= 0x0B25 # 1 I	# GetPName
+	LINE_STIPPLE_REPEAT				= 0x0B26 # 1 I	# GetPName
+	LIST_MODE					= 0x0B30 # 1 I	# GetPName
+	MAX_LIST_NESTING				= 0x0B31 # 1 I	# GetPName
+	LIST_BASE					= 0x0B32 # 1 I	# GetPName
+	LIST_INDEX					= 0x0B33 # 1 I	# GetPName
+	POLYGON_MODE					= 0x0B40 # 2 I	# GetPName
+	POLYGON_STIPPLE					= 0x0B42 # 1 I	# GetPName
+	EDGE_FLAG					= 0x0B43 # 1 I	# GetPName
+	LIGHTING					= 0x0B50 # 1 I	# GetPName
+	LIGHT_MODEL_LOCAL_VIEWER			= 0x0B51 # 1 I	# GetPName
+	LIGHT_MODEL_TWO_SIDE				= 0x0B52 # 1 I	# GetPName
+	LIGHT_MODEL_AMBIENT				= 0x0B53 # 4 F	# GetPName
+	SHADE_MODEL					= 0x0B54 # 1 I	# GetPName
+	COLOR_MATERIAL_FACE				= 0x0B55 # 1 I	# GetPName
+	COLOR_MATERIAL_PARAMETER			= 0x0B56 # 1 I	# GetPName
+	COLOR_MATERIAL					= 0x0B57 # 1 I	# GetPName
+	FOG						= 0x0B60 # 1 I	# GetPName
+	FOG_INDEX					= 0x0B61 # 1 I	# GetPName
+	FOG_DENSITY					= 0x0B62 # 1 F	# GetPName
+	FOG_START					= 0x0B63 # 1 F	# GetPName
+	FOG_END						= 0x0B64 # 1 F	# GetPName
+	FOG_MODE					= 0x0B65 # 1 I	# GetPName
+	FOG_COLOR					= 0x0B66 # 4 F	# GetPName
+	ACCUM_CLEAR_VALUE				= 0x0B80 # 4 F	# GetPName
+	MATRIX_MODE					= 0x0BA0 # 1 I	# GetPName
+	NORMALIZE					= 0x0BA1 # 1 I	# GetPName
+	MODELVIEW_STACK_DEPTH				= 0x0BA3 # 1 I	# GetPName
+	PROJECTION_STACK_DEPTH				= 0x0BA4 # 1 I	# GetPName
+	TEXTURE_STACK_DEPTH				= 0x0BA5 # 1 I	# GetPName
+	MODELVIEW_MATRIX				= 0x0BA6 # 16 F # GetPName
+	PROJECTION_MATRIX				= 0x0BA7 # 16 F # GetPName
+	TEXTURE_MATRIX					= 0x0BA8 # 16 F # GetPName
+	ATTRIB_STACK_DEPTH				= 0x0BB0 # 1 I	# GetPName
+	CLIENT_ATTRIB_STACK_DEPTH			= 0x0BB1 # 1 I	# GetPName
+	ALPHA_TEST					= 0x0BC0 # 1 I	# GetPName
+	ALPHA_TEST_FUNC					= 0x0BC1 # 1 I	# GetPName
+	ALPHA_TEST_REF					= 0x0BC2 # 1 F	# GetPName
+	INDEX_LOGIC_OP					= 0x0BF1 # 1 I	# GetPName
+	LOGIC_OP					= 0x0BF1 # 1 I	# GetPName
+	AUX_BUFFERS					= 0x0C00 # 1 I	# GetPName
+	INDEX_CLEAR_VALUE				= 0x0C20 # 1 I	# GetPName
+	INDEX_WRITEMASK					= 0x0C21 # 1 I	# GetPName
+	INDEX_MODE					= 0x0C30 # 1 I	# GetPName
+	RGBA_MODE					= 0x0C31 # 1 I	# GetPName
+	RENDER_MODE					= 0x0C40 # 1 I	# GetPName
+	PERSPECTIVE_CORRECTION_HINT			= 0x0C50 # 1 I	# GetPName
+	POINT_SMOOTH_HINT				= 0x0C51 # 1 I	# GetPName
+	FOG_HINT					= 0x0C54 # 1 I	# GetPName
+	TEXTURE_GEN_S					= 0x0C60 # 1 I	# GetPName
+	TEXTURE_GEN_T					= 0x0C61 # 1 I	# GetPName
+	TEXTURE_GEN_R					= 0x0C62 # 1 I	# GetPName
+	TEXTURE_GEN_Q					= 0x0C63 # 1 I	# GetPName
+	PIXEL_MAP_I_TO_I_SIZE				= 0x0CB0 # 1 I	# GetPName
+	PIXEL_MAP_S_TO_S_SIZE				= 0x0CB1 # 1 I	# GetPName
+	PIXEL_MAP_I_TO_R_SIZE				= 0x0CB2 # 1 I	# GetPName
+	PIXEL_MAP_I_TO_G_SIZE				= 0x0CB3 # 1 I	# GetPName
+	PIXEL_MAP_I_TO_B_SIZE				= 0x0CB4 # 1 I	# GetPName
+	PIXEL_MAP_I_TO_A_SIZE				= 0x0CB5 # 1 I	# GetPName
+	PIXEL_MAP_R_TO_R_SIZE				= 0x0CB6 # 1 I	# GetPName
+	PIXEL_MAP_G_TO_G_SIZE				= 0x0CB7 # 1 I	# GetPName
+	PIXEL_MAP_B_TO_B_SIZE				= 0x0CB8 # 1 I	# GetPName
+	PIXEL_MAP_A_TO_A_SIZE				= 0x0CB9 # 1 I	# GetPName
+	MAP_COLOR					= 0x0D10 # 1 I	# GetPName
+	MAP_STENCIL					= 0x0D11 # 1 I	# GetPName
+	INDEX_SHIFT					= 0x0D12 # 1 I	# GetPName
+	INDEX_OFFSET					= 0x0D13 # 1 I	# GetPName
+	RED_SCALE					= 0x0D14 # 1 F	# GetPName
+	RED_BIAS					= 0x0D15 # 1 F	# GetPName
+	ZOOM_X						= 0x0D16 # 1 F	# GetPName
+	ZOOM_Y						= 0x0D17 # 1 F	# GetPName
+	GREEN_SCALE					= 0x0D18 # 1 F	# GetPName
+	GREEN_BIAS					= 0x0D19 # 1 F	# GetPName
+	BLUE_SCALE					= 0x0D1A # 1 F	# GetPName
+	BLUE_BIAS					= 0x0D1B # 1 F	# GetPName
+	ALPHA_SCALE					= 0x0D1C # 1 F	# GetPName
+	ALPHA_BIAS					= 0x0D1D # 1 F	# GetPName
+	DEPTH_SCALE					= 0x0D1E # 1 F	# GetPName
+	DEPTH_BIAS					= 0x0D1F # 1 F	# GetPName
+	MAX_EVAL_ORDER					= 0x0D30 # 1 I	# GetPName
+	MAX_LIGHTS					= 0x0D31 # 1 I	# GetPName
+	MAX_CLIP_PLANES					= 0x0D32 # 1 I	# GetPName
+	MAX_PIXEL_MAP_TABLE				= 0x0D34 # 1 I	# GetPName
+	MAX_ATTRIB_STACK_DEPTH				= 0x0D35 # 1 I	# GetPName
+	MAX_MODELVIEW_STACK_DEPTH			= 0x0D36 # 1 I	# GetPName
+	MAX_NAME_STACK_DEPTH				= 0x0D37 # 1 I	# GetPName
+	MAX_PROJECTION_STACK_DEPTH			= 0x0D38 # 1 I	# GetPName
+	MAX_TEXTURE_STACK_DEPTH				= 0x0D39 # 1 I	# GetPName
+	MAX_CLIENT_ATTRIB_STACK_DEPTH			= 0x0D3B # 1 I	# GetPName
+	INDEX_BITS					= 0x0D51 # 1 I	# GetPName
+	RED_BITS					= 0x0D52 # 1 I	# GetPName
+	GREEN_BITS					= 0x0D53 # 1 I	# GetPName
+	BLUE_BITS					= 0x0D54 # 1 I	# GetPName
+	ALPHA_BITS					= 0x0D55 # 1 I	# GetPName
+	DEPTH_BITS					= 0x0D56 # 1 I	# GetPName
+	STENCIL_BITS					= 0x0D57 # 1 I	# GetPName
+	ACCUM_RED_BITS					= 0x0D58 # 1 I	# GetPName
+	ACCUM_GREEN_BITS				= 0x0D59 # 1 I	# GetPName
+	ACCUM_BLUE_BITS					= 0x0D5A # 1 I	# GetPName
+	ACCUM_ALPHA_BITS				= 0x0D5B # 1 I	# GetPName
+	NAME_STACK_DEPTH				= 0x0D70 # 1 I	# GetPName
+	AUTO_NORMAL					= 0x0D80 # 1 I	# GetPName
+	MAP1_COLOR_4					= 0x0D90 # 1 I	# GetPName
+	MAP1_INDEX					= 0x0D91 # 1 I	# GetPName
+	MAP1_NORMAL					= 0x0D92 # 1 I	# GetPName
+	MAP1_TEXTURE_COORD_1				= 0x0D93 # 1 I	# GetPName
+	MAP1_TEXTURE_COORD_2				= 0x0D94 # 1 I	# GetPName
+	MAP1_TEXTURE_COORD_3				= 0x0D95 # 1 I	# GetPName
+	MAP1_TEXTURE_COORD_4				= 0x0D96 # 1 I	# GetPName
+	MAP1_VERTEX_3					= 0x0D97 # 1 I	# GetPName
+	MAP1_VERTEX_4					= 0x0D98 # 1 I	# GetPName
+	MAP2_COLOR_4					= 0x0DB0 # 1 I	# GetPName
+	MAP2_INDEX					= 0x0DB1 # 1 I	# GetPName
+	MAP2_NORMAL					= 0x0DB2 # 1 I	# GetPName
+	MAP2_TEXTURE_COORD_1				= 0x0DB3 # 1 I	# GetPName
+	MAP2_TEXTURE_COORD_2				= 0x0DB4 # 1 I	# GetPName
+	MAP2_TEXTURE_COORD_3				= 0x0DB5 # 1 I	# GetPName
+	MAP2_TEXTURE_COORD_4				= 0x0DB6 # 1 I	# GetPName
+	MAP2_VERTEX_3					= 0x0DB7 # 1 I	# GetPName
+	MAP2_VERTEX_4					= 0x0DB8 # 1 I	# GetPName
+	MAP1_GRID_DOMAIN				= 0x0DD0 # 2 F	# GetPName
+	MAP1_GRID_SEGMENTS				= 0x0DD1 # 1 I	# GetPName
+	MAP2_GRID_DOMAIN				= 0x0DD2 # 4 F	# GetPName
+	MAP2_GRID_SEGMENTS				= 0x0DD3 # 2 I	# GetPName
+	FEEDBACK_BUFFER_SIZE				= 0x0DF1 # 1 I	# GetPName
+	FEEDBACK_BUFFER_TYPE				= 0x0DF2 # 1 I	# GetPName
+	SELECTION_BUFFER_SIZE				= 0x0DF4 # 1 I	# GetPName
+	VERTEX_ARRAY					= 0x8074 # 1 I	# GetPName
+	NORMAL_ARRAY					= 0x8075 # 1 I	# GetPName
+	COLOR_ARRAY					= 0x8076 # 1 I	# GetPName
+	INDEX_ARRAY					= 0x8077 # 1 I	# GetPName
+	TEXTURE_COORD_ARRAY				= 0x8078 # 1 I	# GetPName
+	EDGE_FLAG_ARRAY					= 0x8079 # 1 I	# GetPName
+	VERTEX_ARRAY_SIZE				= 0x807A # 1 I	# GetPName
+	VERTEX_ARRAY_TYPE				= 0x807B # 1 I	# GetPName
+	VERTEX_ARRAY_STRIDE				= 0x807C # 1 I	# GetPName
+	NORMAL_ARRAY_TYPE				= 0x807E # 1 I	# GetPName
+	NORMAL_ARRAY_STRIDE				= 0x807F # 1 I	# GetPName
+	COLOR_ARRAY_SIZE				= 0x8081 # 1 I	# GetPName
+	COLOR_ARRAY_TYPE				= 0x8082 # 1 I	# GetPName
+	COLOR_ARRAY_STRIDE				= 0x8083 # 1 I	# GetPName
+	INDEX_ARRAY_TYPE				= 0x8085 # 1 I	# GetPName
+	INDEX_ARRAY_STRIDE				= 0x8086 # 1 I	# GetPName
+	TEXTURE_COORD_ARRAY_SIZE			= 0x8088 # 1 I	# GetPName
+	TEXTURE_COORD_ARRAY_TYPE			= 0x8089 # 1 I	# GetPName
+	TEXTURE_COORD_ARRAY_STRIDE			= 0x808A # 1 I	# GetPName
+	EDGE_FLAG_ARRAY_STRIDE				= 0x808C # 1 I	# GetPName
+passthru: /* GetTextureParameter */
+	TEXTURE_COMPONENTS				= 0x1003	# GetTextureParameter
+	TEXTURE_BORDER					= 0x1005	# GetTextureParameter
+	TEXTURE_LUMINANCE_SIZE				= 0x8060	# GetTextureParameter
+	TEXTURE_INTENSITY_SIZE				= 0x8061	# GetTextureParameter
+	TEXTURE_PRIORITY				= 0x8066	# GetTextureParameter
+	TEXTURE_RESIDENT				= 0x8067	# GetTextureParameter
+passthru: /* LightParameter */
+	AMBIENT						= 0x1200	# LightParameter
+	DIFFUSE						= 0x1201	# LightParameter
+	SPECULAR					= 0x1202	# LightParameter
+	POSITION					= 0x1203	# LightParameter
+	SPOT_DIRECTION					= 0x1204	# LightParameter
+	SPOT_EXPONENT					= 0x1205	# LightParameter
+	SPOT_CUTOFF					= 0x1206	# LightParameter
+	CONSTANT_ATTENUATION				= 0x1207	# LightParameter
+	LINEAR_ATTENUATION				= 0x1208	# LightParameter
+	QUADRATIC_ATTENUATION				= 0x1209	# LightParameter
+passthru: /* ListMode */
+	COMPILE						= 0x1300	# ListMode
+	COMPILE_AND_EXECUTE				= 0x1301	# ListMode
+passthru: /* DataType */
+	2_BYTES						= 0x1407	# DataType
+	3_BYTES						= 0x1408	# DataType
+	4_BYTES						= 0x1409	# DataType
+passthru: /* MaterialParameter */
+	EMISSION					= 0x1600	# MaterialParameter
+	SHININESS					= 0x1601	# MaterialParameter
+	AMBIENT_AND_DIFFUSE				= 0x1602	# MaterialParameter
+	COLOR_INDEXES					= 0x1603	# MaterialParameter
+passthru: /* MatrixMode */
+	MODELVIEW					= 0x1700	# MatrixMode
+	PROJECTION					= 0x1701	# MatrixMode
+passthru: /* PixelFormat */
+	COLOR_INDEX					= 0x1900	# PixelFormat
+	LUMINANCE					= 0x1909	# PixelFormat
+	LUMINANCE_ALPHA					= 0x190A	# PixelFormat
+passthru: /* PixelType */
+	BITMAP						= 0x1A00	# PixelType
+passthru: /* RenderingMode */
+	RENDER						= 0x1C00	# RenderingMode
+	FEEDBACK					= 0x1C01	# RenderingMode
+	SELECT						= 0x1C02	# RenderingMode
+passthru: /* ShadingModel */
+	FLAT						= 0x1D00	# ShadingModel
+	SMOOTH						= 0x1D01	# ShadingModel
+passthru: /* TextureCoordName */
+	S						= 0x2000	# TextureCoordName
+	T						= 0x2001	# TextureCoordName
+	R						= 0x2002	# TextureCoordName
+	Q						= 0x2003	# TextureCoordName
+passthru: /* TextureEnvMode */
+	MODULATE					= 0x2100	# TextureEnvMode
+	DECAL						= 0x2101	# TextureEnvMode
+passthru: /* TextureEnvParameter */
+	TEXTURE_ENV_MODE				= 0x2200	# TextureEnvParameter
+	TEXTURE_ENV_COLOR				= 0x2201	# TextureEnvParameter
+passthru: /* TextureEnvTarget */
+	TEXTURE_ENV					= 0x2300	# TextureEnvTarget
+passthru: /* TextureGenMode */
+	EYE_LINEAR					= 0x2400	# TextureGenMode
+	OBJECT_LINEAR					= 0x2401	# TextureGenMode
+	SPHERE_MAP					= 0x2402	# TextureGenMode
+passthru: /* TextureGenParameter */
+	TEXTURE_GEN_MODE				= 0x2500	# TextureGenParameter
+	OBJECT_PLANE					= 0x2501	# TextureGenParameter
+	EYE_PLANE					= 0x2502	# TextureGenParameter
+passthru: /* TextureWrapMode */
+	CLAMP						= 0x2900	# TextureWrapMode
+passthru: /* PixelInternalFormat */
+	ALPHA4						= 0x803B	# PixelInternalFormat
+	ALPHA8						= 0x803C	# PixelInternalFormat
+	ALPHA12						= 0x803D	# PixelInternalFormat
+	ALPHA16						= 0x803E	# PixelInternalFormat
+	LUMINANCE4					= 0x803F	# PixelInternalFormat
+	LUMINANCE8					= 0x8040	# PixelInternalFormat
+	LUMINANCE12					= 0x8041	# PixelInternalFormat
+	LUMINANCE16					= 0x8042	# PixelInternalFormat
+	LUMINANCE4_ALPHA4				= 0x8043	# PixelInternalFormat
+	LUMINANCE6_ALPHA2				= 0x8044	# PixelInternalFormat
+	LUMINANCE8_ALPHA8				= 0x8045	# PixelInternalFormat
+	LUMINANCE12_ALPHA4				= 0x8046	# PixelInternalFormat
+	LUMINANCE12_ALPHA12				= 0x8047	# PixelInternalFormat
+	LUMINANCE16_ALPHA16				= 0x8048	# PixelInternalFormat
+	INTENSITY					= 0x8049	# PixelInternalFormat
+	INTENSITY4					= 0x804A	# PixelInternalFormat
+	INTENSITY8					= 0x804B	# PixelInternalFormat
+	INTENSITY12					= 0x804C	# PixelInternalFormat
+	INTENSITY16					= 0x804D	# PixelInternalFormat
+passthru: /* InterleavedArrayFormat */
+	V2F						= 0x2A20	# InterleavedArrayFormat
+	V3F						= 0x2A21	# InterleavedArrayFormat
+	C4UB_V2F					= 0x2A22	# InterleavedArrayFormat
+	C4UB_V3F					= 0x2A23	# InterleavedArrayFormat
+	C3F_V3F						= 0x2A24	# InterleavedArrayFormat
+	N3F_V3F						= 0x2A25	# InterleavedArrayFormat
+	C4F_N3F_V3F					= 0x2A26	# InterleavedArrayFormat
+	T2F_V3F						= 0x2A27	# InterleavedArrayFormat
+	T4F_V4F						= 0x2A28	# InterleavedArrayFormat
+	T2F_C4UB_V3F					= 0x2A29	# InterleavedArrayFormat
+	T2F_C3F_V3F					= 0x2A2A	# InterleavedArrayFormat
+	T2F_N3F_V3F					= 0x2A2B	# InterleavedArrayFormat
+	T2F_C4F_N3F_V3F					= 0x2A2C	# InterleavedArrayFormat
+	T4F_C4F_N3F_V4F					= 0x2A2D	# InterleavedArrayFormat
+passthru: /* ClipPlaneName */
+	CLIP_PLANE0					= 0x3000 # 1 I	# ClipPlaneName
+	CLIP_PLANE1					= 0x3001 # 1 I	# ClipPlaneName
+	CLIP_PLANE2					= 0x3002 # 1 I	# ClipPlaneName
+	CLIP_PLANE3					= 0x3003 # 1 I	# ClipPlaneName
+	CLIP_PLANE4					= 0x3004 # 1 I	# ClipPlaneName
+	CLIP_PLANE5					= 0x3005 # 1 I	# ClipPlaneName
+passthru: /* LightName */
+	LIGHT0						= 0x4000 # 1 I	# LightName
+	LIGHT1						= 0x4001 # 1 I	# LightName
+	LIGHT2						= 0x4002 # 1 I	# LightName
+	LIGHT3						= 0x4003 # 1 I	# LightName
+	LIGHT4						= 0x4004 # 1 I	# LightName
+	LIGHT5						= 0x4005 # 1 I	# LightName
+	LIGHT6						= 0x4006 # 1 I	# LightName
+	LIGHT7						= 0x4007 # 1 I	# LightName
+
+
 ###############################################################################
 #
 # OpenGL 1.2 enums
@@ -33,7 +628,6 @@
 	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
@@ -60,16 +654,19 @@
 	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
 
+VERSION_1_2_DEPRECATED enum:
+	RESCALE_NORMAL					= 0x803A # 1 I # Equivalent to EXT_rescale_normal
+	LIGHT_MODEL_COLOR_CONTROL			= 0x81F8 # 1 I
+	SINGLE_COLOR					= 0x81F9
+	SEPARATE_SPECULAR_COLOR				= 0x81FA
+	ALIASED_POINT_SIZE_RANGE			= 0x846D # 2 F
+
 ARB_imaging enum:
 	CONSTANT_COLOR					= 0x8001 # Equivalent to EXT_blend_color
 	ONE_MINUS_CONSTANT_COLOR			= 0x8002
@@ -82,6 +679,8 @@
 	BLEND_EQUATION					= 0x8009 # 1 I
 	FUNC_SUBTRACT					= 0x800A # Equivalent to EXT_blend_subtract
 	FUNC_REVERSE_SUBTRACT				= 0x800B
+
+ARB_imaging_DEPRECATED enum:
 	CONVOLUTION_1D					= 0x8010 # 1 I # Equivalent to EXT_convolution
 	CONVOLUTION_2D					= 0x8011 # 1 I
 	SEPARABLE_2D					= 0x8012 # 1 I
@@ -188,12 +787,6 @@
 	TEXTURE30					= 0x84DE
 	TEXTURE31					= 0x84DF
 	ACTIVE_TEXTURE					= 0x84E0 # 1 I
-	CLIENT_ACTIVE_TEXTURE				= 0x84E1 # 1 I
-	MAX_TEXTURE_UNITS				= 0x84E2 # 1 I
-	TRANSPOSE_MODELVIEW_MATRIX			= 0x84E3 # 16 F # Promoted from ARB_transpose_matrix
-	TRANSPOSE_PROJECTION_MATRIX			= 0x84E4 # 16 F
-	TRANSPOSE_TEXTURE_MATRIX			= 0x84E5 # 16 F
-	TRANSPOSE_COLOR_MATRIX				= 0x84E6 # 16 F
 	MULTISAMPLE					= 0x809D	# Promoted from ARB_multisample
 	SAMPLE_ALPHA_TO_COVERAGE			= 0x809E
 	SAMPLE_ALPHA_TO_ONE				= 0x809F
@@ -202,9 +795,6 @@
 	SAMPLES						= 0x80A9
 	SAMPLE_COVERAGE_VALUE				= 0x80AA
 	SAMPLE_COVERAGE_INVERT				= 0x80AB
-	MULTISAMPLE_BIT					= 0x20000000
-	NORMAL_MAP					= 0x8511	# Promoted from ARB_texture_cube_map
-	REFLECTION_MAP					= 0x8512
 	TEXTURE_CUBE_MAP				= 0x8513
 	TEXTURE_BINDING_CUBE_MAP			= 0x8514
 	TEXTURE_CUBE_MAP_POSITIVE_X			= 0x8515
@@ -215,10 +805,6 @@
 	TEXTURE_CUBE_MAP_NEGATIVE_Z			= 0x851A
 	PROXY_TEXTURE_CUBE_MAP				= 0x851B
 	MAX_CUBE_MAP_TEXTURE_SIZE			= 0x851C
-	COMPRESSED_ALPHA				= 0x84E9	# Promoted from ARB_texture_compression
-	COMPRESSED_LUMINANCE				= 0x84EA
-	COMPRESSED_LUMINANCE_ALPHA			= 0x84EB
-	COMPRESSED_INTENSITY				= 0x84EC
 	COMPRESSED_RGB					= 0x84ED
 	COMPRESSED_RGBA					= 0x84EE
 	TEXTURE_COMPRESSION_HINT			= 0x84EF
@@ -227,6 +813,21 @@
 	NUM_COMPRESSED_TEXTURE_FORMATS			= 0x86A2
 	COMPRESSED_TEXTURE_FORMATS			= 0x86A3
 	CLAMP_TO_BORDER					= 0x812D	# Promoted from ARB_texture_border_clamp
+
+VERSION_1_3_DEPRECATED enum:
+	CLIENT_ACTIVE_TEXTURE				= 0x84E1 # 1 I
+	MAX_TEXTURE_UNITS				= 0x84E2 # 1 I
+	TRANSPOSE_MODELVIEW_MATRIX			= 0x84E3 # 16 F # Promoted from ARB_transpose_matrix
+	TRANSPOSE_PROJECTION_MATRIX			= 0x84E4 # 16 F
+	TRANSPOSE_TEXTURE_MATRIX			= 0x84E5 # 16 F
+	TRANSPOSE_COLOR_MATRIX				= 0x84E6 # 16 F
+	MULTISAMPLE_BIT					= 0x20000000
+	NORMAL_MAP					= 0x8511	# Promoted from ARB_texture_cube_map
+	REFLECTION_MAP					= 0x8512
+	COMPRESSED_ALPHA				= 0x84E9	# Promoted from ARB_texture_compression
+	COMPRESSED_LUMINANCE				= 0x84EA
+	COMPRESSED_LUMINANCE_ALPHA			= 0x84EB
+	COMPRESSED_INTENSITY				= 0x84EC
 	COMBINE						= 0x8570	# Promoted from ARB_texture_env_combine
 	COMBINE_RGB					= 0x8571
 	COMBINE_ALPHA					= 0x8572
@@ -264,16 +865,25 @@
 	BLEND_SRC_RGB					= 0x80C9
 	BLEND_DST_ALPHA					= 0x80CA
 	BLEND_SRC_ALPHA					= 0x80CB
+	POINT_FADE_THRESHOLD_SIZE			= 0x8128 # 1 F
+	DEPTH_COMPONENT16				= 0x81A5
+	DEPTH_COMPONENT24				= 0x81A6
+	DEPTH_COMPONENT32				= 0x81A7
+	MIRRORED_REPEAT					= 0x8370
+	MAX_TEXTURE_LOD_BIAS				= 0x84FD
+	TEXTURE_LOD_BIAS				= 0x8501
+	INCR_WRAP					= 0x8507
+	DECR_WRAP					= 0x8508
+	TEXTURE_DEPTH_SIZE				= 0x884A
+	TEXTURE_COMPARE_MODE				= 0x884C
+	TEXTURE_COMPARE_FUNC				= 0x884D
+
+VERSION_1_4_DEPRECATED enum:
 	POINT_SIZE_MIN					= 0x8126 # 1 F
 	POINT_SIZE_MAX					= 0x8127 # 1 F
-	POINT_FADE_THRESHOLD_SIZE			= 0x8128 # 1 F
 	POINT_DISTANCE_ATTENUATION			= 0x8129 # 3 F
 	GENERATE_MIPMAP					= 0x8191
 	GENERATE_MIPMAP_HINT				= 0x8192 # 1 I
-	DEPTH_COMPONENT16				= 0x81A5
-	DEPTH_COMPONENT24				= 0x81A6
-	DEPTH_COMPONENT32				= 0x81A7
-	MIRRORED_REPEAT					= 0x8370
 	FOG_COORDINATE_SOURCE				= 0x8450 # 1 I
 	FOG_COORDINATE					= 0x8451
 	FRAGMENT_DEPTH					= 0x8452
@@ -289,15 +899,8 @@
 	SECONDARY_COLOR_ARRAY_STRIDE			= 0x845C # 1 I
 	SECONDARY_COLOR_ARRAY_POINTER			= 0x845D
 	SECONDARY_COLOR_ARRAY				= 0x845E # 1 I
-	MAX_TEXTURE_LOD_BIAS				= 0x84FD
 	TEXTURE_FILTER_CONTROL				= 0x8500
-	TEXTURE_LOD_BIAS				= 0x8501
-	INCR_WRAP					= 0x8507
-	DECR_WRAP					= 0x8508
-	TEXTURE_DEPTH_SIZE				= 0x884A
 	DEPTH_TEXTURE_MODE				= 0x884B
-	TEXTURE_COMPARE_MODE				= 0x884C
-	TEXTURE_COMPARE_FUNC				= 0x884D
 	COMPARE_R_TO_TEXTURE				= 0x884E
 
 
@@ -318,15 +921,6 @@
 	ELEMENT_ARRAY_BUFFER				= 0x8893 # ARB_vertex_buffer_object
 	ARRAY_BUFFER_BINDING				= 0x8894 # ARB_vertex_buffer_object
 	ELEMENT_ARRAY_BUFFER_BINDING			= 0x8895 # ARB_vertex_buffer_object
-	VERTEX_ARRAY_BUFFER_BINDING			= 0x8896 # ARB_vertex_buffer_object
-	NORMAL_ARRAY_BUFFER_BINDING			= 0x8897 # ARB_vertex_buffer_object
-	COLOR_ARRAY_BUFFER_BINDING			= 0x8898 # ARB_vertex_buffer_object
-	INDEX_ARRAY_BUFFER_BINDING			= 0x8899 # ARB_vertex_buffer_object
-	TEXTURE_COORD_ARRAY_BUFFER_BINDING		= 0x889A # ARB_vertex_buffer_object
-	EDGE_FLAG_ARRAY_BUFFER_BINDING			= 0x889B # ARB_vertex_buffer_object
-	SECONDARY_COLOR_ARRAY_BUFFER_BINDING		= 0x889C # ARB_vertex_buffer_object
-	FOG_COORDINATE_ARRAY_BUFFER_BINDING		= 0x889D # ARB_vertex_buffer_object
-	WEIGHT_ARRAY_BUFFER_BINDING			= 0x889E # ARB_vertex_buffer_object
 	VERTEX_ATTRIB_ARRAY_BUFFER_BINDING		= 0x889F # ARB_vertex_buffer_object
 	READ_ONLY					= 0x88B8 # ARB_vertex_buffer_object
 	WRITE_ONLY					= 0x88B9 # ARB_vertex_buffer_object
@@ -344,23 +938,33 @@
 	DYNAMIC_READ					= 0x88E9 # ARB_vertex_buffer_object
 	DYNAMIC_COPY					= 0x88EA # ARB_vertex_buffer_object
 	SAMPLES_PASSED					= 0x8914 # ARB_occlusion_query
+
+VERSION_1_5_DEPRECATED enum:
+	VERTEX_ARRAY_BUFFER_BINDING			= 0x8896 # ARB_vertex_buffer_object
+	NORMAL_ARRAY_BUFFER_BINDING			= 0x8897 # ARB_vertex_buffer_object
+	COLOR_ARRAY_BUFFER_BINDING			= 0x8898 # ARB_vertex_buffer_object
+	INDEX_ARRAY_BUFFER_BINDING			= 0x8899 # ARB_vertex_buffer_object
+	TEXTURE_COORD_ARRAY_BUFFER_BINDING		= 0x889A # ARB_vertex_buffer_object
+	EDGE_FLAG_ARRAY_BUFFER_BINDING			= 0x889B # ARB_vertex_buffer_object
+	SECONDARY_COLOR_ARRAY_BUFFER_BINDING		= 0x889C # ARB_vertex_buffer_object
+	FOG_COORDINATE_ARRAY_BUFFER_BINDING		= 0x889D # ARB_vertex_buffer_object
+	WEIGHT_ARRAY_BUFFER_BINDING			= 0x889E # ARB_vertex_buffer_object
+	FOG_COORD_SRC					= 0x8450    # alias GL_FOG_COORDINATE_SOURCE
+	FOG_COORD					= 0x8451    # alias GL_FOG_COORDINATE
+	CURRENT_FOG_COORD				= 0x8453    # alias GL_CURRENT_FOG_COORDINATE
+	FOG_COORD_ARRAY_TYPE				= 0x8454    # alias GL_FOG_COORDINATE_ARRAY_TYPE
+	FOG_COORD_ARRAY_STRIDE				= 0x8455    # alias GL_FOG_COORDINATE_ARRAY_STRIDE
+	FOG_COORD_ARRAY_POINTER				= 0x8456    # alias GL_FOG_COORDINATE_ARRAY_POINTER
+	FOG_COORD_ARRAY					= 0x8457    # alias GL_FOG_COORDINATE_ARRAY
+	FOG_COORD_ARRAY_BUFFER_BINDING			= 0x889D    # alias GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
 # New naming scheme
-	FOG_COORD_SRC					= GL_FOG_COORDINATE_SOURCE
-	FOG_COORD					= GL_FOG_COORDINATE
-	CURRENT_FOG_COORD				= GL_CURRENT_FOG_COORDINATE
-	FOG_COORD_ARRAY_TYPE				= GL_FOG_COORDINATE_ARRAY_TYPE
-	FOG_COORD_ARRAY_STRIDE				= GL_FOG_COORDINATE_ARRAY_STRIDE
-	FOG_COORD_ARRAY_POINTER				= GL_FOG_COORDINATE_ARRAY_POINTER
-	FOG_COORD_ARRAY					= GL_FOG_COORDINATE_ARRAY
-	FOG_COORD_ARRAY_BUFFER_BINDING			= GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-	SRC0_RGB					= GL_SOURCE0_RGB
-	SRC1_RGB					= GL_SOURCE1_RGB
-	SRC2_RGB					= GL_SOURCE2_RGB
-	SRC0_ALPHA					= GL_SOURCE0_ALPHA
-	SRC1_ALPHA					= GL_SOURCE1_ALPHA
-	SRC2_ALPHA					= GL_SOURCE2_ALPHA
+	SRC0_RGB					= 0x8580    # alias GL_SOURCE0_RGB
+	SRC1_RGB					= 0x8581    # alias GL_SOURCE1_RGB
+	SRC2_RGB					= 0x8582    # alias GL_SOURCE2_RGB
+	SRC0_ALPHA					= 0x8588    # alias GL_SOURCE0_ALPHA
+	SRC1_ALPHA					= 0x8589    # alias GL_SOURCE1_ALPHA
+	SRC2_ALPHA					= 0x858A    # alias GL_SOURCE2_ALPHA
 
-
 ###############################################################################
 #
 # OpenGL 2.0 enums
@@ -368,14 +972,13 @@
 ###############################################################################
 
 VERSION_2_0 enum:
-	BLEND_EQUATION_RGB				= GL_BLEND_EQUATION # EXT_blend_equation_separate
+	BLEND_EQUATION_RGB				= 0x8009    # EXT_blend_equation_separate   # alias GL_BLEND_EQUATION
 	VERTEX_ATTRIB_ARRAY_ENABLED			= 0x8622    # ARB_vertex_shader
 	VERTEX_ATTRIB_ARRAY_SIZE			= 0x8623    # ARB_vertex_shader
 	VERTEX_ATTRIB_ARRAY_STRIDE			= 0x8624    # ARB_vertex_shader
 	VERTEX_ATTRIB_ARRAY_TYPE			= 0x8625    # ARB_vertex_shader
 	CURRENT_VERTEX_ATTRIB				= 0x8626    # ARB_vertex_shader
 	VERTEX_PROGRAM_POINT_SIZE			= 0x8642    # ARB_vertex_shader
-	VERTEX_PROGRAM_TWO_SIDE				= 0x8643    # ARB_vertex_shader
 	VERTEX_ATTRIB_ARRAY_POINTER			= 0x8645    # ARB_vertex_shader
 	STENCIL_BACK_FUNC				= 0x8800    # ARB_stencil_two_side
 	STENCIL_BACK_FAIL				= 0x8801    # ARB_stencil_two_side
@@ -399,11 +1002,8 @@
 	DRAW_BUFFER14					= 0x8833    # ARB_draw_buffers
 	DRAW_BUFFER15					= 0x8834    # ARB_draw_buffers
 	BLEND_EQUATION_ALPHA				= 0x883D    # EXT_blend_equation_separate
-	POINT_SPRITE					= 0x8861    # ARB_point_sprite
-	COORD_REPLACE					= 0x8862    # ARB_point_sprite
 	MAX_VERTEX_ATTRIBS				= 0x8869    # ARB_vertex_shader
 	VERTEX_ATTRIB_ARRAY_NORMALIZED			= 0x886A    # ARB_vertex_shader
-	MAX_TEXTURE_COORDS				= 0x8871    # ARB_vertex_shader, ARB_fragment_shader
 	MAX_TEXTURE_IMAGE_UNITS				= 0x8872    # ARB_vertex_shader, ARB_fragment_shader
 	FRAGMENT_SHADER					= 0x8B30    # ARB_fragment_shader
 	VERTEX_SHADER					= 0x8B31    # ARB_vertex_shader
@@ -453,6 +1053,13 @@
 	STENCIL_BACK_VALUE_MASK				= 0x8CA4    # ARB_stencil_two_side
 	STENCIL_BACK_WRITEMASK				= 0x8CA5    # ARB_stencil_two_side
 
+VERSION_2_0_DEPRECATED enum:
+	VERTEX_PROGRAM_TWO_SIDE				= 0x8643    # ARB_vertex_shader
+	POINT_SPRITE					= 0x8861    # ARB_point_sprite
+	COORD_REPLACE					= 0x8862    # ARB_point_sprite
+	MAX_TEXTURE_COORDS				= 0x8871    # ARB_vertex_shader, ARB_fragment_shader
+
+
 ###############################################################################
 #
 # OpenGL 2.1 enums
@@ -460,7 +1067,6 @@
 ###############################################################################
 
 VERSION_2_1 enum:
-	CURRENT_RASTER_SECONDARY_COLOR			= 0x845F    # New for 2.1
 	PIXEL_PACK_BUFFER				= 0x88EB    # ARB_pixel_buffer_object
 	PIXEL_UNPACK_BUFFER				= 0x88EC    # ARB_pixel_buffer_object
 	PIXEL_PACK_BUFFER_BINDING			= 0x88ED    # ARB_pixel_buffer_object
@@ -475,12 +1081,15 @@
 	SRGB8						= 0x8C41    # EXT_texture_sRGB
 	SRGB_ALPHA					= 0x8C42    # EXT_texture_sRGB
 	SRGB8_ALPHA8					= 0x8C43    # EXT_texture_sRGB
+	COMPRESSED_SRGB					= 0x8C48    # EXT_texture_sRGB
+	COMPRESSED_SRGB_ALPHA				= 0x8C49    # EXT_texture_sRGB
+
+VERSION_2_1_DEPRECATED enum:
+	CURRENT_RASTER_SECONDARY_COLOR			= 0x845F    # New for 2.1
 	SLUMINANCE_ALPHA				= 0x8C44    # EXT_texture_sRGB
 	SLUMINANCE8_ALPHA8				= 0x8C45    # EXT_texture_sRGB
 	SLUMINANCE					= 0x8C46    # EXT_texture_sRGB
 	SLUMINANCE8					= 0x8C47    # EXT_texture_sRGB
-	COMPRESSED_SRGB					= 0x8C48    # EXT_texture_sRGB
-	COMPRESSED_SRGB_ALPHA				= 0x8C49    # EXT_texture_sRGB
 	COMPRESSED_SLUMINANCE				= 0x8C4A    # EXT_texture_sRGB
 	COMPRESSED_SLUMINANCE_ALPHA			= 0x8C4B    # EXT_texture_sRGB
 
@@ -492,14 +1101,16 @@
 ###############################################################################
 
 VERSION_3_0 enum:
-	COMPARE_REF_TO_TEXTURE				= GL_COMPARE_R_TO_TEXTURE_ARB
-	CLIP_DISTANCE0					= GL_CLIP_PLANE0
-	CLIP_DISTANCE1					= GL_CLIP_PLANE1
-	CLIP_DISTANCE2					= GL_CLIP_PLANE2
-	CLIP_DISTANCE3					= GL_CLIP_PLANE3
-	CLIP_DISTANCE4					= GL_CLIP_PLANE4
-	CLIP_DISTANCE5					= GL_CLIP_PLANE5
-	MAX_CLIP_DISTANCES				= GL_MAX_CLIP_PLANES
+	COMPARE_REF_TO_TEXTURE				= 0x884E    # alias GL_COMPARE_R_TO_TEXTURE_ARB
+	CLIP_DISTANCE0					= 0x3000    # alias GL_CLIP_PLANE0
+	CLIP_DISTANCE1					= 0x3001    # alias GL_CLIP_PLANE1
+	CLIP_DISTANCE2					= 0x3002    # alias GL_CLIP_PLANE2
+	CLIP_DISTANCE3					= 0x3003    # alias GL_CLIP_PLANE3
+	CLIP_DISTANCE4					= 0x3004    # alias GL_CLIP_PLANE4
+	CLIP_DISTANCE5					= 0x3005    # alias GL_CLIP_PLANE5
+	CLIP_DISTANCE6					= 0x3006
+	CLIP_DISTANCE7					= 0x3007
+	MAX_CLIP_DISTANCES				= 0x0D32    # alias GL_MAX_CLIP_PLANES
 	MAJOR_VERSION					= 0x821B
 	MINOR_VERSION					= 0x821C
 	NUM_EXTENSIONS					= 0x821D
@@ -517,19 +1128,9 @@
 	MAX_ARRAY_TEXTURE_LAYERS			= 0x88FF
 	MIN_PROGRAM_TEXEL_OFFSET			= 0x8904
 	MAX_PROGRAM_TEXEL_OFFSET			= 0x8905
-	CLAMP_VERTEX_COLOR				= 0x891A
-	CLAMP_FRAGMENT_COLOR				= 0x891B
 	CLAMP_READ_COLOR				= 0x891C
 	FIXED_ONLY					= 0x891D
-	MAX_VARYING_COMPONENTS				= GL_MAX_VARYING_FLOATS
-	TEXTURE_RED_TYPE				= 0x8C10
-	TEXTURE_GREEN_TYPE				= 0x8C11
-	TEXTURE_BLUE_TYPE				= 0x8C12
-	TEXTURE_ALPHA_TYPE				= 0x8C13
-	TEXTURE_LUMINANCE_TYPE				= 0x8C14
-	TEXTURE_INTENSITY_TYPE				= 0x8C15
-	TEXTURE_DEPTH_TYPE				= 0x8C16
-	UNSIGNED_NORMALIZED				= 0x8C17
+	MAX_VARYING_COMPONENTS				= 0x8B4B    # alias GL_MAX_VARYING_FLOATS
 	TEXTURE_1D_ARRAY				= 0x8C18
 	PROXY_TEXTURE_1D_ARRAY				= 0x8C19
 	TEXTURE_2D_ARRAY				= 0x8C1A
@@ -571,7 +1172,6 @@
 	RED_INTEGER					= 0x8D94
 	GREEN_INTEGER					= 0x8D95
 	BLUE_INTEGER					= 0x8D96
-	ALPHA_INTEGER					= 0x8D97
 	RGB_INTEGER					= 0x8D98
 	RGBA_INTEGER					= 0x8D99
 	BGR_INTEGER					= 0x8D9A
@@ -600,6 +1200,9 @@
 	QUERY_NO_WAIT					= 0x8E14
 	QUERY_BY_REGION_WAIT				= 0x8E15
 	QUERY_BY_REGION_NO_WAIT				= 0x8E16
+	BUFFER_ACCESS_FLAGS				= 0x911F
+	BUFFER_MAP_LENGTH				= 0x9120
+	BUFFER_MAP_OFFSET				= 0x9121
 passthru: /* Reuse tokens from ARB_depth_buffer_float */
 	use ARB_depth_buffer_float	    DEPTH_COMPONENT32F
 	use ARB_depth_buffer_float	    DEPTH32F_STENCIL8
@@ -627,8 +1230,6 @@
 	use ARB_framebuffer_object	    TEXTURE_GREEN_TYPE
 	use ARB_framebuffer_object	    TEXTURE_BLUE_TYPE
 	use ARB_framebuffer_object	    TEXTURE_ALPHA_TYPE
-	use ARB_framebuffer_object	    TEXTURE_LUMINANCE_TYPE
-	use ARB_framebuffer_object	    TEXTURE_INTENSITY_TYPE
 	use ARB_framebuffer_object	    TEXTURE_DEPTH_TYPE
 	use ARB_framebuffer_object	    UNSIGNED_NORMALIZED
 	use ARB_framebuffer_object	    FRAMEBUFFER_BINDING
@@ -727,9 +1328,175 @@
 passthru: /* Reuse tokens from ARB_vertex_array_object */
 	use ARB_vertex_array_object	    VERTEX_ARRAY_BINDING
 
+VERSION_3_0_DEPRECATED enum:
+	CLAMP_VERTEX_COLOR				= 0x891A
+	CLAMP_FRAGMENT_COLOR				= 0x891B
+	ALPHA_INTEGER					= 0x8D97
+passthru: /* Reuse tokens from ARB_framebuffer_object */
+	use ARB_framebuffer_object	    TEXTURE_LUMINANCE_TYPE
+	use ARB_framebuffer_object	    TEXTURE_INTENSITY_TYPE
 
+
 ###############################################################################
 #
+# OpenGL 3.1 enums
+#
+###############################################################################
+
+VERSION_3_1 enum:
+	SAMPLER_2D_RECT					= 0x8B63    # ARB_shader_objects + ARB_texture_rectangle
+	SAMPLER_2D_RECT_SHADOW				= 0x8B64    # ARB_shader_objects + ARB_texture_rectangle
+	SAMPLER_BUFFER					= 0x8DC2    # EXT_gpu_shader4 + ARB_texture_buffer_object
+	INT_SAMPLER_2D_RECT				= 0x8DCD    # EXT_gpu_shader4 + ARB_texture_rectangle
+	INT_SAMPLER_BUFFER				= 0x8DD0    # EXT_gpu_shader4 + ARB_texture_buffer_object
+	UNSIGNED_INT_SAMPLER_2D_RECT			= 0x8DD5    # EXT_gpu_shader4 + ARB_texture_rectangle
+	UNSIGNED_INT_SAMPLER_BUFFER			= 0x8DD8    # EXT_gpu_shader4 + ARB_texture_buffer_object
+	TEXTURE_BUFFER					= 0x8C2A    # ARB_texture_buffer_object
+	MAX_TEXTURE_BUFFER_SIZE				= 0x8C2B    # ARB_texture_buffer_object
+	TEXTURE_BINDING_BUFFER				= 0x8C2C    # ARB_texture_buffer_object
+	TEXTURE_BUFFER_DATA_STORE_BINDING		= 0x8C2D    # ARB_texture_buffer_object
+	TEXTURE_BUFFER_FORMAT				= 0x8C2E    # ARB_texture_buffer_object
+	TEXTURE_RECTANGLE				= 0x84F5    # ARB_texture_rectangle
+	TEXTURE_BINDING_RECTANGLE			= 0x84F6    # ARB_texture_rectangle
+	PROXY_TEXTURE_RECTANGLE				= 0x84F7    # ARB_texture_rectangle
+	MAX_RECTANGLE_TEXTURE_SIZE			= 0x84F8    # ARB_texture_rectangle
+	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    # 3.1 (different from NV_primitive_restart)
+	PRIMITIVE_RESTART_INDEX				= 0x8F9E    # 3.1 (different from NV_primitive_restart)
+passthru: /* Reuse tokens from ARB_copy_buffer */
+	use ARB_copy_buffer		    COPY_READ_BUFFER
+	use ARB_copy_buffer		    COPY_WRITE_BUFFER
+passthru: /* Would reuse tokens from ARB_draw_instanced, but it has none */
+passthru: /* Reuse tokens from ARB_uniform_buffer_object */
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER_BINDING
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER_START
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER_SIZE
+	use ARB_uniform_buffer_object	    MAX_VERTEX_UNIFORM_BLOCKS
+	use ARB_uniform_buffer_object	    MAX_FRAGMENT_UNIFORM_BLOCKS
+	use ARB_uniform_buffer_object	    MAX_COMBINED_UNIFORM_BLOCKS
+	use ARB_uniform_buffer_object	    MAX_UNIFORM_BUFFER_BINDINGS
+	use ARB_uniform_buffer_object	    MAX_UNIFORM_BLOCK_SIZE
+	use ARB_uniform_buffer_object	    MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS
+	use ARB_uniform_buffer_object	    MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS
+	use ARB_uniform_buffer_object	    UNIFORM_BUFFER_OFFSET_ALIGNMENT
+	use ARB_uniform_buffer_object	    ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH
+	use ARB_uniform_buffer_object	    ACTIVE_UNIFORM_BLOCKS
+	use ARB_uniform_buffer_object	    UNIFORM_TYPE
+	use ARB_uniform_buffer_object	    UNIFORM_SIZE
+	use ARB_uniform_buffer_object	    UNIFORM_NAME_LENGTH
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_INDEX
+	use ARB_uniform_buffer_object	    UNIFORM_OFFSET
+	use ARB_uniform_buffer_object	    UNIFORM_ARRAY_STRIDE
+	use ARB_uniform_buffer_object	    UNIFORM_MATRIX_STRIDE
+	use ARB_uniform_buffer_object	    UNIFORM_IS_ROW_MAJOR
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_BINDING
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_DATA_SIZE
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_NAME_LENGTH
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_ACTIVE_UNIFORMS
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER
+	use ARB_uniform_buffer_object	    UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER
+	use ARB_uniform_buffer_object	    INVALID_INDEX
+
+
+###############################################################################
+#
+# OpenGL 3.2 enums
+#
+###############################################################################
+
+VERSION_3_2 enum:
+	CONTEXT_CORE_PROFILE_BIT			= 0x00000001
+	CONTEXT_COMPATIBILITY_PROFILE_BIT		= 0x00000002
+	LINES_ADJACENCY					= 0x000A
+	LINE_STRIP_ADJACENCY				= 0x000B
+	TRIANGLES_ADJACENCY				= 0x000C
+	TRIANGLE_STRIP_ADJACENCY			= 0x000D
+	PROGRAM_POINT_SIZE				= 0x8642
+	MAX_GEOMETRY_TEXTURE_IMAGE_UNITS		= 0x8C29
+	FRAMEBUFFER_ATTACHMENT_LAYERED			= 0x8DA7
+	FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS		= 0x8DA8
+	GEOMETRY_SHADER					= 0x8DD9
+	GEOMETRY_VERTICES_OUT				= 0x8916
+	GEOMETRY_INPUT_TYPE				= 0x8917
+	GEOMETRY_OUTPUT_TYPE				= 0x8918
+	MAX_GEOMETRY_UNIFORM_COMPONENTS			= 0x8DDF
+	MAX_GEOMETRY_OUTPUT_VERTICES			= 0x8DE0
+	MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS		= 0x8DE1
+	MAX_VERTEX_OUTPUT_COMPONENTS			= 0x9122
+	MAX_GEOMETRY_INPUT_COMPONENTS			= 0x9123
+	MAX_GEOMETRY_OUTPUT_COMPONENTS			= 0x9124
+	MAX_FRAGMENT_INPUT_COMPONENTS			= 0x9125
+	CONTEXT_PROFILE_MASK				= 0x9126
+	use VERSION_3_0			    MAX_VARYING_COMPONENTS
+	use ARB_framebuffer_object	    FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER
+passthru: /* Reuse tokens from ARB_depth_clamp */
+	use ARB_depth_clamp		    DEPTH_CLAMP
+passthru: /* Would reuse tokens from ARB_draw_elements_base_vertex, but it has none */
+passthru: /* Would reuse tokens from ARB_fragment_coord_conventions, but it has none */
+passthru: /* Reuse tokens from ARB_provoking_vertex */
+	use ARB_provoking_vertex	    QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION
+	use ARB_provoking_vertex	    FIRST_VERTEX_CONVENTION
+	use ARB_provoking_vertex	    LAST_VERTEX_CONVENTION
+	use ARB_provoking_vertex	    PROVOKING_VERTEX
+passthru: /* Reuse tokens from ARB_seamless_cube_map */
+	use ARB_seamless_cube_map	    TEXTURE_CUBE_MAP_SEAMLESS
+passthru: /* Reuse tokens from ARB_sync */
+	use ARB_sync			    MAX_SERVER_WAIT_TIMEOUT
+	use ARB_sync			    OBJECT_TYPE
+	use ARB_sync			    SYNC_CONDITION
+	use ARB_sync			    SYNC_STATUS
+	use ARB_sync			    SYNC_FLAGS
+	use ARB_sync			    SYNC_FENCE
+	use ARB_sync			    SYNC_GPU_COMMANDS_COMPLETE
+	use ARB_sync			    UNSIGNALED
+	use ARB_sync			    SIGNALED
+	use ARB_sync			    ALREADY_SIGNALED
+	use ARB_sync			    TIMEOUT_EXPIRED
+	use ARB_sync			    CONDITION_SATISFIED
+	use ARB_sync			    WAIT_FAILED
+	use ARB_sync			    TIMEOUT_IGNORED
+	use ARB_sync			    SYNC_FLUSH_COMMANDS_BIT
+	use ARB_sync			    TIMEOUT_IGNORED
+passthru: /* Reuse tokens from ARB_texture_multisample */
+	use ARB_texture_multisample	    SAMPLE_POSITION
+	use ARB_texture_multisample	    SAMPLE_MASK
+	use ARB_texture_multisample	    SAMPLE_MASK_VALUE
+	use ARB_texture_multisample	    MAX_SAMPLE_MASK_WORDS
+	use ARB_texture_multisample	    TEXTURE_2D_MULTISAMPLE
+	use ARB_texture_multisample	    PROXY_TEXTURE_2D_MULTISAMPLE
+	use ARB_texture_multisample	    TEXTURE_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    TEXTURE_BINDING_2D_MULTISAMPLE
+	use ARB_texture_multisample	    TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    TEXTURE_SAMPLES
+	use ARB_texture_multisample	    TEXTURE_FIXED_SAMPLE_LOCATIONS
+	use ARB_texture_multisample	    SAMPLER_2D_MULTISAMPLE
+	use ARB_texture_multisample	    INT_SAMPLER_2D_MULTISAMPLE
+	use ARB_texture_multisample	    UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE
+	use ARB_texture_multisample	    SAMPLER_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    INT_SAMPLER_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY
+	use ARB_texture_multisample	    MAX_COLOR_TEXTURE_SAMPLES
+	use ARB_texture_multisample	    MAX_DEPTH_TEXTURE_SAMPLES
+	use ARB_texture_multisample	    MAX_INTEGER_SAMPLES
+passthru: /* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */
+
+###############################################################################
+#
 # ARB extensions, in ARB extension order
 #
 ###############################################################################
@@ -1436,7 +2203,6 @@
 	FRAMEBUFFER_DEFAULT				= 0x8218
 	FRAMEBUFFER_UNDEFINED				= 0x8219
 	DEPTH_STENCIL_ATTACHMENT			= 0x821A
-	INDEX						= 0x8222
 	MAX_RENDERBUFFER_SIZE				= 0x84E8
 	DEPTH_STENCIL					= 0x84F9
 	UNSIGNED_INT_24_8				= 0x84FA
@@ -1446,8 +2212,6 @@
 	TEXTURE_GREEN_TYPE				= 0x8C11
 	TEXTURE_BLUE_TYPE				= 0x8C12
 	TEXTURE_ALPHA_TYPE				= 0x8C13
-	TEXTURE_LUMINANCE_TYPE				= 0x8C14
-	TEXTURE_INTENSITY_TYPE				= 0x8C15
 	TEXTURE_DEPTH_TYPE				= 0x8C16
 	UNSIGNED_NORMALIZED				= 0x8C17
 	FRAMEBUFFER_BINDING				= 0x8CA6
@@ -1505,6 +2269,11 @@
 	FRAMEBUFFER_INCOMPLETE_MULTISAMPLE		= 0x8D56
 	MAX_SAMPLES					= 0x8D57
 
+ARB_framebuffer_object_DEPRECATED enum:
+	INDEX						= 0x8222
+	TEXTURE_LUMINANCE_TYPE				= 0x8C14
+	TEXTURE_INTENSITY_TYPE				= 0x8C15
+
 ###############################################################################
 
 # ARB Extension #46
@@ -1546,8 +2315,7 @@
 
 # ARB Extension #49
 ARB_instanced_arrays enum:
-# ARB_instanced_arrays enum:
-#	VERTEX_ATTRIB_ARRAY_DIVISOR_ARB			= 0x88FE
+       VERTEX_ATTRIB_ARRAY_DIVISOR_ARB			= 0x88FE
 
 ###############################################################################
 
@@ -1612,8 +2380,201 @@
 ARB_vertex_array_object enum:
 	VERTEX_ARRAY_BINDING				= 0x85B5
 
+###############################################################################
 
+# No new tokens
+# ARB Extension #55 - WGL_ARB_create_context
+# ARB Extension #56 - GLX_ARB_create_context
+
 ###############################################################################
+
+# ARB Extension #57
+ARB_uniform_buffer_object enum:
+	UNIFORM_BUFFER					= 0x8A11
+	UNIFORM_BUFFER_BINDING				= 0x8A28
+	UNIFORM_BUFFER_START				= 0x8A29
+	UNIFORM_BUFFER_SIZE				= 0x8A2A
+	MAX_VERTEX_UNIFORM_BLOCKS			= 0x8A2B
+	MAX_GEOMETRY_UNIFORM_BLOCKS			= 0x8A2C
+	MAX_FRAGMENT_UNIFORM_BLOCKS			= 0x8A2D
+	MAX_COMBINED_UNIFORM_BLOCKS			= 0x8A2E
+	MAX_UNIFORM_BUFFER_BINDINGS			= 0x8A2F
+	MAX_UNIFORM_BLOCK_SIZE				= 0x8A30
+	MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS		= 0x8A31
+	MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS	= 0x8A32
+	MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS	= 0x8A33
+	UNIFORM_BUFFER_OFFSET_ALIGNMENT			= 0x8A34
+	ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH		= 0x8A35
+	ACTIVE_UNIFORM_BLOCKS				= 0x8A36
+	UNIFORM_TYPE					= 0x8A37
+	UNIFORM_SIZE					= 0x8A38
+	UNIFORM_NAME_LENGTH				= 0x8A39
+	UNIFORM_BLOCK_INDEX				= 0x8A3A
+	UNIFORM_OFFSET					= 0x8A3B
+	UNIFORM_ARRAY_STRIDE				= 0x8A3C
+	UNIFORM_MATRIX_STRIDE				= 0x8A3D
+	UNIFORM_IS_ROW_MAJOR				= 0x8A3E
+	UNIFORM_BLOCK_BINDING				= 0x8A3F
+	UNIFORM_BLOCK_DATA_SIZE				= 0x8A40
+	UNIFORM_BLOCK_NAME_LENGTH			= 0x8A41
+	UNIFORM_BLOCK_ACTIVE_UNIFORMS			= 0x8A42
+	UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES		= 0x8A43
+	UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER	= 0x8A44
+	UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER	= 0x8A45
+	UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER	= 0x8A46
+	INVALID_INDEX					= 0xFFFFFFFFu
+
+###############################################################################
+
+# ARB Extension #58
+# No new tokens
+ARB_compatibility enum:
+passthru: /* ARB_compatibility just defines tokens from core 3.0 */
+
+###############################################################################
+
+# ARB Extension #59
+ARB_copy_buffer enum:
+	COPY_READ_BUFFER				= 0x8F36
+	COPY_WRITE_BUFFER				= 0x8F37
+
+###############################################################################
+
+# ARB Extension #60
+# No new tokens
+ARB_shader_texture_lod enum:
+
+###############################################################################
+
+# ARB Extension #61
+ARB_depth_clamp enum:
+	DEPTH_CLAMP					= 0x864F
+
+###############################################################################
+
+# No new tokens
+# ARB Extension #62
+ARB_draw_elements_base_vertex enum:
+
+###############################################################################
+
+# No new tokens
+# ARB Extension #63
+ARB_fragment_coord_conventions enum:
+
+###############################################################################
+
+# ARB Extension #64
+ARB_provoking_vertex enum:
+	QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION	= 0x8E4C
+	FIRST_VERTEX_CONVENTION				= 0x8E4D
+	LAST_VERTEX_CONVENTION				= 0x8E4E
+	PROVOKING_VERTEX				= 0x8E4F
+
+###############################################################################
+
+# ARB Extension #65
+ARB_seamless_cube_map enum:
+	TEXTURE_CUBE_MAP_SEAMLESS			= 0x884F
+
+###############################################################################
+
+# ARB Extension #66
+ARB_sync enum:
+	MAX_SERVER_WAIT_TIMEOUT				= 0x9111
+	OBJECT_TYPE					= 0x9112
+	SYNC_CONDITION					= 0x9113
+	SYNC_STATUS					= 0x9114
+	SYNC_FLAGS					= 0x9115
+	SYNC_FENCE					= 0x9116
+	SYNC_GPU_COMMANDS_COMPLETE			= 0x9117
+	UNSIGNALED					= 0x9118
+	SIGNALED					= 0x9119
+	ALREADY_SIGNALED				= 0x911A
+	TIMEOUT_EXPIRED					= 0x911B
+	CONDITION_SATISFIED				= 0x911C
+	WAIT_FAILED					= 0x911D
+	SYNC_FLUSH_COMMANDS_BIT				= 0x00000001
+	TIMEOUT_IGNORED					= 0xFFFFFFFFFFFFFFFFull
+
+###############################################################################
+
+# ARB Extension #67
+ARB_texture_multisample enum:
+	SAMPLE_POSITION					= 0x8E50
+	SAMPLE_MASK					= 0x8E51
+	SAMPLE_MASK_VALUE				= 0x8E52
+	MAX_SAMPLE_MASK_WORDS				= 0x8E59
+	TEXTURE_2D_MULTISAMPLE				= 0x9100
+	PROXY_TEXTURE_2D_MULTISAMPLE			= 0x9101
+	TEXTURE_2D_MULTISAMPLE_ARRAY			= 0x9102
+	PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY		= 0x9103
+	TEXTURE_BINDING_2D_MULTISAMPLE			= 0x9104
+	TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY		= 0x9105
+	TEXTURE_SAMPLES					= 0x9106
+	TEXTURE_FIXED_SAMPLE_LOCATIONS			= 0x9107
+	SAMPLER_2D_MULTISAMPLE				= 0x9108
+	INT_SAMPLER_2D_MULTISAMPLE			= 0x9109
+	UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE		= 0x910A
+	SAMPLER_2D_MULTISAMPLE_ARRAY			= 0x910B
+	INT_SAMPLER_2D_MULTISAMPLE_ARRAY		= 0x910C
+	UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY	= 0x910D
+	MAX_COLOR_TEXTURE_SAMPLES			= 0x910E
+	MAX_DEPTH_TEXTURE_SAMPLES			= 0x910F
+	MAX_INTEGER_SAMPLES				= 0x9110
+
+###############################################################################
+
+# ARB Extension #68
+ARB_vertex_array_bgra enum:
+	use VERSION_1_2			    BGRA
+
+###############################################################################
+
+# No new tokens
+# ARB Extension #69
+ARB_draw_buffers_blend enum:
+
+###############################################################################
+
+# ARB Extension #70
+ARB_sample_shading enum:
+	SAMPLE_SHADING					= 0x8C36
+	MIN_SAMPLE_SHADING_VALUE			= 0x8C37
+
+###############################################################################
+
+# ARB Extension #71
+ARB_texture_cube_map_array enum:
+	TEXTURE_CUBE_MAP_ARRAY				= 0x9009
+	TEXTURE_BINDING_CUBE_MAP_ARRAY			= 0x900A
+	PROXY_TEXTURE_CUBE_MAP_ARRAY			= 0x900B
+	SAMPLER_CUBE_MAP_ARRAY				= 0x900C
+	SAMPLER_CUBE_MAP_ARRAY_SHADOW			= 0x900D
+	INT_SAMPLER_CUBE_MAP_ARRAY			= 0x900E
+	UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY		= 0x900F
+
+###############################################################################
+
+# ARB Extension #72
+ARB_texture_gather enum:
+	MIN_PROGRAM_TEXTURE_GATHER_OFFSET		= 0x8E5E
+	MAX_PROGRAM_TEXTURE_GATHER_OFFSET		= 0x8E5F
+	MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS		= 0x8F9F
+
+###############################################################################
+
+# No new tokens
+# ARB Extension #73
+ARB_texture_query_lod enum:
+
+###############################################################################
+
+# No new tokens
+# ARB Extension #74 - WGL_ARB_create_context_profile
+# ARB Extension #75 - GLX_ARB_create_context_profile
+
+###############################################################################
 #
 # non-ARB extensions follow, in registry order
 #
@@ -2282,8 +3243,8 @@
 
 ###############################################################################
 
-#@ Unknown tokens
 # Extension #68
+# (Unknown token values???)
 INGR_palette_buffer enum:
 
 ###############################################################################
@@ -2529,8 +3490,6 @@
 	FRAGMENT_LIGHT6_SGIX				= 0x8412
 	FRAGMENT_LIGHT7_SGIX				= 0x8413
 
-# SGIX_fragment_lighting_future_use: 0x8414-0x842B
-
 ###############################################################################
 
 # Extension #103 - skipped
@@ -4082,7 +5041,7 @@
 ###############################################################################
 
 # Extension #271
-# @@@ (extends ATI_element_array, I think???)
+# (extends ATI_element_array???)
 APPLE_element_array enum:
 	ELEMENT_ARRAY_APPLE				= 0x8768
 	ELEMENT_ARRAY_TYPE_APPLE			= 0x8769
@@ -4091,6 +5050,9 @@
 ###############################################################################
 
 # Extension #272
+# ??? BUFFER_OBJECT_APPLE appears to be part of the shipping extension,
+# but is not in the spec in the registry. Also appears in
+# APPLE_object_purgeable below.
 APPLE_fence enum:
 	DRAW_PIXELS_APPLE				= 0x8A0A
 	FENCE_APPLE					= 0x8A0B
@@ -4104,7 +5066,7 @@
 ###############################################################################
 
 # Extension #274
-# @@@ How does this interact with NV_vertex_array_range?
+# (How does this interact with NV_vertex_array_range???)
 APPLE_vertex_array_range enum:
 	VERTEX_ARRAY_RANGE_APPLE			= 0x851D
 	VERTEX_ARRAY_RANGE_LENGTH_APPLE			= 0x851E
@@ -4339,7 +5301,7 @@
 
 # Extension #299
 EXT_blend_equation_separate enum:
-	BLEND_EQUATION_RGB_EXT				= GL_BLEND_EQUATION
+	BLEND_EQUATION_RGB_EXT				= 0x8009    # alias GL_BLEND_EQUATION_EXT
 	BLEND_EQUATION_ALPHA_EXT			= 0x883D
 
 ###############################################################################
@@ -4902,21 +5864,21 @@
 
 # Extension #352
 EXT_transform_feedback enum:
-      TRANSFORM_FEEDBACK_BUFFER_EXT			= 0x8C8E
-      TRANSFORM_FEEDBACK_BUFFER_START_EXT		= 0x8C84
-      TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT		= 0x8C85
-      TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT		= 0x8C8F
-      INTERLEAVED_ATTRIBS_EXT				= 0x8C8C
-      SEPARATE_ATTRIBS_EXT				= 0x8C8D
-      PRIMITIVES_GENERATED_EXT				= 0x8C87
-      TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT		= 0x8C88
-      RASTERIZER_DISCARD_EXT				= 0x8C89
-      MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT = 0x8C8A
-      MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT	= 0x8C8B
-      MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT	= 0x8C80
-      TRANSFORM_FEEDBACK_VARYINGS_EXT			= 0x8C83
-      TRANSFORM_FEEDBACK_BUFFER_MODE_EXT		= 0x8C7F
-      TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT		= 0x8C76
+	TRANSFORM_FEEDBACK_BUFFER_EXT			= 0x8C8E
+	TRANSFORM_FEEDBACK_BUFFER_START_EXT		= 0x8C84
+	TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT		= 0x8C85
+	TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT		= 0x8C8F
+	INTERLEAVED_ATTRIBS_EXT				= 0x8C8C
+	SEPARATE_ATTRIBS_EXT				= 0x8C8D
+	PRIMITIVES_GENERATED_EXT			= 0x8C87
+	TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT	= 0x8C88
+	RASTERIZER_DISCARD_EXT				= 0x8C89
+	MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT = 0x8C8A
+	MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT	= 0x8C8B
+	MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT	= 0x8C80
+	TRANSFORM_FEEDBACK_VARYINGS_EXT			= 0x8C83
+	TRANSFORM_FEEDBACK_BUFFER_MODE_EXT		= 0x8C7F
+	TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT	= 0x8C76
 
 ###############################################################################
 
@@ -4955,17 +5917,279 @@
 	SAMPLE_MASK_VALUE_NV				= 0x8E52
 	TEXTURE_BINDING_RENDERBUFFER_NV			= 0x8E53
 	TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV	= 0x8E54
-	MAX_SAMPLE_MASK_WORDS_NV			= 0x8E59
 	TEXTURE_RENDERBUFFER_NV				= 0x8E55
 	SAMPLER_RENDERBUFFER_NV				= 0x8E56
 	INT_SAMPLER_RENDERBUFFER_NV			= 0x8E57
 	UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV		= 0x8E58
+	MAX_SAMPLE_MASK_WORDS_NV			= 0x8E59
 
 ###############################################################################
 
 # Extension #358
 NV_transform_feedback2 enum:
-      TRANSFORM_FEEDBACK_NV				= 0x8E22
-      TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV		= 0x8E23
-      TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV		= 0x8E24
-      TRANSFORM_FEEDBACK_BINDING_NV			= 0x8E25
+	TRANSFORM_FEEDBACK_NV				= 0x8E22
+	TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV		= 0x8E23
+	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
+
+###############################################################################
+
+# Extension #365
+EXT_texture_snorm enum:
+	ALPHA_SNORM					= 0x9010
+	LUMINANCE_SNORM					= 0x9011
+	LUMINANCE_ALPHA_SNORM				= 0x9012
+	INTENSITY_SNORM					= 0x9013
+	ALPHA8_SNORM					= 0x9014
+	LUMINANCE8_SNORM				= 0x9015
+	LUMINANCE8_ALPHA8_SNORM				= 0x9016
+	INTENSITY8_SNORM				= 0x9017
+	ALPHA16_SNORM					= 0x9018
+	LUMINANCE16_SNORM				= 0x9019
+	LUMINANCE16_ALPHA16_SNORM			= 0x901A
+	INTENSITY16_SNORM				= 0x901B
+	use VERSION_3_1			    RED_SNORM
+	use VERSION_3_1			    RG_SNORM
+	use VERSION_3_1			    RGB_SNORM
+	use VERSION_3_1			    RGBA_SNORM
+	use VERSION_3_1			    R8_SNORM
+	use VERSION_3_1			    RG8_SNORM
+	use VERSION_3_1			    RGB8_SNORM
+	use VERSION_3_1			    RGBA8_SNORM
+	use VERSION_3_1			    R16_SNORM
+	use VERSION_3_1			    RG16_SNORM
+	use VERSION_3_1			    RGB16_SNORM
+	use VERSION_3_1			    RGBA16_SNORM
+	use VERSION_3_1			    SIGNED_NORMALIZED
+
+###############################################################################
+
+# No new tokens
+# Extension #366
+AMD_draw_buffers_blend enum:
+
+###############################################################################
+
+# Extension #367
+APPLE_texture_range enum:
+	TEXTURE_RANGE_LENGTH_APPLE			= 0x85B7
+	TEXTURE_RANGE_POINTER_APPLE			= 0x85B8
+	TEXTURE_STORAGE_HINT_APPLE			= 0x85BC
+	STORAGE_PRIVATE_APPLE				= 0x85BD
+	use APPLE_vertex_array_range	    STORAGE_CACHED_APPLE
+	use APPLE_vertex_array_range	    STORAGE_SHARED_APPLE
+
+###############################################################################
+
+# Extension #368
+APPLE_float_pixels enum:
+	HALF_APPLE					= 0x140B
+	RGBA_FLOAT32_APPLE				= 0x8814
+	RGB_FLOAT32_APPLE				= 0x8815
+	ALPHA_FLOAT32_APPLE				= 0x8816
+	INTENSITY_FLOAT32_APPLE				= 0x8817
+	LUMINANCE_FLOAT32_APPLE				= 0x8818
+	LUMINANCE_ALPHA_FLOAT32_APPLE			= 0x8819
+	RGBA_FLOAT16_APPLE				= 0x881A
+	RGB_FLOAT16_APPLE				= 0x881B
+	ALPHA_FLOAT16_APPLE				= 0x881C
+	INTENSITY_FLOAT16_APPLE				= 0x881D
+	LUMINANCE_FLOAT16_APPLE				= 0x881E
+	LUMINANCE_ALPHA_FLOAT16_APPLE			= 0x881F
+	COLOR_FLOAT_APPLE				= 0x8A0F
+
+###############################################################################
+
+# Extension #369
+APPLE_vertex_program_evaluators enum:
+	VERTEX_ATTRIB_MAP1_APPLE			= 0x8A00
+	VERTEX_ATTRIB_MAP2_APPLE			= 0x8A01
+	VERTEX_ATTRIB_MAP1_SIZE_APPLE			= 0x8A02
+	VERTEX_ATTRIB_MAP1_COEFF_APPLE			= 0x8A03
+	VERTEX_ATTRIB_MAP1_ORDER_APPLE			= 0x8A04
+	VERTEX_ATTRIB_MAP1_DOMAIN_APPLE			= 0x8A05
+	VERTEX_ATTRIB_MAP2_SIZE_APPLE			= 0x8A06
+	VERTEX_ATTRIB_MAP2_COEFF_APPLE			= 0x8A07
+	VERTEX_ATTRIB_MAP2_ORDER_APPLE			= 0x8A08
+	VERTEX_ATTRIB_MAP2_DOMAIN_APPLE			= 0x8A09
+
+###############################################################################
+
+# Extension #370
+APPLE_aux_depth_stencil enum:
+	AUX_DEPTH_STENCIL_APPLE				= 0x8A14
+
+###############################################################################
+
+# Extension #371
+APPLE_object_purgeable enum:
+	BUFFER_OBJECT_APPLE				= 0x85B3
+	RELEASED_APPLE					= 0x8A19
+	VOLATILE_APPLE					= 0x8A1A
+	RETAINED_APPLE					= 0x8A1B
+	UNDEFINED_APPLE					= 0x8A1C
+	PURGEABLE_APPLE					= 0x8A1D
+
+###############################################################################
+
+# Extension #372
+APPLE_row_bytes enum:
+	PACK_ROW_BYTES_APPLE				= 0x8A15
+	UNPACK_ROW_BYTES_APPLE				= 0x8A16
+
+###############################################################################
+
+# Extension #373
+APPLE_rgb_422 enum:
+	RGB_422_APPLE					= 0x8A1F
+	use APPLE_ycbcr_422		    UNSIGNED_SHORT_8_8_APPLE
+	use APPLE_ycbcr_422		    UNSIGNED_SHORT_8_8_REV_APPLE
+
+###############################################################################
+
+# Extension #374
+
+NV_video_capture enum:
+	VIDEO_BUFFER_NV					= 0x9020
+	VIDEO_BUFFER_BINDING_NV				= 0x9021
+	FIELD_UPPER_NV					= 0x9022
+	FIELD_LOWER_NV					= 0x9023
+	NUM_VIDEO_CAPTURE_STREAMS_NV			= 0x9024
+	NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV		= 0x9025
+	VIDEO_CAPTURE_TO_422_SUPPORTED_NV		= 0x9026
+	LAST_VIDEO_CAPTURE_STATUS_NV			= 0x9027
+	VIDEO_BUFFER_PITCH_NV				= 0x9028
+	VIDEO_COLOR_CONVERSION_MATRIX_NV		= 0x9029
+	VIDEO_COLOR_CONVERSION_MAX_NV			= 0x902A
+	VIDEO_COLOR_CONVERSION_MIN_NV			= 0x902B
+	VIDEO_COLOR_CONVERSION_OFFSET_NV		= 0x902C
+	VIDEO_BUFFER_INTERNAL_FORMAT_NV			= 0x902D
+	PARTIAL_SUCCESS_NV				= 0x902E
+	SUCCESS_NV					= 0x902F
+	FAILURE_NV					= 0x9030
+	YCBYCR8_422_NV					= 0x9031
+	YCBAYCR8A_4224_NV				= 0x9032
+	Z6Y10Z6CB10Z6Y10Z6CR10_422_NV			= 0x9033
+	Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV	= 0x9034
+	Z4Y12Z4CB12Z4Y12Z4CR12_422_NV			= 0x9035
+	Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV	= 0x9036
+	Z4Y12Z4CB12Z4CR12_444_NV			= 0x9037
+	VIDEO_CAPTURE_FRAME_WIDTH_NV			= 0x9038
+	VIDEO_CAPTURE_FRAME_HEIGHT_NV			= 0x9039
+	VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV		= 0x903A
+	VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV		= 0x903B
+	VIDEO_CAPTURE_SURFACE_ORIGIN_NV			= 0x903C
+
+###############################################################################
+
+# Extension #375 - GLX_EXT_swap_control
+
+###############################################################################
+
+# No new tokens
+# Extension #376 - also GLX_NV_copy_image, WGL_NV_copy_image
+NV_copy_image enum:
+
+###############################################################################
+
+# Extension #377
+EXT_separate_shader_objects enum:
+	ACTIVE_PROGRAM_EXT				= 0x8B8D
+
+###############################################################################
+
+# No new tokens
+# Extension #378
+NV_parameter_buffer_object2 enum:
+
+###############################################################################
+
+# Extension #379
+NV_shader_buffer_load enum:
+	BUFFER_GPU_ADDRESS_NV				= 0x8F1D
+	GPU_ADDRESS_NV					= 0x8F34
+	MAX_SHADER_BUFFER_ADDRESS_NV			= 0x8F35
+
+###############################################################################
+
+# Extension #380
+NV_vertex_buffer_unified_memory enum:
+	VERTEX_ATTRIB_ARRAY_UNIFIED_NV			= 0x8F1E
+	ELEMENT_ARRAY_UNIFIED_NV			= 0x8F1F
+	VERTEX_ATTRIB_ARRAY_ADDRESS_NV			= 0x8F20
+	VERTEX_ARRAY_ADDRESS_NV				= 0x8F21
+	NORMAL_ARRAY_ADDRESS_NV				= 0x8F22
+	COLOR_ARRAY_ADDRESS_NV				= 0x8F23
+	INDEX_ARRAY_ADDRESS_NV				= 0x8F24
+	TEXTURE_COORD_ARRAY_ADDRESS_NV			= 0x8F25
+	EDGE_FLAG_ARRAY_ADDRESS_NV			= 0x8F26
+	SECONDARY_COLOR_ARRAY_ADDRESS_NV		= 0x8F27
+	FOG_COORD_ARRAY_ADDRESS_NV			= 0x8F28
+	ELEMENT_ARRAY_ADDRESS_NV			= 0x8F29
+	VERTEX_ATTRIB_ARRAY_LENGTH_NV			= 0x8F2A
+	VERTEX_ARRAY_LENGTH_NV				= 0x8F2B
+	NORMAL_ARRAY_LENGTH_NV				= 0x8F2C
+	COLOR_ARRAY_LENGTH_NV				= 0x8F2D
+	INDEX_ARRAY_LENGTH_NV				= 0x8F2E
+	TEXTURE_COORD_ARRAY_LENGTH_NV			= 0x8F2F
+	EDGE_FLAG_ARRAY_LENGTH_NV			= 0x8F30
+	SECONDARY_COLOR_ARRAY_LENGTH_NV			= 0x8F31
+	FOG_COORD_ARRAY_LENGTH_NV			= 0x8F32
+	ELEMENT_ARRAY_LENGTH_NV				= 0x8F33
+
+###############################################################################
+
+# No new tokens
+# Extension #381
+NV_texture_barrier enum:

Modified: AppleSGLX/trunk/specs/gl.spec
===================================================================
--- AppleSGLX/trunk/specs/gl.spec	2010-01-10 03:11:22 UTC (rev 404)
+++ AppleSGLX/trunk/specs/gl.spec	2010-01-13 05:04:59 UTC (rev 405)
@@ -1,38 +1,81 @@
 # gl.spec file
 # DON'T REMOVE PREVIOUS LINE!!! libspec depends on it!
 #
-# Copyright (C) 1991-2005 Silicon Graphics, Inc. All Rights Reserved.
+# Copyright (c) 1991-2005 Silicon Graphics, Inc. All Rights Reserved.
+# Copyright (c) 2006-2009 The Khronos Group Inc.
 #
 # This document is licensed under the SGI Free Software B License Version
 # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
 
 
-# @@ NOTE - need to distinguish extensions via some (new?) flag for glext.pl
-# @@ NOTE - 'alias' commands are not yet used in SI generator scripts, but should be
-# @@ NOTE - SI should support GLX protocol for at least these extensions:
-#    AreTexturesResidentEXT BindTextureEXT DeleteTexturesEXT GenTexturesEXT IsTextureEXT
-
 required-props:
+# Description of a parameter
 param:		retval retained
+# Display list flags
 dlflags:	notlistable handcode
+# GLX implementation flags
 glxflags:	client-intercept client-handcode server-handcode EXT SGI ignore ARB
+# Vector ('v') equivalent form of a command taking 1-4 explicit xyzw/rgba arguments
 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 this function falls in. While there are many categories for
+# early GL 1.0 functions, later functions just have a core version
+# (e.g. VERSION_major_minor) or extension name for the category.
+category:	display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform VERSION_1_0 VERSION_1_0_DEPRECATED VERSION_1_1 VERSION_1_1_DEPRECATED VERSION_1_2 VERSION_1_2_DEPRECATED VERSION_1_3 VERSION_1_3_DEPRECATED VERSION_1_4 VERSION_1_4_DEPRECATED VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_0_DEPRECATED VERSION_3_1 VERSION_3_2 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 ARB_uniform_buffer_object ARB_copy_buffer EXT_texture_snorm AMD_draw_buffers_blend APPLE_texture_range APPLE_float_pixels APPLE_vertex_program_evaluators APPLE_aux_depth_stencil APPLE_object_purgeable APPLE_row_bytes ARB_draw_elements_base_vertex ARB_provoking_vertex ARB_sync ARB_texture_multisample ARB_draw_buffers_blend ARB_sample_shading NV_video_capture NV_copy_image EXT_separate_shader_objects NV_parameter_buffer_object2 NV_shader_buffer_load NV_vertex_buffer_unified_memory NV_texture_barrier
 
+# 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 ARB_depth_clamp ARB_fragment_coord_conventions
+# ARB_seamless_cube_map ARB_vertex_array_bgra ARB_texture_cube_map_array
+# ARB_texture_gather ARB_texture_query_lod
 
-# 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
+# Core version in which a function was introduced, or against
+# which an extension can be implemented
+version:	1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2
+# Core version in which a function was removed
+deprecated:	3.1
+# GLX Single, Rendering, or Vendor Private opcode
 glxsingle:	*
 glxropcode:	*
 glxvendorpriv:	*
-glsflags:	capture-handcode client client-state get gl-enum ignore matrix pixel-null pixel-pack pixel-unpack
-glsopcode:	*
-glsalias:	*
+# WGL implementation flags (incomplete)
 wglflags:	client-handcode server-handcode small-data batchable
+# Drivers in which this is implemented (very incomplete)
 extension:	future not_implemented soft WINSOFT NV10 NV20 NV50
+# Function this aliases (indistinguishable to the GL)
 alias:		*
+# Mesa dispatch table offset (incomplete)
 offset:		*
 # These properties are picked up from NVIDIA .spec files, we don't use them
 glfflags:	*
@@ -45,7 +88,7 @@
 #
 # glxsingle, glxropcode, and other GLX allocations to vendors
 # are used here, but the master registry for GLX is in
-# /ogl/trunk/doc/registry/extensions/extensions.reserved
+# /ogl/trunk/doc/registry/extensions.reserved
 #
 # XFree86 dispatch offsets:	0-645
 #				578-641     NV_vertex_program
@@ -60,7 +103,6 @@
 # - append new ARB and non-ARB extensions to the appropriate portion of
 #   the spec file, in extension number order.
 # - use tabs, not spaces
-# - set glsflags to "ignore" until GLS is updated to support the new command
 # - set glxflags to "ignore" until GLX is updated to support the new command
 # - add new data types to typemaps/spec2wire.map
 # - add extension name in alphabetical order to category list
@@ -77,7 +119,7 @@
 
 passthru: #ifndef GL_VERSION_2_0
 passthru: /* GL type for program/shader text */
-passthru: typedef char GLchar;			/* native character */
+passthru: typedef char GLchar;
 passthru: #endif
 passthru:
 passthru: #ifndef GL_VERSION_1_5
@@ -93,12 +135,12 @@
 passthru: #endif
 passthru:
 passthru: #ifndef GL_ARB_shader_objects
-passthru: /* GL types for handling shader object handles and program/shader text */
-passthru: typedef char GLcharARB;		/* native character */
-passthru: typedef unsigned int GLhandleARB;	/* shader object handle */
+passthru: /* GL types for program/shader text and shader object handles */
+passthru: typedef char GLcharARB;
+passthru: typedef unsigned int GLhandleARB;
 passthru: #endif
 passthru:
-passthru: /* GL types for "half" precision (s10e5) float data in host memory */
+passthru: /* GL type for "half" precision (s10e5) float data in host memory */
 passthru: #ifndef GL_ARB_half_float_pixel
 passthru: typedef unsigned short GLhalfARB;
 passthru: #endif
@@ -140,7 +182,8 @@
 passthru: typedef __int64 int64_t;
 passthru: typedef unsigned __int64 uint64_t;
 passthru: #else
-passthru: #include <inttypes.h>     /* Fallback option */
+passthru: /* Fallback if nothing above works */
+passthru: #include <inttypes.h>
 passthru: #endif
 passthru: #endif
 passthru:
@@ -149,42 +192,609 @@
 passthru: typedef uint64_t GLuint64EXT;
 passthru: #endif
 passthru:
+passthru: #ifndef ARB_sync
+passthru: typedef int64_t GLint64;
+passthru: typedef uint64_t GLuint64;
+passthru: typedef struct __GLsync *GLsync;
+passthru: #endif
+passthru:
 
 ###############################################################################
+###############################################################################
 #
-# display-list commands
+# OpenGL 1.0 commands
 #
 ###############################################################################
+###############################################################################
 
+###############################################################################
+#
+# drawing-control commands
+#
+###############################################################################
+
+CullFace(mode)
+	return		void
+	param		mode		CullFaceMode in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	79
+	offset		152
+
+FrontFace(mode)
+	return		void
+	param		mode		FrontFaceDirection in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	84
+	offset		157
+
+Hint(target, mode)
+	return		void
+	param		target		HintTarget in value
+	param		mode		HintMode in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	85
+	offset		158
+
+LineWidth(width)
+	return		void
+	param		width		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	95
+	offset		168
+
+PointSize(size)
+	return		void
+	param		size		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	100
+	offset		173
+
+PolygonMode(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		PolygonMode in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	101
+	offset		174
+
+Scissor(x, y, width, height)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	103
+	offset		176
+
+TexParameterf(target, pname, param)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	105
+	wglflags	small-data
+	offset		178
+
+TexParameterfv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	106
+	wglflags	small-data
+	offset		179
+
+TexParameteri(target, pname, param)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	107
+	wglflags	small-data
+	offset		180
+
+TexParameteriv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	108
+	wglflags	small-data
+	offset		181
+
+TexImage1D(target, level, internalformat, width, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureComponentCount in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	VERSION_1_0		   # old: drawing-control
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxropcode	109
+	wglflags	client-handcode server-handcode
+	offset		182
+
+TexImage2D(target, level, internalformat, width, height, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureComponentCount in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_0		   # old: drawing-control
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxropcode	110
+	wglflags	client-handcode server-handcode
+	offset		183
+
+###############################################################################
+#
+# framebuf commands
+#
+###############################################################################
+
+DrawBuffer(mode)
+	return		void
+	param		mode		DrawBufferMode in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	126
+	offset		202
+
+Clear(mask)
+	return		void
+	param		mask		ClearBufferMask in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	127
+	offset		203
+
+ClearColor(red, green, blue, alpha)
+	return		void
+	param		red		ClampedColorF in value
+	param		green		ClampedColorF in value
+	param		blue		ClampedColorF in value
+	param		alpha		ClampedColorF in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	130
+	offset		206
+
+ClearStencil(s)
+	return		void
+	param		s		StencilValue in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	131
+	offset		207
+
+ClearDepth(depth)
+	return		void
+	param		depth		ClampedFloat64 in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	132
+	offset		208
+
+StencilMask(mask)
+	return		void
+	param		mask		MaskedStencilValue in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	133
+	offset		209
+
+ColorMask(red, green, blue, alpha)
+	return		void
+	param		red		Boolean in value
+	param		green		Boolean in value
+	param		blue		Boolean in value
+	param		alpha		Boolean in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	134
+	offset		210
+
+DepthMask(flag)
+	return		void
+	param		flag		Boolean in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	135
+	offset		211
+
+###############################################################################
+#
+# misc commands
+#
+###############################################################################
+
+Disable(cap)
+	return		void
+	param		cap		EnableCap in value
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	dlflags		handcode
+	glxflags	client-handcode client-intercept
+	glxropcode	138
+	offset		214
+
+Enable(cap)
+	return		void
+	param		cap		EnableCap in value
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	dlflags		handcode
+	glxflags	client-handcode client-intercept
+	glxropcode	139
+	offset		215
+
+Finish()
+	return		void
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	glxsingle	108
+	offset		216
+
+Flush()
+	return		void
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	glxsingle	142
+	offset		217
+
+###############################################################################
+#
+# pixel-op commands
+#
+###############################################################################
+
+BlendFunc(sfactor, dfactor)
+	return		void
+	param		sfactor		BlendingFactorSrc in value
+	param		dfactor		BlendingFactorDest in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	160
+	offset		241
+
+LogicOp(opcode)
+	return		void
+	param		opcode		LogicOp in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	161
+	offset		242
+
+StencilFunc(func, ref, mask)
+	return		void
+	param		func		StencilFunction in value
+	param		ref		ClampedStencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	162
+	offset		243
+
+StencilOp(fail, zfail, zpass)
+	return		void
+	param		fail		StencilOp in value
+	param		zfail		StencilOp in value
+	param		zpass		StencilOp in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	163
+	offset		244
+
+DepthFunc(func)
+	return		void
+	param		func		DepthFunction in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	164
+	offset		245
+
+###############################################################################
+#
+# pixel-rw commands
+#
+###############################################################################
+
+PixelStoref(pname, param)
+	return		void
+	param		pname		PixelStoreParameter in value
+	param		param		CheckedFloat32 in value
+	dlflags		notlistable
+	glxflags	client-handcode
+	category	VERSION_1_0		   # old: pixel-rw
+	version		1.0
+	glxsingle	109
+	wglflags	batchable
+	offset		249
+
+PixelStorei(pname, param)
+	return		void
+	param		pname		PixelStoreParameter in value
+	param		param		CheckedInt32 in value
+	dlflags		notlistable
+	glxflags	client-handcode
+	category	VERSION_1_0		   # old: pixel-rw
+	version		1.0
+	glxsingle	110
+	wglflags	batchable
+	offset		250
+
+ReadBuffer(mode)
+	return		void
+	param		mode		ReadBufferMode in value
+	category	VERSION_1_0		   # old: pixel-rw
+	version		1.0
+	glxropcode	171
+	offset		254
+
+ReadPixels(x, y, width, height, format, type, pixels)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_0		   # old: pixel-rw
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxsingle	111
+	wglflags	client-handcode server-handcode
+	offset		256
+
+###############################################################################
+#
+# state-req commands
+#
+###############################################################################
+
+GetBooleanv(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Boolean out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	112
+	wglflags	small-data
+	offset		258
+
+GetDoublev(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	114
+	wglflags	small-data
+	offset		260
+
+GetError()
+	return		ErrorCode
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	115
+	offset		261
+
+GetFloatv(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	116
+	wglflags	small-data
+	offset		262
+
+GetIntegerv(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	117
+	wglflags	small-data
+	offset		263
+
+GetString(name)
+	return		String
+	param		name		StringName in value
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxsingle	129
+	wglflags	client-handcode server-handcode
+	offset		275
+
+GetTexImage(target, level, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(target/level/format/type)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxsingle	135
+	wglflags	client-handcode server-handcode
+	offset		281
+
+GetTexParameterfv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	136
+	wglflags	small-data
+	offset		282
+
+GetTexParameteriv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	137
+	wglflags	small-data
+	offset		283
+
+GetTexLevelParameterfv(target, level, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	138
+	wglflags	small-data
+	offset		284
+
+GetTexLevelParameteriv(target, level, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	139
+	wglflags	small-data
+	offset		285
+
+IsEnabled(cap)
+	return		Boolean
+	param		cap		EnableCap in value
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxflags	client-handcode client-intercept
+	glxsingle	140
+	offset		286
+
+###############################################################################
+#
+# xform commands
+#
+###############################################################################
+
+DepthRange(near, far)
+	return		void
+	param		near		ClampedFloat64 in value
+	param		far		ClampedFloat64 in value
+	category	VERSION_1_0		   # old: xform
+	version		1.0
+	glxropcode	174
+	offset		288
+
+Viewport(x, y, width, height)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_0		   # old: xform
+	version		1.0
+	glxropcode	191
+	offset		305
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.0 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# display-list commands
+
 NewList(list, mode)
 	return		void
 	param		list		List in value
 	param		mode		ListMode in value
 	dlflags		notlistable
-	category	display-list
+	category	VERSION_1_0_DEPRECATED	   # old: display-list
 	version		1.0
+	deprecated	3.1
 	glxsingle	101
-	glsopcode	0x0030
 	wglflags	batchable
 	offset		0
 
 EndList()
 	return		void
 	dlflags		notlistable
-	category	display-list
+	category	VERSION_1_0_DEPRECATED	   # old: display-list
 	version		1.0
+	deprecated	3.1
 	glxsingle	102
-	glsopcode	0x0031
 	wglflags	batchable
 	offset		1
 
 CallList(list)
 	return		void
 	param		list		List in value
-	category	display-list
+	category	VERSION_1_0_DEPRECATED	   # old: display-list
 	version		1.0
+	deprecated	3.1
 	glxropcode	1
-	glsopcode	0x0032
 	offset		2
 
 CallLists(n, type, lists)
@@ -192,11 +802,11 @@
 	param		n		SizeI in value
 	param		type		ListNameType in value
 	param		lists		Void in array [COMPSIZE(n/type)]
-	category	display-list
+	category	VERSION_1_0_DEPRECATED	   # old: display-list
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	2
-	glsopcode	0x0033
 	offset		3
 
 DeleteLists(list, range)
@@ -204,10 +814,10 @@
 	param		list		List in value
 	param		range		SizeI in value
 	dlflags		notlistable
-	category	display-list
+	category	VERSION_1_0_DEPRECATED	   # old: display-list
 	version		1.0
+	deprecated	3.1
 	glxsingle	103
-	glsopcode	0x0034
 	wglflags	batchable
 	offset		4
 
@@ -215,34 +825,30 @@
 	return		List
 	param		range		SizeI in value
 	dlflags		notlistable
-	category	display-list
+	category	VERSION_1_0_DEPRECATED	   # old: display-list
 	version		1.0
+	deprecated	3.1
 	glxsingle	104
-	glsopcode	0x0035
 	offset		5
 
 ListBase(base)
 	return		void
 	param		base		List in value
-	category	display-list
+	category	VERSION_1_0_DEPRECATED	   # old: display-list
 	version		1.0
+	deprecated	3.1
 	glxropcode	3
-	glsopcode	0x0036
 	offset		6
 
-###############################################################################
-#
 # drawing commands
-#
-###############################################################################
 
 Begin(mode)
 	return		void
 	param		mode		BeginMode in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	4
-	glsopcode	0x0037
 	offset		7
 
 Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap)
@@ -254,13 +860,12 @@
 	param		xmove		CoordF in value
 	param		ymove		CoordF in value
 	param		bitmap		UInt8 in array [COMPSIZE(width/height)]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	5
-	glsflags	pixel-unpack
-	glsopcode	0x0038
 	wglflags	client-handcode server-handcode
 	offset		8
 
@@ -269,18 +874,19 @@
 	param		red		ColorB in value
 	param		green		ColorB in value
 	param		blue		ColorB in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color3bv
 	version		1.0
+	deprecated	3.1
 	offset		9
 
 Color3bv(v)
 	return		void
 	param		v		ColorB in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	6
-	glsopcode	0x0039
 	offset		10
 
 Color3d(red, green, blue)
@@ -288,18 +894,19 @@
 	param		red		ColorD in value
 	param		green		ColorD in value
 	param		blue		ColorD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color3dv
 	version		1.0
+	deprecated	3.1
 	offset		11
 
 Color3dv(v)
 	return		void
 	param		v		ColorD in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	7
-	glsopcode	0x003A
 	offset		12
 
 Color3f(red, green, blue)
@@ -307,18 +914,19 @@
 	param		red		ColorF in value
 	param		green		ColorF in value
 	param		blue		ColorF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color3fv
 	version		1.0
+	deprecated	3.1
 	offset		13
 
 Color3fv(v)
 	return		void
 	param		v		ColorF in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	8
-	glsopcode	0x003B
 	offset		14
 
 Color3i(red, green, blue)
@@ -326,18 +934,19 @@
 	param		red		ColorI in value
 	param		green		ColorI in value
 	param		blue		ColorI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color3iv
 	version		1.0
+	deprecated	3.1
 	offset		15
 
 Color3iv(v)
 	return		void
 	param		v		ColorI in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	9
-	glsopcode	0x003C
 	offset		16
 
 Color3s(red, green, blue)
@@ -345,18 +954,19 @@
 	param		red		ColorS in value
 	param		green		ColorS in value
 	param		blue		ColorS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color3sv
 	version		1.0
+	deprecated	3.1
 	offset		17
 
 Color3sv(v)
 	return		void
 	param		v		ColorS in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	10
-	glsopcode	0x003D
 	offset		18
 
 Color3ub(red, green, blue)
@@ -364,18 +974,19 @@
 	param		red		ColorUB in value
 	param		green		ColorUB in value
 	param		blue		ColorUB in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color3ubv
 	version		1.0
+	deprecated	3.1
 	offset		19
 
 Color3ubv(v)
 	return		void
 	param		v		ColorUB in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	11
-	glsopcode	0x003E
 	offset		20
 
 Color3ui(red, green, blue)
@@ -383,18 +994,19 @@
 	param		red		ColorUI in value
 	param		green		ColorUI in value
 	param		blue		ColorUI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color3uiv
 	version		1.0
+	deprecated	3.1
 	offset		21
 
 Color3uiv(v)
 	return		void
 	param		v		ColorUI in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	12
-	glsopcode	0x003F
 	offset		22
 
 Color3us(red, green, blue)
@@ -402,18 +1014,19 @@
 	param		red		ColorUS in value
 	param		green		ColorUS in value
 	param		blue		ColorUS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color3usv
 	version		1.0
+	deprecated	3.1
 	offset		23
 
 Color3usv(v)
 	return		void
 	param		v		ColorUS in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	13
-	glsopcode	0x0040
 	offset		24
 
 Color4b(red, green, blue, alpha)
@@ -422,18 +1035,19 @@
 	param		green		ColorB in value
 	param		blue		ColorB in value
 	param		alpha		ColorB in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color4bv
 	version		1.0
+	deprecated	3.1
 	offset		25
 
 Color4bv(v)
 	return		void
 	param		v		ColorB in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	14
-	glsopcode	0x0041
 	offset		26
 
 Color4d(red, green, blue, alpha)
@@ -442,18 +1056,19 @@
 	param		green		ColorD in value
 	param		blue		ColorD in value
 	param		alpha		ColorD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color4dv
 	version		1.0
+	deprecated	3.1
 	offset		27
 
 Color4dv(v)
 	return		void
 	param		v		ColorD in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	15
-	glsopcode	0x0042
 	offset		28
 
 Color4f(red, green, blue, alpha)
@@ -462,18 +1077,19 @@
 	param		green		ColorF in value
 	param		blue		ColorF in value
 	param		alpha		ColorF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color4fv
 	version		1.0
+	deprecated	3.1
 	offset		29
 
 Color4fv(v)
 	return		void
 	param		v		ColorF in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	16
-	glsopcode	0x0043
 	offset		30
 
 Color4i(red, green, blue, alpha)
@@ -482,18 +1098,19 @@
 	param		green		ColorI in value
 	param		blue		ColorI in value
 	param		alpha		ColorI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color4iv
 	version		1.0
+	deprecated	3.1
 	offset		31
 
 Color4iv(v)
 	return		void
 	param		v		ColorI in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	17
-	glsopcode	0x0044
 	offset		32
 
 Color4s(red, green, blue, alpha)
@@ -502,18 +1119,19 @@
 	param		green		ColorS in value
 	param		blue		ColorS in value
 	param		alpha		ColorS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color4sv
 	version		1.0
+	deprecated	3.1
 	offset		33
 
 Color4sv(v)
 	return		void
 	param		v		ColorS in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	18
-	glsopcode	0x0045
 	offset		34
 
 Color4ub(red, green, blue, alpha)
@@ -522,18 +1140,19 @@
 	param		green		ColorUB in value
 	param		blue		ColorUB in value
 	param		alpha		ColorUB in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color4ubv
 	version		1.0
+	deprecated	3.1
 	offset		35
 
 Color4ubv(v)
 	return		void
 	param		v		ColorUB in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	19
-	glsopcode	0x0046
 	offset		36
 
 Color4ui(red, green, blue, alpha)
@@ -542,18 +1161,19 @@
 	param		green		ColorUI in value
 	param		blue		ColorUI in value
 	param		alpha		ColorUI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color4uiv
 	version		1.0
+	deprecated	3.1
 	offset		37
 
 Color4uiv(v)
 	return		void
 	param		v		ColorUI in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	20
-	glsopcode	0x0047
 	offset		38
 
 Color4us(red, green, blue, alpha)
@@ -562,111 +1182,117 @@
 	param		green		ColorUS in value
 	param		blue		ColorUS in value
 	param		alpha		ColorUS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Color4usv
 	version		1.0
+	deprecated	3.1
 	offset		39
 
 Color4usv(v)
 	return		void
 	param		v		ColorUS in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	21
-	glsopcode	0x0048
 	offset		40
 
 EdgeFlag(flag)
 	return		void
 	param		flag		Boolean in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	EdgeFlagv
 	version		1.0
+	deprecated	3.1
 	offset		41
 
 EdgeFlagv(flag)
 	return		void
 	param		flag		Boolean in array [1]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	22
-	glsopcode	0x0049
 	offset		42
 
 End()
 	return		void
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	23
-	glsopcode	0x004A
 	offset		43
 
 Indexd(c)
 	return		void
 	param		c		ColorIndexValueD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Indexdv
 	version		1.0
+	deprecated	3.1
 	offset		44
 
 Indexdv(c)
 	return		void
 	param		c		ColorIndexValueD in array [1]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	24
-	glsopcode	0x004B
 	offset		45
 
 Indexf(c)
 	return		void
 	param		c		ColorIndexValueF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Indexfv
 	version		1.0
+	deprecated	3.1
 	offset		46
 
 Indexfv(c)
 	return		void
 	param		c		ColorIndexValueF in array [1]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	25
-	glsopcode	0x004C
 	offset		47
 
 Indexi(c)
 	return		void
 	param		c		ColorIndexValueI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Indexiv
 	version		1.0
+	deprecated	3.1
 	offset		48
 
 Indexiv(c)
 	return		void
 	param		c		ColorIndexValueI in array [1]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	26
-	glsopcode	0x004D
 	offset		49
 
 Indexs(c)
 	return		void
 	param		c		ColorIndexValueS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Indexsv
 	version		1.0
+	deprecated	3.1
 	offset		50
 
 Indexsv(c)
 	return		void
 	param		c		ColorIndexValueS in array [1]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	27
-	glsopcode	0x004E
 	offset		51
 
 Normal3b(nx, ny, nz)
@@ -674,18 +1300,19 @@
 	param		nx		Int8 in value
 	param		ny		Int8 in value
 	param		nz		Int8 in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Normal3bv
 	version		1.0
+	deprecated	3.1
 	offset		52
 
 Normal3bv(v)
 	return		void
 	param		v		Int8 in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	28
-	glsopcode	0x004F
 	offset		53
 
 Normal3d(nx, ny, nz)
@@ -693,18 +1320,19 @@
 	param		nx		CoordD in value
 	param		ny		CoordD in value
 	param		nz		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Normal3dv
 	version		1.0
+	deprecated	3.1
 	offset		54
 
 Normal3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	29
-	glsopcode	0x0050
 	offset		55
 
 Normal3f(nx, ny, nz)
@@ -712,18 +1340,19 @@
 	param		nx		CoordF in value
 	param		ny		CoordF in value
 	param		nz		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Normal3fv
 	version		1.0
+	deprecated	3.1
 	offset		56
 
 Normal3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	30
-	glsopcode	0x0051
 	offset		57
 
 Normal3i(nx, ny, nz)
@@ -731,18 +1360,19 @@
 	param		nx		Int32 in value
 	param		ny		Int32 in value
 	param		nz		Int32 in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Normal3iv
 	version		1.0
+	deprecated	3.1
 	offset		58
 
 Normal3iv(v)
 	return		void
 	param		v		Int32 in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	31
-	glsopcode	0x0052
 	offset		59
 
 Normal3s(nx, ny, nz)
@@ -750,90 +1380,95 @@
 	param		nx		Int16 in value
 	param		ny		Int16 in value
 	param		nz		Int16 in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Normal3sv
 	version		1.0
+	deprecated	3.1
 	offset		60
 
 Normal3sv(v)
 	return		void
 	param		v		Int16 in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	32
-	glsopcode	0x0053
 	offset		61
 
 RasterPos2d(x, y)
 	return		void
 	param		x		CoordD in value
 	param		y		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos2dv
 	version		1.0
+	deprecated	3.1
 	offset		62
 
 RasterPos2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	33
-	glsopcode	0x0054
 	offset		63
 
 RasterPos2f(x, y)
 	return		void
 	param		x		CoordF in value
 	param		y		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos2fv
 	version		1.0
+	deprecated	3.1
 	offset		64
 
 RasterPos2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	34
-	glsopcode	0x0055
 	offset		65
 
 RasterPos2i(x, y)
 	return		void
 	param		x		CoordI in value
 	param		y		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos2iv
 	version		1.0
+	deprecated	3.1
 	offset		66
 
 RasterPos2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	35
-	glsopcode	0x0056
 	offset		67
 
 RasterPos2s(x, y)
 	return		void
 	param		x		CoordS in value
 	param		y		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos2sv
 	version		1.0
+	deprecated	3.1
 	offset		68
 
 RasterPos2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	36
-	glsopcode	0x0057
 	offset		69
 
 RasterPos3d(x, y, z)
@@ -842,17 +1477,18 @@
 	param		y		CoordD in value
 	param		z		CoordD in value
 	vectorequiv	RasterPos3dv
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	offset		70
 
 RasterPos3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	37
-	glsopcode	0x0058
 	offset		71
 
 RasterPos3f(x, y, z)
@@ -860,18 +1496,19 @@
 	param		x		CoordF in value
 	param		y		CoordF in value
 	param		z		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos3fv
 	version		1.0
+	deprecated	3.1
 	offset		72
 
 RasterPos3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	38
-	glsopcode	0x0059
 	offset		73
 
 RasterPos3i(x, y, z)
@@ -879,18 +1516,19 @@
 	param		x		CoordI in value
 	param		y		CoordI in value
 	param		z		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos3iv
 	version		1.0
+	deprecated	3.1
 	offset		74
 
 RasterPos3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	39
-	glsopcode	0x005A
 	offset		75
 
 RasterPos3s(x, y, z)
@@ -898,18 +1536,19 @@
 	param		x		CoordS in value
 	param		y		CoordS in value
 	param		z		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos3sv
 	version		1.0
+	deprecated	3.1
 	offset		76
 
 RasterPos3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	40
-	glsopcode	0x005B
 	offset		77
 
 RasterPos4d(x, y, z, w)
@@ -919,17 +1558,18 @@
 	param		z		CoordD in value
 	param		w		CoordD in value
 	vectorequiv	RasterPos4dv
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	offset		78
 
 RasterPos4dv(v)
 	return		void
 	param		v		CoordD in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	41
-	glsopcode	0x005C
 	offset		79
 
 RasterPos4f(x, y, z, w)
@@ -938,18 +1578,19 @@
 	param		y		CoordF in value
 	param		z		CoordF in value
 	param		w		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos4fv
 	version		1.0
+	deprecated	3.1
 	offset		80
 
 RasterPos4fv(v)
 	return		void
 	param		v		CoordF in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	42
-	glsopcode	0x005D
 	offset		81
 
 RasterPos4i(x, y, z, w)
@@ -958,18 +1599,19 @@
 	param		y		CoordI in value
 	param		z		CoordI in value
 	param		w		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos4iv
 	version		1.0
+	deprecated	3.1
 	offset		82
 
 RasterPos4iv(v)
 	return		void
 	param		v		CoordI in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	43
-	glsopcode	0x005E
 	offset		83
 
 RasterPos4s(x, y, z, w)
@@ -978,18 +1620,19 @@
 	param		y		CoordS in value
 	param		z		CoordS in value
 	param		w		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	RasterPos4sv
 	version		1.0
+	deprecated	3.1
 	offset		84
 
 RasterPos4sv(v)
 	return		void
 	param		v		CoordS in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	44
-	glsopcode	0x005F
 	offset		85
 
 Rectd(x1, y1, x2, y2)
@@ -998,19 +1641,20 @@
 	param		y1		CoordD in value
 	param		x2		CoordD in value
 	param		y2		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Rectdv
 	version		1.0
+	deprecated	3.1
 	offset		86
 
 Rectdv(v1, v2)
 	return		void
 	param		v1		CoordD in array [2]
 	param		v2		CoordD in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	45
-	glsopcode	0x0060
 	offset		87
 
 Rectf(x1, y1, x2, y2)
@@ -1019,19 +1663,20 @@
 	param		y1		CoordF in value
 	param		x2		CoordF in value
 	param		y2		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Rectfv
 	version		1.0
+	deprecated	3.1
 	offset		88
 
 Rectfv(v1, v2)
 	return		void
 	param		v1		CoordF in array [2]
 	param		v2		CoordF in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	46
-	glsopcode	0x0061
 	offset		89
 
 Recti(x1, y1, x2, y2)
@@ -1040,19 +1685,20 @@
 	param		y1		CoordI in value
 	param		x2		CoordI in value
 	param		y2		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Rectiv
 	version		1.0
+	deprecated	3.1
 	offset		90
 
 Rectiv(v1, v2)
 	return		void
 	param		v1		CoordI in array [2]
 	param		v2		CoordI in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	47
-	glsopcode	0x0062
 	offset		91
 
 Rects(x1, y1, x2, y2)
@@ -1061,159 +1707,168 @@
 	param		y1		CoordS in value
 	param		x2		CoordS in value
 	param		y2		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Rectsv
 	version		1.0
+	deprecated	3.1
 	offset		92
 
 Rectsv(v1, v2)
 	return		void
 	param		v1		CoordS in array [2]
 	param		v2		CoordS in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	48
-	glsopcode	0x0063
 	offset		93
 
 TexCoord1d(s)
 	return		void
 	param		s		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord1dv
 	version		1.0
+	deprecated	3.1
 	offset		94
 
 TexCoord1dv(v)
 	return		void
 	param		v		CoordD in array [1]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	49
-	glsopcode	0x0064
 	offset		95
 
 TexCoord1f(s)
 	return		void
 	param		s		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord1fv
 	version		1.0
+	deprecated	3.1
 	offset		96
 
 TexCoord1fv(v)
 	return		void
 	param		v		CoordF in array [1]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	50
-	glsopcode	0x0065
 	offset		97
 
 TexCoord1i(s)
 	return		void
 	param		s		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord1iv
 	version		1.0
+	deprecated	3.1
 	offset		98
 
 TexCoord1iv(v)
 	return		void
 	param		v		CoordI in array [1]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	51
-	glsopcode	0x0066
 	offset		99
 
 TexCoord1s(s)
 	return		void
 	param		s		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord1sv
 	version		1.0
+	deprecated	3.1
 	offset		100
 
 TexCoord1sv(v)
 	return		void
 	param		v		CoordS in array [1]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	52
-	glsopcode	0x0067
 	offset		101
 
 TexCoord2d(s, t)
 	return		void
 	param		s		CoordD in value
 	param		t		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord2dv
 	version		1.0
+	deprecated	3.1
 	offset		102
 
 TexCoord2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	53
-	glsopcode	0x0068
 	offset		103
 
 TexCoord2f(s, t)
 	return		void
 	param		s		CoordF in value
 	param		t		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord2fv
 	version		1.0
+	deprecated	3.1
 	offset		104
 
 TexCoord2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	54
-	glsopcode	0x0069
 	offset		105
 
 TexCoord2i(s, t)
 	return		void
 	param		s		CoordI in value
 	param		t		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord2iv
 	version		1.0
+	deprecated	3.1
 	offset		106
 
 TexCoord2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	55
-	glsopcode	0x006A
 	offset		107
 
 TexCoord2s(s, t)
 	return		void
 	param		s		CoordS in value
 	param		t		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord2sv
 	version		1.0
+	deprecated	3.1
 	offset		108
 
 TexCoord2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	56
-	glsopcode	0x006B
 	offset		109
 
 TexCoord3d(s, t, r)
@@ -1221,18 +1876,19 @@
 	param		s		CoordD in value
 	param		t		CoordD in value
 	param		r		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord3dv
 	version		1.0
+	deprecated	3.1
 	offset		110
 
 TexCoord3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	57
-	glsopcode	0x006C
 	offset		111
 
 TexCoord3f(s, t, r)
@@ -1240,18 +1896,19 @@
 	param		s		CoordF in value
 	param		t		CoordF in value
 	param		r		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord3fv
 	version		1.0
+	deprecated	3.1
 	offset		112
 
 TexCoord3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	58
-	glsopcode	0x006D
 	offset		113
 
 TexCoord3i(s, t, r)
@@ -1259,18 +1916,19 @@
 	param		s		CoordI in value
 	param		t		CoordI in value
 	param		r		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord3iv
 	version		1.0
+	deprecated	3.1
 	offset		114
 
 TexCoord3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	59
-	glsopcode	0x006E
 	offset		115
 
 TexCoord3s(s, t, r)
@@ -1278,18 +1936,19 @@
 	param		s		CoordS in value
 	param		t		CoordS in value
 	param		r		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord3sv
 	version		1.0
+	deprecated	3.1
 	offset		116
 
 TexCoord3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	60
-	glsopcode	0x006F
 	offset		117
 
 TexCoord4d(s, t, r, q)
@@ -1298,18 +1957,19 @@
 	param		t		CoordD in value
 	param		r		CoordD in value
 	param		q		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord4dv
 	version		1.0
+	deprecated	3.1
 	offset		118
 
 TexCoord4dv(v)
 	return		void
 	param		v		CoordD in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	61
-	glsopcode	0x0070
 	offset		119
 
 TexCoord4f(s, t, r, q)
@@ -1318,18 +1978,19 @@
 	param		t		CoordF in value
 	param		r		CoordF in value
 	param		q		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord4fv
 	version		1.0
+	deprecated	3.1
 	offset		120
 
 TexCoord4fv(v)
 	return		void
 	param		v		CoordF in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	62
-	glsopcode	0x0071
 	offset		121
 
 TexCoord4i(s, t, r, q)
@@ -1338,18 +1999,19 @@
 	param		t		CoordI in value
 	param		r		CoordI in value
 	param		q		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord4iv
 	version		1.0
+	deprecated	3.1
 	offset		122
 
 TexCoord4iv(v)
 	return		void
 	param		v		CoordI in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	63
-	glsopcode	0x0072
 	offset		123
 
 TexCoord4s(s, t, r, q)
@@ -1358,90 +2020,95 @@
 	param		t		CoordS in value
 	param		r		CoordS in value
 	param		q		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	TexCoord4sv
 	version		1.0
+	deprecated	3.1
 	offset		124
 
 TexCoord4sv(v)
 	return		void
 	param		v		CoordS in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	64
-	glsopcode	0x0073
 	offset		125
 
 Vertex2d(x, y)
 	return		void
 	param		x		CoordD in value
 	param		y		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex2dv
 	version		1.0
+	deprecated	3.1
 	offset		126
 
 Vertex2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	65
-	glsopcode	0x0074
 	offset		127
 
 Vertex2f(x, y)
 	return		void
 	param		x		CoordF in value
 	param		y		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex2fv
 	version		1.0
+	deprecated	3.1
 	offset		128
 
 Vertex2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	66
-	glsopcode	0x0075
 	offset		129
 
 Vertex2i(x, y)
 	return		void
 	param		x		CoordI in value
 	param		y		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex2iv
 	version		1.0
+	deprecated	3.1
 	offset		130
 
 Vertex2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	67
-	glsopcode	0x0076
 	offset		131
 
 Vertex2s(x, y)
 	return		void
 	param		x		CoordS in value
 	param		y		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex2sv
 	version		1.0
+	deprecated	3.1
 	offset		132
 
 Vertex2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	68
-	glsopcode	0x0077
 	offset		133
 
 Vertex3d(x, y, z)
@@ -1449,18 +2116,19 @@
 	param		x		CoordD in value
 	param		y		CoordD in value
 	param		z		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex3dv
 	version		1.0
+	deprecated	3.1
 	offset		134
 
 Vertex3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	69
-	glsopcode	0x0078
 	offset		135
 
 Vertex3f(x, y, z)
@@ -1468,18 +2136,19 @@
 	param		x		CoordF in value
 	param		y		CoordF in value
 	param		z		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex3fv
 	version		1.0
+	deprecated	3.1
 	offset		136
 
 Vertex3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	70
-	glsopcode	0x0079
 	offset		137
 
 Vertex3i(x, y, z)
@@ -1487,18 +2156,19 @@
 	param		x		CoordI in value
 	param		y		CoordI in value
 	param		z		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex3iv
 	version		1.0
+	deprecated	3.1
 	offset		138
 
 Vertex3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	71
-	glsopcode	0x007A
 	offset		139
 
 Vertex3s(x, y, z)
@@ -1506,18 +2176,19 @@
 	param		x		CoordS in value
 	param		y		CoordS in value
 	param		z		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex3sv
 	version		1.0
+	deprecated	3.1
 	offset		140
 
 Vertex3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	72
-	glsopcode	0x007B
 	offset		141
 
 Vertex4d(x, y, z, w)
@@ -1526,18 +2197,19 @@
 	param		y		CoordD in value
 	param		z		CoordD in value
 	param		w		CoordD in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex4dv
 	version		1.0
+	deprecated	3.1
 	offset		142
 
 Vertex4dv(v)
 	return		void
 	param		v		CoordD in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	73
-	glsopcode	0x007C
 	offset		143
 
 Vertex4f(x, y, z, w)
@@ -1546,18 +2218,19 @@
 	param		y		CoordF in value
 	param		z		CoordF in value
 	param		w		CoordF in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex4fv
 	version		1.0
+	deprecated	3.1
 	offset		144
 
 Vertex4fv(v)
 	return		void
 	param		v		CoordF in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	74
-	glsopcode	0x007D
 	offset		145
 
 Vertex4i(x, y, z, w)
@@ -1566,18 +2239,19 @@
 	param		y		CoordI in value
 	param		z		CoordI in value
 	param		w		CoordI in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex4iv
 	version		1.0
+	deprecated	3.1
 	offset		146
 
 Vertex4iv(v)
 	return		void
 	param		v		CoordI in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	75
-	glsopcode	0x007E
 	offset		147
 
 Vertex4s(x, y, z, w)
@@ -1586,64 +2260,49 @@
 	param		y		CoordS in value
 	param		z		CoordS in value
 	param		w		CoordS in value
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	vectorequiv	Vertex4sv
 	version		1.0
+	deprecated	3.1
 	offset		148
 
 Vertex4sv(v)
 	return		void
 	param		v		CoordS in array [4]
-	category	drawing
+	category	VERSION_1_0_DEPRECATED	   # old: drawing
 	version		1.0
+	deprecated	3.1
 	glxropcode	76
-	glsopcode	0x007F
 	offset		149
 
-###############################################################################
-#
-# drawing-control commands
-#
-###############################################################################
-
 ClipPlane(plane, equation)
 	return		void
 	param		plane		ClipPlaneName in value
 	param		equation	Float64 in array [4]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	77
-	glsopcode	0x0080
 	offset		150
 
 ColorMaterial(face, mode)
 	return		void
 	param		face		MaterialFace in value
 	param		mode		ColorMaterialParameter in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	78
-	glsopcode	0x0081
 	offset		151
 
-CullFace(mode)
-	return		void
-	param		mode		CullFaceMode in value
-	category	drawing-control
-	version		1.0
-	glxropcode	79
-	glsopcode	0x0082
-	offset		152
-
 Fogf(pname, param)
 	return		void
 	param		pname		FogParameter in value
 	param		param		CheckedFloat32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	80
-	glsflags	gl-enum
-	glsopcode	0x0083
 	wglflags	small-data
 	offset		153
 
@@ -1651,11 +2310,10 @@
 	return		void
 	param		pname		FogParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	81
-	glsflags	gl-enum
-	glsopcode	0x0084
 	wglflags	small-data
 	offset		154
 
@@ -1663,11 +2321,10 @@
 	return		void
 	param		pname		FogParameter in value
 	param		param		CheckedInt32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	82
-	glsflags	gl-enum
-	glsopcode	0x0085
 	wglflags	small-data
 	offset		155
 
@@ -1675,42 +2332,22 @@
 	return		void
 	param		pname		FogParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	83
-	glsflags	gl-enum
-	glsopcode	0x0086
 	wglflags	small-data
 	offset		156
 
-FrontFace(mode)
-	return		void
-	param		mode		FrontFaceDirection in value
-	category	drawing-control
-	version		1.0
-	glxropcode	84
-	glsopcode	0x0087
-	offset		157
-
-Hint(target, mode)
-	return		void
-	param		target		HintTarget in value
-	param		mode		HintMode in value
-	category	drawing-control
-	version		1.0
-	glxropcode	85
-	glsopcode	0x0088
-	offset		158
-
 Lightf(light, pname, param)
 	return		void
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		param		CheckedFloat32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	86
-	glsopcode	0x0089
 	wglflags	small-data
 	offset		159
 
@@ -1719,10 +2356,10 @@
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	87
-	glsopcode	0x008A
 	wglflags	small-data
 	offset		160
 
@@ -1731,10 +2368,10 @@
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		param		CheckedInt32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	88
-	glsopcode	0x008B
 	wglflags	small-data
 	offset		161
 
@@ -1743,10 +2380,10 @@
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	89
-	glsopcode	0x008C
 	wglflags	small-data
 	offset		162
 
@@ -1754,11 +2391,10 @@
 	return		void
 	param		pname		LightModelParameter in value
 	param		param		Float32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	90
-	glsflags	gl-enum
-	glsopcode	0x008D
 	wglflags	small-data
 	offset		163
 
@@ -1766,11 +2402,10 @@
 	return		void
 	param		pname		LightModelParameter in value
 	param		params		Float32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	91
-	glsflags	gl-enum
-	glsopcode	0x008E
 	wglflags	small-data
 	offset		164
 
@@ -1778,11 +2413,10 @@
 	return		void
 	param		pname		LightModelParameter in value
 	param		param		Int32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	92
-	glsflags	gl-enum
-	glsopcode	0x008F
 	wglflags	small-data
 	offset		165
 
@@ -1790,11 +2424,10 @@
 	return		void
 	param		pname		LightModelParameter in value
 	param		params		Int32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	93
-	glsflags	gl-enum
-	glsopcode	0x0090
 	wglflags	small-data
 	offset		166
 
@@ -1802,30 +2435,21 @@
 	return		void
 	param		factor		CheckedInt32 in value
 	param		pattern		LineStipple in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	94
-	glsopcode	0x0091
 	offset		167
 
-LineWidth(width)
-	return		void
-	param		width		CheckedFloat32 in value
-	category	drawing-control
-	version		1.0
-	glxropcode	95
-	glsopcode	0x0092
-	offset		168
-
 Materialf(face, pname, param)
 	return		void
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		param		CheckedFloat32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	96
-	glsopcode	0x0093
 	wglflags	small-data
 	offset		169
 
@@ -1834,10 +2458,10 @@
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	97
-	glsopcode	0x0094
 	wglflags	small-data
 	offset		170
 
@@ -1846,10 +2470,10 @@
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		param		CheckedInt32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	98
-	glsopcode	0x0095
 	wglflags	small-data
 	offset		171
 
@@ -1858,169 +2482,43 @@
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	99
-	glsopcode	0x0096
 	wglflags	small-data
 	offset		172
 
-PointSize(size)
-	return		void
-	param		size		CheckedFloat32 in value
-	category	drawing-control
-	version		1.0
-	glxropcode	100
-	glsopcode	0x0097
-	offset		173
-
-PolygonMode(face, mode)
-	return		void
-	param		face		MaterialFace in value
-	param		mode		PolygonMode in value
-	category	drawing-control
-	version		1.0
-	glxropcode	101
-	glsopcode	0x0098
-	offset		174
-
 PolygonStipple(mask)
 	return		void
 	param		mask		UInt8 in array [COMPSIZE()]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	102
-	glsflags	pixel-unpack
-	glsopcode	0x0099
 	wglflags	client-handcode server-handcode
 	offset		175
 
-Scissor(x, y, width, height)
-	return		void
-	param		x		WinCoord in value
-	param		y		WinCoord in value
-	param		width		SizeI in value
-	param		height		SizeI in value
-	category	drawing-control
-	version		1.0
-	glxropcode	103
-	glsopcode	0x009A
-	offset		176
-
 ShadeModel(mode)
 	return		void
 	param		mode		ShadingModel in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	104
-	glsopcode	0x009B
 	offset		177
 
-TexParameterf(target, pname, param)
-	return		void
-	param		target		TextureTarget in value
-	param		pname		TextureParameterName in value
-	param		param		CheckedFloat32 in value
-	category	drawing-control
-	version		1.0
-	glxropcode	105
-	glsflags	gl-enum
-	glsopcode	0x009C
-	wglflags	small-data
-	offset		178
-
-TexParameterfv(target, pname, params)
-	return		void
-	param		target		TextureTarget in value
-	param		pname		TextureParameterName in value
-	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	drawing-control
-	version		1.0
-	glxropcode	106
-	glsflags	gl-enum
-	glsopcode	0x009D
-	wglflags	small-data
-	offset		179
-
-TexParameteri(target, pname, param)
-	return		void
-	param		target		TextureTarget in value
-	param		pname		TextureParameterName in value
-	param		param		CheckedInt32 in value
-	category	drawing-control
-	version		1.0
-	glxropcode	107
-	glsflags	gl-enum
-	glsopcode	0x009E
-	wglflags	small-data
-	offset		180
-
-TexParameteriv(target, pname, params)
-	return		void
-	param		target		TextureTarget in value
-	param		pname		TextureParameterName in value
-	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	drawing-control
-	version		1.0
-	glxropcode	108
-	glsflags	gl-enum
-	glsopcode	0x009F
-	wglflags	small-data
-	offset		181
-
-TexImage1D(target, level, internalformat, width, border, format, type, pixels)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		internalformat	TextureComponentCount in value
-	param		width		SizeI in value
-	param		border		CheckedInt32 in value
-	param		format		PixelFormat in value
-	param		type		PixelType in value
-	param		pixels		Void in array [COMPSIZE(format/type/width)]
-	category	drawing-control
-	dlflags		handcode
-	glxflags	client-handcode server-handcode
-	version		1.0
-	glxropcode	109
-	glsflags	pixel-null pixel-unpack
-	glsopcode	0x00A0
-	wglflags	client-handcode server-handcode
-	offset		182
-
-TexImage2D(target, level, internalformat, width, height, border, format, type, pixels)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		internalformat	TextureComponentCount in value
-	param		width		SizeI in value
-	param		height		SizeI in value
-	param		border		CheckedInt32 in value
-	param		format		PixelFormat in value
-	param		type		PixelType in value
-	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
-	category	drawing-control
-	dlflags		handcode
-	glxflags	client-handcode server-handcode
-	version		1.0
-	glxropcode	110
-	glsflags	pixel-null pixel-unpack
-	glsopcode	0x00A1
-	wglflags	client-handcode server-handcode
-	offset		183
-
 TexEnvf(target, pname, param)
 	return		void
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		param		CheckedFloat32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	111
-	glsflags	gl-enum
-	glsopcode	0x00A2
 	wglflags	small-data
 	offset		184
 
@@ -2029,11 +2527,10 @@
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	112
-	glsflags	gl-enum
-	glsopcode	0x00A3
 	wglflags	small-data
 	offset		185
 
@@ -2042,11 +2539,10 @@
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		param		CheckedInt32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	113
-	glsflags	gl-enum
-	glsopcode	0x00A4
 	wglflags	small-data
 	offset		186
 
@@ -2055,11 +2551,10 @@
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	114
-	glsflags	gl-enum
-	glsopcode	0x00A5
 	wglflags	small-data
 	offset		187
 
@@ -2068,11 +2563,10 @@
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		param		Float64 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	115
-	glsflags	gl-enum
-	glsopcode	0x00A6
 	wglflags	small-data
 	offset		188
 
@@ -2081,11 +2575,10 @@
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Float64 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	116
-	glsflags	gl-enum
-	glsopcode	0x00A7
 	wglflags	small-data
 	offset		189
 
@@ -2094,11 +2587,10 @@
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		param		CheckedFloat32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	117
-	glsflags	gl-enum
-	glsopcode	0x00A8
 	wglflags	small-data
 	offset		190
 
@@ -2107,11 +2599,10 @@
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	118
-	glsflags	gl-enum
-	glsopcode	0x00A9
 	wglflags	small-data
 	offset		191
 
@@ -2120,11 +2611,10 @@
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		param		CheckedInt32 in value
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	119
-	glsflags	gl-enum
-	glsopcode	0x00AA
 	wglflags	small-data
 	offset		192
 
@@ -2133,19 +2623,14 @@
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	drawing-control
+	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
 	version		1.0
+	deprecated	3.1
 	glxropcode	120
-	glsflags	gl-enum
-	glsopcode	0x00AB
 	wglflags	small-data
 	offset		193
 
-###############################################################################
-#
 # feedback commands
-#
-###############################################################################
 
 FeedbackBuffer(size, type, buffer)
 	return		void
@@ -2154,11 +2639,10 @@
 	param		buffer		FeedbackElement out array [size] retained
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
-	category	feedback
+	category	VERSION_1_0_DEPRECATED	   # old: feedback
 	version		1.0
+	deprecated	3.1
 	glxsingle	105
-	glsflags	client
-	glsopcode	0x00AC
 	wglflags	client-handcode server-handcode batchable
 	offset		194
 
@@ -2168,265 +2652,126 @@
 	param		buffer		SelectName out array [size] retained
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
-	category	feedback
+	category	VERSION_1_0_DEPRECATED	   # old: feedback
 	version		1.0
+	deprecated	3.1
 	glxsingle	106
-	glsflags	client
-	glsopcode	0x00AD
 	wglflags	client-handcode server-handcode batchable
 	offset		195
 
 RenderMode(mode)
 	return		Int32
 	param		mode		RenderingMode in value
-	category	feedback
+	category	VERSION_1_0_DEPRECATED	   # old: feedback
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxsingle	107
-	glsopcode	0x00AE
 	wglflags	client-handcode server-handcode
 	offset		196
 
 InitNames()
 	return		void
-	category	feedback
+	category	VERSION_1_0_DEPRECATED	   # old: feedback
 	version		1.0
+	deprecated	3.1
 	glxropcode	121
-	glsopcode	0x00AF
 	offset		197
 
 LoadName(name)
 	return		void
 	param		name		SelectName in value
-	category	feedback
+	category	VERSION_1_0_DEPRECATED	   # old: feedback
 	version		1.0
+	deprecated	3.1
 	glxropcode	122
-	glsopcode	0x00B0
 	offset		198
 
 PassThrough(token)
 	return		void
 	param		token		FeedbackElement in value
-	category	feedback
+	category	VERSION_1_0_DEPRECATED	   # old: feedback
 	version		1.0
+	deprecated	3.1
 	glxropcode	123
-	glsopcode	0x00B1
 	offset		199
 
 PopName()
 	return		void
-	category	feedback
+	category	VERSION_1_0_DEPRECATED	   # old: feedback
 	version		1.0
+	deprecated	3.1
 	glxropcode	124
-	glsopcode	0x00B2
 	offset		200
 
 PushName(name)
 	return		void
 	param		name		SelectName in value
-	category	feedback
+	category	VERSION_1_0_DEPRECATED	   # old: feedback
 	version		1.0
+	deprecated	3.1
 	glxropcode	125
-	glsopcode	0x00B3
 	offset		201
 
-###############################################################################
-#
-# framebuf commands
-#
-###############################################################################
-
-DrawBuffer(mode)
-	return		void
-	param		mode		DrawBufferMode in value
-	category	framebuf
-	version		1.0
-	glxropcode	126
-	glsopcode	0x00B4
-	offset		202
-
-Clear(mask)
-	return		void
-	param		mask		ClearBufferMask in value
-	category	framebuf
-	version		1.0
-	glxropcode	127
-	glsopcode	0x00B5
-	offset		203
-
 ClearAccum(red, green, blue, alpha)
 	return		void
 	param		red		Float32 in value
 	param		green		Float32 in value
 	param		blue		Float32 in value
 	param		alpha		Float32 in value
-	category	framebuf
+	category	VERSION_1_0_DEPRECATED	   # old: framebuf
 	version		1.0
+	deprecated	3.1
 	glxropcode	128
-	glsopcode	0x00B6
 	offset		204
 
 ClearIndex(c)
 	return		void
 	param		c		MaskedColorIndexValueF in value
-	category	framebuf
+	category	VERSION_1_0_DEPRECATED	   # old: framebuf
 	version		1.0
+	deprecated	3.1
 	glxropcode	129
-	glsopcode	0x00B7
 	offset		205
 
-ClearColor(red, green, blue, alpha)
-	return		void
-	param		red		ClampedColorF in value
-	param		green		ClampedColorF in value
-	param		blue		ClampedColorF in value
-	param		alpha		ClampedColorF in value
-	category	framebuf
-	version		1.0
-	glxropcode	130
-	glsopcode	0x00B8
-	offset		206
-
-ClearStencil(s)
-	return		void
-	param		s		StencilValue in value
-	category	framebuf
-	version		1.0
-	glxropcode	131
-	glsopcode	0x00B9
-	offset		207
-
-ClearDepth(depth)
-	return		void
-	param		depth		ClampedFloat64 in value
-	category	framebuf
-	version		1.0
-	glxropcode	132
-	glsopcode	0x00BA
-	offset		208
-
-StencilMask(mask)
-	return		void
-	param		mask		MaskedStencilValue in value
-	category	framebuf
-	version		1.0
-	glxropcode	133
-	glsopcode	0x00BB
-	offset		209
-
-ColorMask(red, green, blue, alpha)
-	return		void
-	param		red		Boolean in value
-	param		green		Boolean in value
-	param		blue		Boolean in value
-	param		alpha		Boolean in value
-	category	framebuf
-	version		1.0
-	glxropcode	134
-	glsopcode	0x00BC
-	offset		210
-
-DepthMask(flag)
-	return		void
-	param		flag		Boolean in value
-	category	framebuf
-	version		1.0
-	glxropcode	135
-	glsopcode	0x00BD
-	offset		211
-
 IndexMask(mask)
 	return		void
 	param		mask		MaskedColorIndexValueI in value
-	category	framebuf
+	category	VERSION_1_0_DEPRECATED	   # old: framebuf
 	version		1.0
+	deprecated	3.1
 	glxropcode	136
-	glsopcode	0x00BE
 	offset		212
 
-###############################################################################
-#
-# misc commands
-#
-###############################################################################
-
 Accum(op, value)
 	return		void
 	param		op		AccumOp in value
 	param		value		CoordF in value
-	category	misc
+	category	VERSION_1_0_DEPRECATED	   # old: misc
 	version		1.0
+	deprecated	3.1
 	glxropcode	137
-	glsopcode	0x00BF
 	offset		213
 
-Disable(cap)
-	return		void
-	param		cap		EnableCap in value
-	category	misc
-	version		1.0
-	dlflags		handcode
-	glxflags	client-handcode client-intercept
-	glxropcode	138
-	glsflags	client
-	glsopcode	0x00C0
-	offset		214
-
-Enable(cap)
-	return		void
-	param		cap		EnableCap in value
-	category	misc
-	version		1.0
-	dlflags		handcode
-	glxflags	client-handcode client-intercept
-	glxropcode	139
-	glsflags	client
-	glsopcode	0x00C1
-	offset		215
-
-Finish()
-	return		void
-	dlflags		notlistable
-	glxflags	client-handcode server-handcode
-	category	misc
-	version		1.0
-	glxsingle	108
-	glsopcode	0x00C2
-	offset		216
-
-Flush()
-	return		void
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	category	misc
-	version		1.0
-	glxsingle	142
-	glsopcode	0x00C3
-	offset		217
-
 PopAttrib()
 	return		void
-	category	misc
+	category	VERSION_1_0_DEPRECATED	   # old: misc
 	version		1.0
+	deprecated	3.1
 	glxropcode	141
-	glsopcode	0x00C4
 	offset		218
 
 PushAttrib(mask)
 	return		void
 	param		mask		AttribMask in value
-	category	misc
+	category	VERSION_1_0_DEPRECATED	   # old: misc
 	version		1.0
+	deprecated	3.1
 	glxropcode	142
-	glsopcode	0x00C5
 	offset		219
 
-###############################################################################
-#
 # modeling commands
-#
-###############################################################################
 
 Map1d(target, u1, u2, stride, order, points)
 	return		void
@@ -2436,13 +2781,12 @@
 	param		stride		Int32 in value
 	param		order		CheckedInt32 in value
 	param		points		CoordD in array [COMPSIZE(target/stride/order)]
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	143
-	glsflags	capture-handcode
-	glsopcode	0x00C6
 	wglflags	client-handcode server-handcode
 	offset		220
 
@@ -2454,13 +2798,12 @@
 	param		stride		Int32 in value
 	param		order		CheckedInt32 in value
 	param		points		CoordF in array [COMPSIZE(target/stride/order)]
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	144
-	glsflags	capture-handcode
-	glsopcode	0x00C7
 	wglflags	client-handcode server-handcode
 	offset		221
 
@@ -2476,13 +2819,12 @@
 	param		vstride		Int32 in value
 	param		vorder		CheckedInt32 in value
 	param		points		CoordD in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	145
-	glsflags	capture-handcode
-	glsopcode	0x00C8
 	wglflags	client-handcode server-handcode
 	offset		222
 
@@ -2498,13 +2840,12 @@
 	param		vstride		Int32 in value
 	param		vorder		CheckedInt32 in value
 	param		points		CoordF in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	146
-	glsflags	capture-handcode
-	glsopcode	0x00C9
 	wglflags	client-handcode server-handcode
 	offset		223
 
@@ -2513,10 +2854,10 @@
 	param		un		Int32 in value
 	param		u1		CoordD in value
 	param		u2		CoordD in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	147
-	glsopcode	0x00CA
 	offset		224
 
 MapGrid1f(un, u1, u2)
@@ -2524,10 +2865,10 @@
 	param		un		Int32 in value
 	param		u1		CoordF in value
 	param		u2		CoordF in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	148
-	glsopcode	0x00CB
 	offset		225
 
 MapGrid2d(un, u1, u2, vn, v1, v2)
@@ -2538,10 +2879,10 @@
 	param		vn		Int32 in value
 	param		v1		CoordD in value
 	param		v2		CoordD in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	149
-	glsopcode	0x00CC
 	offset		226
 
 MapGrid2f(un, u1, u2, vn, v1, v2)
@@ -2552,80 +2893,84 @@
 	param		vn		Int32 in value
 	param		v1		CoordF in value
 	param		v2		CoordF in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	150
-	glsopcode	0x00CD
 	offset		227
 
 EvalCoord1d(u)
 	return		void
 	param		u		CoordD in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	vectorequiv	EvalCoord1dv
 	version		1.0
+	deprecated	3.1
 	offset		228
 
 EvalCoord1dv(u)
 	return		void
 	param		u		CoordD in array [1]
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	151
-	glsopcode	0x00CE
 	offset		229
 
 EvalCoord1f(u)
 	return		void
 	param		u		CoordF in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	vectorequiv	EvalCoord1fv
 	version		1.0
+	deprecated	3.1
 	offset		230
 
 EvalCoord1fv(u)
 	return		void
 	param		u		CoordF in array [1]
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	152
-	glsopcode	0x00CF
 	offset		231
 
 EvalCoord2d(u, v)
 	return		void
 	param		u		CoordD in value
 	param		v		CoordD in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	vectorequiv	EvalCoord2dv
 	version		1.0
+	deprecated	3.1
 	offset		232
 
 EvalCoord2dv(u)
 	return		void
 	param		u		CoordD in array [2]
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	153
-	glsopcode	0x00D0
 	offset		233
 
 EvalCoord2f(u, v)
 	return		void
 	param		u		CoordF in value
 	param		v		CoordF in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	vectorequiv	EvalCoord2fv
 	version		1.0
+	deprecated	3.1
 	offset		234
 
 EvalCoord2fv(u)
 	return		void
 	param		u		CoordF in array [2]
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	154
-	glsopcode	0x00D1
 	offset		235
 
 EvalMesh1(mode, i1, i2)
@@ -2633,19 +2978,19 @@
 	param		mode		MeshMode1 in value
 	param		i1		CheckedInt32 in value
 	param		i2		CheckedInt32 in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	155
-	glsopcode	0x00D2
 	offset		236
 
 EvalPoint1(i)
 	return		void
 	param		i		Int32 in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	156
-	glsopcode	0x00D3
 	offset		237
 
 EvalMesh2(mode, i1, i2, j1, j2)
@@ -2655,164 +3000,72 @@
 	param		i2		CheckedInt32 in value
 	param		j1		CheckedInt32 in value
 	param		j2		CheckedInt32 in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	157
-	glsopcode	0x00D4
 	offset		238
 
 EvalPoint2(i, j)
 	return		void
 	param		i		CheckedInt32 in value
 	param		j		CheckedInt32 in value
-	category	modeling
+	category	VERSION_1_0_DEPRECATED	   # old: modeling
 	version		1.0
+	deprecated	3.1
 	glxropcode	158
-	glsopcode	0x00D5
 	offset		239
 
-###############################################################################
-#
-# pixel-op commands
-#
-###############################################################################
-
 AlphaFunc(func, ref)
 	return		void
 	param		func		AlphaFunction in value
 	param		ref		ClampedFloat32 in value
-	category	pixel-op
+	category	VERSION_1_0_DEPRECATED	   # old: pixel-op
 	version		1.0
+	deprecated	3.1
 	glxropcode	159
-	glsopcode	0x00D6
 	offset		240
 
-BlendFunc(sfactor, dfactor)
-	return		void
-	param		sfactor		BlendingFactorSrc in value
-	param		dfactor		BlendingFactorDest in value
-	category	pixel-op
-	version		1.0
-	glxropcode	160
-	glsopcode	0x00D7
-	offset		241
-
-LogicOp(opcode)
-	return		void
-	param		opcode		LogicOp in value
-	category	pixel-op
-	version		1.0
-	glxropcode	161
-	glsopcode	0x00D8
-	offset		242
-
-StencilFunc(func, ref, mask)
-	return		void
-	param		func		StencilFunction in value
-	param		ref		ClampedStencilValue in value
-	param		mask		MaskedStencilValue in value
-	category	pixel-op
-	version		1.0
-	glxropcode	162
-	glsopcode	0x00D9
-	offset		243
-
-StencilOp(fail, zfail, zpass)
-	return		void
-	param		fail		StencilOp in value
-	param		zfail		StencilOp in value
-	param		zpass		StencilOp in value
-	category	pixel-op
-	version		1.0
-	glxropcode	163
-	glsopcode	0x00DA
-	offset		244
-
-DepthFunc(func)
-	return		void
-	param		func		DepthFunction in value
-	category	pixel-op
-	version		1.0
-	glxropcode	164
-	glsopcode	0x00DB
-	offset		245
-
-###############################################################################
-#
-# pixel-rw commands
-#
-###############################################################################
-
 PixelZoom(xfactor, yfactor)
 	return		void
 	param		xfactor		Float32 in value
 	param		yfactor		Float32 in value
-	category	pixel-rw
+	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
 	version		1.0
+	deprecated	3.1
 	glxropcode	165
-	glsopcode	0x00DC
 	offset		246
 
 PixelTransferf(pname, param)
 	return		void
 	param		pname		PixelTransferParameter in value
 	param		param		CheckedFloat32 in value
-	category	pixel-rw
+	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
 	version		1.0
+	deprecated	3.1
 	glxropcode	166
-	glsflags	gl-enum
-	glsopcode	0x00DD
 	offset		247
 
 PixelTransferi(pname, param)
 	return		void
 	param		pname		PixelTransferParameter in value
 	param		param		CheckedInt32 in value
-	category	pixel-rw
+	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
 	version		1.0
+	deprecated	3.1
 	glxropcode	167
-	glsflags	gl-enum
-	glsopcode	0x00DE
 	offset		248
 
-PixelStoref(pname, param)
-	return		void
-	param		pname		PixelStoreParameter in value
-	param		param		CheckedFloat32 in value
-	dlflags		notlistable
-	glxflags	client-handcode
-	category	pixel-rw
-	version		1.0
-	glxsingle	109
-	glsflags	client gl-enum
-	glsopcode	0x00DF
-	wglflags	batchable
-	offset		249
-
-PixelStorei(pname, param)
-	return		void
-	param		pname		PixelStoreParameter in value
-	param		param		CheckedInt32 in value
-	dlflags		notlistable
-	glxflags	client-handcode
-	category	pixel-rw
-	version		1.0
-	glxsingle	110
-	glsflags	client gl-enum
-	glsopcode	0x00E0
-	wglflags	batchable
-	offset		250
-
 PixelMapfv(map, mapsize, values)
 	return		void
 	param		map		PixelMap in value
 	param		mapsize		CheckedInt32 in value
 	param		values		Float32 in array [mapsize]
-	category	pixel-rw
+	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
 	glxflags	client-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	168
-	glsopcode	0x00E1
 	offset		251
 
 PixelMapuiv(map, mapsize, values)
@@ -2820,11 +3073,11 @@
 	param		map		PixelMap in value
 	param		mapsize		CheckedInt32 in value
 	param		values		UInt32 in array [mapsize]
-	category	pixel-rw
+	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
 	glxflags	client-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	169
-	glsopcode	0x00E2
 	offset		252
 
 PixelMapusv(map, mapsize, values)
@@ -2832,22 +3085,13 @@
 	param		map		PixelMap in value
 	param		mapsize		CheckedInt32 in value
 	param		values		UInt16 in array [mapsize]
-	category	pixel-rw
+	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
 	glxflags	client-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	170
-	glsopcode	0x00E3
 	offset		253
 
-ReadBuffer(mode)
-	return		void
-	param		mode		ReadBufferMode in value
-	category	pixel-rw
-	version		1.0
-	glxropcode	171
-	glsopcode	0x00E4
-	offset		254
-
 CopyPixels(x, y, width, height, type)
 	return		void
 	param		x		WinCoord in value
@@ -2855,31 +3099,12 @@
 	param		width		SizeI in value
 	param		height		SizeI in value
 	param		type		PixelCopyType in value
-	category	pixel-rw
+	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
 	version		1.0
+	deprecated	3.1
 	glxropcode	172
-	glsopcode	0x00E5
 	offset		255
 
-ReadPixels(x, y, width, height, format, type, pixels)
-	return		void
-	param		x		WinCoord in value
-	param		y		WinCoord in value
-	param		width		SizeI in value
-	param		height		SizeI in value
-	param		format		PixelFormat in value
-	param		type		PixelType in value
-	param		pixels		Void out array [COMPSIZE(format/type/width/height)]
-	category	pixel-rw
-	dlflags		notlistable
-	glxflags	client-handcode server-handcode
-	version		1.0
-	glxsingle	111
-	glsflags	get pixel-pack
-	glsopcode	0x00E6
-	wglflags	client-handcode server-handcode
-	offset		256
-
 DrawPixels(width, height, format, type, pixels)
 	return		void
 	param		width		SizeI in value
@@ -2887,113 +3112,37 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
-	category	pixel-rw
+	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxropcode	173
-	glsflags	pixel-unpack
-	glsopcode	0x00E7
 	wglflags	client-handcode server-handcode
 	offset		257
 
-###############################################################################
-#
-# state-req commands
-#
-###############################################################################
-
-GetBooleanv(pname, params)
-	return		void
-	param		pname		GetPName in value
-	param		params		Boolean out array [COMPSIZE(pname)]
-	category	state-req
-	dlflags		notlistable
-	glxflags	client-handcode
-	version		1.0
-	glxsingle	112
-	glsflags	client get
-	glsopcode	0x00E8
-	wglflags	small-data
-	offset		258
-
 GetClipPlane(plane, equation)
 	return		void
 	param		plane		ClipPlaneName in value
 	param		equation	Float64 out array [4]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	113
 	glxflags	client-handcode server-handcode
-	glsflags	get
-	glsopcode	0x00E9
 	offset		259
 
-GetDoublev(pname, params)
-	return		void
-	param		pname		GetPName in value
-	param		params		Float64 out array [COMPSIZE(pname)]
-	category	state-req
-	dlflags		notlistable
-	glxflags	client-handcode
-	version		1.0
-	glxsingle	114
-	glsflags	client get
-	glsopcode	0x00EA
-	wglflags	small-data
-	offset		260
-
-GetError()
-	return		ErrorCode
-	category	state-req
-	dlflags		notlistable
-	glxflags	client-handcode
-	version		1.0
-	glxsingle	115
-	glsflags	get
-	glsopcode	0x00EB
-	offset		261
-
-GetFloatv(pname, params)
-	return		void
-	param		pname		GetPName in value
-	param		params		Float32 out array [COMPSIZE(pname)]
-	category	state-req
-	dlflags		notlistable
-	glxflags	client-handcode
-	version		1.0
-	glxsingle	116
-	glsflags	client get
-	glsopcode	0x00EC
-	wglflags	small-data
-	offset		262
-
-GetIntegerv(pname, params)
-	return		void
-	param		pname		GetPName in value
-	param		params		Int32 out array [COMPSIZE(pname)]
-	category	state-req
-	dlflags		notlistable
-	glxflags	client-handcode
-	version		1.0
-	glxsingle	117
-	glsflags	client get
-	glsopcode	0x00ED
-	wglflags	small-data
-	offset		263
-
 GetLightfv(light, pname, params)
 	return		void
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	118
-	glsflags	get
-	glsopcode	0x00EE
 	wglflags	small-data
 	offset		264
 
@@ -3002,12 +3151,11 @@
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	119
-	glsflags	get
-	glsopcode	0x00EF
 	wglflags	small-data
 	offset		265
 
@@ -3016,12 +3164,11 @@
 	param		target		MapTarget in value
 	param		query		GetMapQuery in value
 	param		v		Float64 out array [COMPSIZE(target/query)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	120
-	glsflags	get
-	glsopcode	0x00F0
 	offset		266
 
 GetMapfv(target, query, v)
@@ -3029,12 +3176,11 @@
 	param		target		MapTarget in value
 	param		query		GetMapQuery in value
 	param		v		Float32 out array [COMPSIZE(target/query)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	121
-	glsflags	get
-	glsopcode	0x00F1
 	offset		267
 
 GetMapiv(target, query, v)
@@ -3042,12 +3188,11 @@
 	param		target		MapTarget in value
 	param		query		GetMapQuery in value
 	param		v		Int32 out array [COMPSIZE(target/query)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	122
-	glsflags	get
-	glsopcode	0x00F2
 	offset		268
 
 GetMaterialfv(face, pname, params)
@@ -3055,12 +3200,11 @@
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	123
-	glsflags	get
-	glsopcode	0x00F3
 	wglflags	small-data
 	offset		269
 
@@ -3069,12 +3213,11 @@
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	124
-	glsflags	get
-	glsopcode	0x00F4
 	wglflags	small-data
 	offset		270
 
@@ -3082,75 +3225,57 @@
 	return		void
 	param		map		PixelMap in value
 	param		values		Float32 out array [COMPSIZE(map)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	125
-	glsflags	get
-	glsopcode	0x00F5
 	offset		271
 
 GetPixelMapuiv(map, values)
 	return		void
 	param		map		PixelMap in value
 	param		values		UInt32 out array [COMPSIZE(map)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	126
-	glsflags	get
-	glsopcode	0x00F6
 	offset		272
 
 GetPixelMapusv(map, values)
 	return		void
 	param		map		PixelMap in value
 	param		values		UInt16 out array [COMPSIZE(map)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	127
-	glsflags	get
-	glsopcode	0x00F7
 	offset		273
 
 GetPolygonStipple(mask)
 	return		void
 	param		mask		UInt8 out array [COMPSIZE()]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.0
+	deprecated	3.1
 	glxsingle	128
-	glsflags	get pixel-pack
-	glsopcode	0x00F8
 	wglflags	client-handcode server-handcode
 	offset		274
 
-GetString(name)
-	return		String
-	param		name		StringName in value
-	category	state-req
-	dlflags		notlistable
-	glxflags	client-handcode server-handcode
-	version		1.0
-	glxsingle	129
-	glsflags	get
-	glsopcode	0x00F9
-	wglflags	client-handcode server-handcode
-	offset		275
-
 GetTexEnvfv(target, pname, params)
 	return		void
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	130
-	glsflags	get
-	glsopcode	0x00FA
 	wglflags	small-data
 	offset		276
 
@@ -3159,12 +3284,11 @@
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	131
-	glsflags	get
-	glsopcode	0x00FB
 	wglflags	small-data
 	offset		277
 
@@ -3173,12 +3297,11 @@
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Float64 out array [COMPSIZE(pname)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	132
-	glsflags	get
-	glsopcode	0x00FC
 	wglflags	small-data
 	offset		278
 
@@ -3187,12 +3310,11 @@
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	133
-	glsflags	get
-	glsopcode	0x00FD
 	wglflags	small-data
 	offset		279
 
@@ -3201,129 +3323,24 @@
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	134
-	glsflags	get
-	glsopcode	0x00FE
 	wglflags	small-data
 	offset		280
 
-GetTexImage(target, level, format, type, pixels)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		format		PixelFormat in value
-	param		type		PixelType in value
-	param		pixels		Void out array [COMPSIZE(target/level/format/type)]
-	category	state-req
-	dlflags		notlistable
-	glxflags	client-handcode server-handcode
-	version		1.0
-	glxsingle	135
-	glsflags	get pixel-pack
-	glsopcode	0x00FF
-	wglflags	client-handcode server-handcode
-	offset		281
-
-GetTexParameterfv(target, pname, params)
-	return		void
-	param		target		TextureTarget in value
-	param		pname		GetTextureParameter in value
-	param		params		Float32 out array [COMPSIZE(pname)]
-	category	state-req
-	dlflags		notlistable
-	version		1.0
-	glxsingle	136
-	glsflags	get
-	glsopcode	0x0100
-	wglflags	small-data
-	offset		282
-
-GetTexParameteriv(target, pname, params)
-	return		void
-	param		target		TextureTarget in value
-	param		pname		GetTextureParameter in value
-	param		params		Int32 out array [COMPSIZE(pname)]
-	category	state-req
-	dlflags		notlistable
-	version		1.0
-	glxsingle	137
-	glsflags	get
-	glsopcode	0x0101
-	wglflags	small-data
-	offset		283
-
-GetTexLevelParameterfv(target, level, pname, params)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		pname		GetTextureParameter in value
-	param		params		Float32 out array [COMPSIZE(pname)]
-	category	state-req
-	dlflags		notlistable
-	version		1.0
-	glxsingle	138
-	glsflags	get
-	glsopcode	0x0102
-	wglflags	small-data
-	offset		284
-
-GetTexLevelParameteriv(target, level, pname, params)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		pname		GetTextureParameter in value
-	param		params		Int32 out array [COMPSIZE(pname)]
-	category	state-req
-	dlflags		notlistable
-	version		1.0
-	glxsingle	139
-	glsflags	get
-	glsopcode	0x0103
-	wglflags	small-data
-	offset		285
-
-IsEnabled(cap)
-	return		Boolean
-	param		cap		EnableCap in value
-	category	state-req
-	dlflags		notlistable
-	version		1.0
-	glxflags	client-handcode client-intercept
-	glxsingle	140
-	glsflags	client get
-	glsopcode	0x0104
-	offset		286
-
 IsList(list)
 	return		Boolean
 	param		list		List in value
-	category	state-req
+	category	VERSION_1_0_DEPRECATED	   # old: state-req
 	dlflags		notlistable
 	version		1.0
+	deprecated	3.1
 	glxsingle	141
-	glsflags	get
-	glsopcode	0x0105
 	offset		287
 
-###############################################################################
-#
-# xform commands
-#
-###############################################################################
-
-DepthRange(near, far)
-	return		void
-	param		near		ClampedFloat64 in value
-	param		far		ClampedFloat64 in value
-	category	xform
-	version		1.0
-	glxropcode	174
-	glsopcode	0x0106
-	offset		288
-
 Frustum(left, right, bottom, top, zNear, zFar)
 	return		void
 	param		left		Float64 in value
@@ -3332,67 +3349,63 @@
 	param		top		Float64 in value
 	param		zNear		Float64 in value
 	param		zFar		Float64 in value
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	175
-	glsopcode	0x0107
 	offset		289
 
 LoadIdentity()
 	return		void
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	176
-	glsopcode	0x0108
 	offset		290
 
 LoadMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	177
-	glsflags	matrix
-	glsopcode	0x0109
 	offset		291
 
 LoadMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	178
-	glsflags	matrix
-	glsopcode	0x010A
 	offset		292
 
 MatrixMode(mode)
 	return		void
 	param		mode		MatrixMode in value
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	179
-	glsopcode	0x010B
 	offset		293
 
 MultMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	180
-	glsflags	matrix
-	glsopcode	0x010C
 	offset		294
 
 MultMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	181
-	glsflags	matrix
-	glsopcode	0x010D
 	offset		295
 
 Ortho(left, right, bottom, top, zNear, zFar)
@@ -3403,26 +3416,26 @@
 	param		top		Float64 in value
 	param		zNear		Float64 in value
 	param		zFar		Float64 in value
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	182
-	glsopcode	0x010E
 	offset		296
 
 PopMatrix()
 	return		void
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	183
-	glsopcode	0x010F
 	offset		297
 
 PushMatrix()
 	return		void
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	184
-	glsopcode	0x0110
 	offset		298
 
 Rotated(angle, x, y, z)
@@ -3431,10 +3444,10 @@
 	param		x		Float64 in value
 	param		y		Float64 in value
 	param		z		Float64 in value
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	185
-	glsopcode	0x0111
 	offset		299
 
 Rotatef(angle, x, y, z)
@@ -3443,10 +3456,10 @@
 	param		x		Float32 in value
 	param		y		Float32 in value
 	param		z		Float32 in value
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	186
-	glsopcode	0x0112
 	offset		300
 
 Scaled(x, y, z)
@@ -3454,10 +3467,10 @@
 	param		x		Float64 in value
 	param		y		Float64 in value
 	param		z		Float64 in value
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	187
-	glsopcode	0x0113
 	offset		301
 
 Scalef(x, y, z)
@@ -3465,10 +3478,10 @@
 	param		x		Float32 in value
 	param		y		Float32 in value
 	param		z		Float32 in value
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	188
-	glsopcode	0x0114
 	offset		302
 
 Translated(x, y, z)
@@ -3476,10 +3489,10 @@
 	param		x		Float64 in value
 	param		y		Float64 in value
 	param		z		Float64 in value
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	189
-	glsopcode	0x0115
 	offset		303
 
 Translatef(x, y, z)
@@ -3487,76 +3500,30 @@
 	param		x		Float32 in value
 	param		y		Float32 in value
 	param		z		Float32 in value
-	category	xform
+	category	VERSION_1_0_DEPRECATED	   # old: xform
 	version		1.0
+	deprecated	3.1
 	glxropcode	190
-	glsopcode	0x0116
 	offset		304
 
-Viewport(x, y, width, height)
-	return		void
-	param		x		WinCoord in value
-	param		y		WinCoord in value
-	param		width		SizeI in value
-	param		height		SizeI in value
-	category	xform
-	version		1.0
-	glxropcode	191
-	glsopcode	0x0117
-	offset		305
-
 ###############################################################################
+###############################################################################
 #
 # OpenGL 1.1 commands
 #
 ###############################################################################
+###############################################################################
 
-ArrayElement(i)
-	return		void
-	param		i		Int32 in value
-	category	1_1
-	dlflags		handcode
-	glxflags	client-handcode client-intercept server-handcode
-	version		1.1
-	glsopcode	0x013E
-	offset		306
-
-ColorPointer(size, type, stride, pointer)
-	return		void
-	param		size		Int32 in value
-	param		type		ColorPointerType in value
-	param		stride		SizeI in value
-	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	1_1
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	version		1.1
-	glsflags	client
-	glsopcode	0x0152
-	offset		308
-
-DisableClientState(array)
-	return		void
-	param		array		EnableCap in value
-	category	1_1
-	version		1.1
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	glsflags	client
-	glsopcode	0x0153
-	offset		309
-
 DrawArrays(mode, first, count)
 	return		void
 	param		mode		BeginMode in value
 	param		first		Int32 in value
 	param		count		SizeI in value
-	category	1_1
+	category	VERSION_1_1
 	dlflags		handcode
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
 	glxropcode	193
-	glsopcode	0x0258
 	offset		310
 
 DrawElements(mode, count, type, indices)
@@ -3565,123 +3532,29 @@
 	param		count		SizeI in value
 	param		type		DrawElementsType in value
 	param		indices		Void in array [COMPSIZE(count/type)]
-	category	1_1
+	category	VERSION_1_1
 	dlflags		handcode
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
-	glsopcode	0x0154
 	offset		311
 
-EdgeFlagPointer(stride, pointer)
-	return		void
-	param		stride		SizeI in value
-	param		pointer		Void in array [COMPSIZE(stride)] retained
-	category	1_1
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	version		1.1
-	glsflags	client
-	glsopcode	0x0155
-	offset		312
-
-EnableClientState(array)
-	return		void
-	param		array		EnableCap in value
-	category	1_1
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	version		1.1
-	glsflags	client
-	glsopcode	0x0156
-	offset		313
-
 GetPointerv(pname, params)
 	return		void
 	param		pname		GetPointervPName in value
 	param		params		VoidPointer out array [1]
-	category	1_1
+	category	VERSION_1_1
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
-	glsflags	client get
-	glsopcode	0x0142
 	offset		329
 
-IndexPointer(type, stride, pointer)
-	return		void
-	param		type		IndexPointerType in value
-	param		stride		SizeI in value
-	param		pointer		Void in array [COMPSIZE(type/stride)] retained
-	category	1_1
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	version		1.1
-	glsflags	client
-	glsopcode	0x0157
-	offset		314
-
-InterleavedArrays(format, stride, pointer)
-	return		void
-	param		format		InterleavedArrayFormat in value
-	param		stride		SizeI in value
-	param		pointer		Void in array [COMPSIZE(format/stride)] retained
-	category	1_1
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	version		1.1
-	glsflags	client
-	glsopcode	0x0158
-	offset		317
-
-NormalPointer(type, stride, pointer)
-	return		void
-	param		type		NormalPointerType in value
-	param		stride		SizeI in value
-	param		pointer		Void in array [COMPSIZE(type/stride)] retained
-	category	1_1
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	version		1.1
-	glsflags	client
-	glsopcode	0x0159
-	offset		318
-
-TexCoordPointer(size, type, stride, pointer)
-	return		void
-	param		size		Int32 in value
-	param		type		TexCoordPointerType in value
-	param		stride		SizeI in value
-	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	1_1
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	version		1.1
-	glsflags	client
-	glsopcode	0x015A
-	offset		320
-
-VertexPointer(size, type, stride, pointer)
-	return		void
-	param		size		Int32 in value
-	param		type		VertexPointerType in value
-	param		stride		SizeI in value
-	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	1_1
-	dlflags		notlistable
-	glxflags	client-handcode client-intercept server-handcode
-	version		1.1
-	glsflags	client
-	glsopcode	0x015B
-	offset		321
-
 PolygonOffset(factor, units)
 	return		void
 	param		factor		Float32 in value
 	param		units		Float32 in value
-	category	1_1
+	category	VERSION_1_1
 	version		1.1
 	glxropcode	192
-	glsopcode	0x015C
 	offset		319
 
 # Arguably TexelInternalFormat, not PixelInternalFormat
@@ -3694,11 +3567,10 @@
 	param		y		WinCoord in value
 	param		width		SizeI in value
 	param		border		CheckedInt32 in value
-	category	1_1
+	category	VERSION_1_1
 	version		1.1
 	glxropcode	4119
 	glxflags	EXT
-	glsopcode	0x014D
 	offset		323
 
 # Arguably TexelInternalFormat, not PixelInternalFormat
@@ -3712,11 +3584,10 @@
 	param		width		SizeI in value
 	param		height		SizeI in value
 	param		border		CheckedInt32 in value
-	category	1_1
+	category	VERSION_1_1
 	version		1.1
 	glxropcode	4120
 	glxflags	EXT
-	glsopcode	0x014E
 	offset		324
 
 CopyTexSubImage1D(target, level, xoffset, x, y, width)
@@ -3727,11 +3598,10 @@
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	1_1
+	category	VERSION_1_1
 	version		1.1
 	glxropcode	4121
 	glxflags	EXT
-	glsopcode	0x014F
 	offset		325
 
 CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height)
@@ -3744,11 +3614,10 @@
 	param		y		WinCoord in value
 	param		width		SizeI in value
 	param		height		SizeI in value
-	category	1_1
+	category	VERSION_1_1
 	version		1.1
 	glxropcode	4122
 	glxflags	EXT
-	glsopcode	0x0150
 	offset		326
 
 TexSubImage1D(target, level, xoffset, width, format, type, pixels)
@@ -3760,13 +3629,11 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		pixels		Void in array [COMPSIZE(format/type/width)]
-	category	1_1
+	category	VERSION_1_1
 	dlflags		handcode
 	glxflags	EXT client-handcode server-handcode
 	version		1.1
 	glxropcode	4099
-	glsflags	pixel-unpack
-	glsopcode	0x0123
 	offset		332
 
 TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels)
@@ -3780,88 +3647,204 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
-	category	1_1
+	category	VERSION_1_1
 	dlflags		handcode
 	glxflags	EXT client-handcode server-handcode
 	version		1.1
 	glxropcode	4100
-	glsflags	pixel-unpack
-	glsopcode	0x0124
 	offset		333
 
-AreTexturesResident(n, textures, residences)
-	return		Boolean
-	param		n		SizeI in value
-	param		textures	Texture in array [n]
-	param		residences	Boolean out array [n]
-	category	1_1
-	glxsingle	143
-	dlflags		notlistable
-	version		1.1
-	glsflags	get
-	glsopcode	0x0259
-	offset		322
-
 BindTexture(target, texture)
 	return		void
 	param		target		TextureTarget in value
 	param		texture		Texture in value
-	category	1_1
+	category	VERSION_1_1
 	version		1.1
 	glxropcode	4117
 	glxflags	EXT
-	glsopcode	0x0148
 	offset		307
 
 DeleteTextures(n, textures)
 	return		void
 	param		n		SizeI in value
 	param		textures	Texture in array [n]
-	category	1_1
+	category	VERSION_1_1
 	dlflags		notlistable
 	version		1.1
 	glxsingle	144
-	glsopcode	0x025A
 	offset		327
 
 GenTextures(n, textures)
 	return		void
 	param		n		SizeI in value
 	param		textures	Texture out array [n]
-	category	1_1
+	category	VERSION_1_1
 	dlflags		notlistable
 	version		1.1
 	glxsingle	145
-	glsopcode	0x025B
 	offset		328
 
 IsTexture(texture)
 	return		Boolean
 	param		texture		Texture in value
-	category	1_1
+	category	VERSION_1_1
 	dlflags		notlistable
 	version		1.1
 	glxsingle	146
-	glsflags	get
-	glsopcode	0x025C
 	offset		330
 
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.1 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+ArrayElement(i)
+	return		void
+	param		i		Int32 in value
+	category	VERSION_1_1_DEPRECATED
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		306
+
+ColorPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_1_DEPRECATED
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		308
+
+DisableClientState(array)
+	return		void
+	param		array		EnableCap in value
+	category	VERSION_1_1_DEPRECATED
+	version		1.1
+	deprecated	3.1
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	offset		309
+
+EdgeFlagPointer(stride, pointer)
+	return		void
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(stride)] retained
+	category	VERSION_1_1_DEPRECATED
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		312
+
+EnableClientState(array)
+	return		void
+	param		array		EnableCap in value
+	category	VERSION_1_1_DEPRECATED
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		313
+
+IndexPointer(type, stride, pointer)
+	return		void
+	param		type		IndexPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	VERSION_1_1_DEPRECATED
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		314
+
+InterleavedArrays(format, stride, pointer)
+	return		void
+	param		format		InterleavedArrayFormat in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(format/stride)] retained
+	category	VERSION_1_1_DEPRECATED
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		317
+
+NormalPointer(type, stride, pointer)
+	return		void
+	param		type		NormalPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	VERSION_1_1_DEPRECATED
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		318
+
+TexCoordPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		TexCoordPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_1_DEPRECATED
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		320
+
+VertexPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_1_DEPRECATED
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		321
+
+AreTexturesResident(n, textures, residences)
+	return		Boolean
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	param		residences	Boolean out array [n]
+	category	VERSION_1_1_DEPRECATED
+	glxsingle	143
+	dlflags		notlistable
+	version		1.1
+	deprecated	3.1
+	offset		322
+
 PrioritizeTextures(n, textures, priorities)
 	return		void
 	param		n		SizeI in value
 	param		textures	Texture in array [n]
 	param		priorities	ClampedFloat32 in array [n]
-	category	1_1
+	category	VERSION_1_1_DEPRECATED
 	version		1.1
+	deprecated	3.1
 	glxropcode	4118
 	glxflags	EXT
-	glsopcode	0x014C
 	offset		331
 
 Indexub(c)
 	return		void
 	param		c		ColorIndexValueUB in value
-	category	1_1
+	category	VERSION_1_1_DEPRECATED
 	vectorequiv	Indexubv
 	version		1.1
 	offset		315
@@ -3869,31 +3852,28 @@
 Indexubv(c)
 	return		void
 	param		c		ColorIndexValueUB in array [1]
-	category	1_1
+	category	VERSION_1_1_DEPRECATED
 	version		1.1
 	glxropcode	194
-	glsopcode	0x015D
 	offset		316
 
 PopClientAttrib()
 	return		void
-	category	1_1
+	category	VERSION_1_1_DEPRECATED
 	version		1.1
+	deprecated	3.1
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
-	glsflags	client
-	glsopcode	0x015E
 	offset		334
 
 PushClientAttrib(mask)
 	return		void
 	param		mask		ClientAttribMask in value
-	category	1_1
+	category	VERSION_1_1_DEPRECATED
 	version		1.1
+	deprecated	3.1
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
-	glsflags	client
-	glsopcode	0x015F
 	offset		335
 
 ###############################################################################
@@ -3914,7 +3894,6 @@
 	glxflags	EXT
 	version		1.2
 	glxropcode	4096
-	glsopcode	0x0120
 	offset		336
 
 BlendEquation(mode)
@@ -3924,7 +3903,6 @@
 	glxflags	EXT
 	version		1.2
 	glxropcode	4097
-	glsopcode	0x0121
 	offset		337
 
 DrawRangeElements(mode, start, end, count, type, indices)
@@ -3939,9 +3917,78 @@
 	dlflags		handcode
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.2
-	glsopcode	0x0190
 	offset		338
 
+# OpenGL 1.2 (EXT_texture3D) commands
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureComponentCount in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	VERSION_1_2
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4114
+	offset		371
+
+TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	VERSION_1_2
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	glxropcode	4115
+	offset		372
+
+# OpenGL 1.2 (EXT_copy_texture) commands (specific to texture3D)
+
+CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_2
+	glxflags	EXT
+	version		1.2
+	glxropcode	4123
+	offset		373
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.2 deprecated commands
+#
+###############################################################################
+###############################################################################
+
 # OpenGL 1.2 (SGI_color_table) commands
 
 ColorTable(target, internalformat, width, format, type, table)
@@ -3952,13 +3999,12 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		table		Void in array [COMPSIZE(format/type/width)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	2053
-	glsflags	pixel-unpack
-	glsopcode	0x0167
 	offset		339
 
 ColorTableParameterfv(target, pname, params)
@@ -3966,11 +4012,11 @@
 	param		target		ColorTableTarget in value
 	param		pname		ColorTableParameterPName in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	2054
-	glsopcode	0x0168
 	offset		340
 
 ColorTableParameteriv(target, pname, params)
@@ -3978,11 +4024,11 @@
 	param		target		ColorTableTarget in value
 	param		pname		ColorTableParameterPName in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	2055
-	glsopcode	0x0169
 	offset		341
 
 CopyColorTable(target, internalformat, x, y, width)
@@ -3992,11 +4038,11 @@
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	2056
-	glsopcode	0x016A
 	offset		342
 
 GetColorTable(target, format, type, table)
@@ -4005,13 +4051,12 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		table		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
+	deprecated	3.1
 	glxsingle	147
-	glsflags	get pixel-pack
-	glsopcode	0x025D
 	offset		343
 
 GetColorTableParameterfv(target, pname, params)
@@ -4019,12 +4064,11 @@
 	param		target		ColorTableTarget in value
 	param		pname		GetColorTableParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	version		1.2
+	deprecated	3.1
 	glxsingle	148
-	glsflags	get
-	glsopcode	0x025E
 	offset		344
 
 GetColorTableParameteriv(target, pname, params)
@@ -4032,12 +4076,11 @@
 	param		target		ColorTableTarget in value
 	param		pname		GetColorTableParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	version		1.2
+	deprecated	3.1
 	glxsingle	149
-	glsflags	get
-	glsopcode	0x025F
 	offset		345
 
 # OpenGL 1.2 (EXT_color_subtable) commands
@@ -4050,13 +4093,12 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		data		Void in array [COMPSIZE(format/type/count)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.2
+	deprecated	3.1
 	glxropcode	195
-	glsflags	pixel-unpack
-	glsopcode	0x018E
 	offset		346
 
 CopyColorSubTable(target, start, x, y, width)
@@ -4066,10 +4108,10 @@
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	version		1.2
+	deprecated	3.1
 	glxropcode	196
-	glsopcode	0x018F
 	offset		347
 
 # OpenGL 1.2 (EXT_convolution) commands
@@ -4082,13 +4124,12 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		image		Void in array [COMPSIZE(format/type/width)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4101
-	glsflags	pixel-unpack
-	glsopcode	0x0125
 	offset		348
 
 ConvolutionFilter2D(target, internalformat, width, height, format, type, image)
@@ -4100,13 +4141,12 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		image		Void in array [COMPSIZE(format/type/width/height)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4102
-	glsflags	pixel-unpack
-	glsopcode	0x0126
 	offset		349
 
 ConvolutionParameterf(target, pname, params)
@@ -4114,12 +4154,11 @@
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedFloat32 in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4103
-	glsflags	gl-enum
-	glsopcode	0x0127
 	offset		350
 
 ConvolutionParameterfv(target, pname, params)
@@ -4127,12 +4166,11 @@
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4104
-	glsflags	gl-enum
-	glsopcode	0x0128
 	offset		351
 
 ConvolutionParameteri(target, pname, params)
@@ -4140,12 +4178,11 @@
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedInt32 in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4105
-	glsflags	gl-enum
-	glsopcode	0x0129
 	offset		352
 
 ConvolutionParameteriv(target, pname, params)
@@ -4153,12 +4190,11 @@
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4106
-	glsflags	gl-enum
-	glsopcode	0x012A
 	offset		353
 
 CopyConvolutionFilter1D(target, internalformat, x, y, width)
@@ -4168,11 +4204,11 @@
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4107
-	glsopcode	0x012B
 	offset		354
 
 CopyConvolutionFilter2D(target, internalformat, x, y, width, height)
@@ -4183,11 +4219,11 @@
 	param		y		WinCoord in value
 	param		width		SizeI in value
 	param		height		SizeI in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4108
-	glsopcode	0x012C
 	offset		355
 
 GetConvolutionFilter(target, format, type, image)
@@ -4196,13 +4232,12 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		image		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
+	deprecated	3.1
 	glxsingle	150
-	glsflags	get pixel-pack
-	glsopcode	0x0260
 	offset		356
 
 GetConvolutionParameterfv(target, pname, params)
@@ -4210,12 +4245,11 @@
 	param		target		ConvolutionTarget in value
 	param		pname		GetConvolutionParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	version		1.2
+	deprecated	3.1
 	glxsingle	151
-	glsflags	get
-	glsopcode	0x0261
 	offset		357
 
 GetConvolutionParameteriv(target, pname, params)
@@ -4223,12 +4257,11 @@
 	param		target		ConvolutionTarget in value
 	param		pname		GetConvolutionParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	version		1.2
+	deprecated	3.1
 	glxsingle	152
-	glsflags	get
-	glsopcode	0x0262
 	offset		358
 
 GetSeparableFilter(target, format, type, row, column, span)
@@ -4239,13 +4272,12 @@
 	param		row		Void out array [COMPSIZE(target/format/type)]
 	param		column		Void out array [COMPSIZE(target/format/type)]
 	param		span		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
+	deprecated	3.1
 	glxsingle	153
-	glsflags	get pixel-pack
-	glsopcode	0x0263
 	offset		359
 
 SeparableFilter2D(target, internalformat, width, height, format, type, row, column)
@@ -4258,13 +4290,12 @@
 	param		type		PixelType in value
 	param		row		Void in array [COMPSIZE(target/format/type/width)]
 	param		column		Void in array [COMPSIZE(target/format/type/height)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4109
-	glsflags	pixel-unpack
-	glsopcode	0x0131
 	offset		360
 
 # OpenGL 1.2 (EXT_histogram) commands
@@ -4276,13 +4307,12 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		values		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
+	deprecated	3.1
 	glxsingle	154
-	glsflags	get pixel-pack
-	glsopcode	0x0264
 	offset		361
 
 GetHistogramParameterfv(target, pname, params)
@@ -4290,12 +4320,11 @@
 	param		target		HistogramTarget in value
 	param		pname		GetHistogramParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	version		1.2
+	deprecated	3.1
 	glxsingle	155
-	glsflags	get
-	glsopcode	0x0265
 	offset		362
 
 GetHistogramParameteriv(target, pname, params)
@@ -4303,12 +4332,11 @@
 	param		target		HistogramTarget in value
 	param		pname		GetHistogramParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	version		1.2
+	deprecated	3.1
 	glxsingle	156
-	glsflags	get
-	glsopcode	0x0266
 	offset		363
 
 GetMinmax(target, reset, format, type, values)
@@ -4318,13 +4346,12 @@
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		values		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
+	deprecated	3.1
 	glxsingle	157
-	glsflags	get pixel-pack
-	glsopcode	0x0267
 	offset		364
 
 GetMinmaxParameterfv(target, pname, params)
@@ -4332,12 +4359,11 @@
 	param		target		MinmaxTarget in value
 	param		pname		GetMinmaxParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	version		1.2
+	deprecated	3.1
 	glxsingle	158
-	glsflags	get
-	glsopcode	0x0268
 	offset		365
 
 GetMinmaxParameteriv(target, pname, params)
@@ -4345,12 +4371,11 @@
 	param		target		MinmaxTarget in value
 	param		pname		GetMinmaxParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		notlistable
 	version		1.2
+	deprecated	3.1
 	glxsingle	159
-	glsflags	get
-	glsopcode	0x0269
 	offset		366
 
 Histogram(target, width, internalformat, sink)
@@ -4359,12 +4384,12 @@
 	param		width		SizeI in value
 	param		internalformat	PixelInternalFormat in value
 	param		sink		Boolean in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	dlflags		handcode
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4110
-	glsopcode	0x0138
 	offset		367
 
 Minmax(target, internalformat, sink)
@@ -4372,61 +4397,127 @@
 	param		target		MinmaxTarget in value
 	param		internalformat	PixelInternalFormat in value
 	param		sink		Boolean in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4111
-	glsopcode	0x0139
 	offset		368
 
 ResetHistogram(target)
 	return		void
 	param		target		HistogramTarget in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4112
-	glsopcode	0x013A
 	offset		369
 
 ResetMinmax(target)
 	return		void
 	param		target		MinmaxTarget in value
-	category	VERSION_1_2
+	category	VERSION_1_2_DEPRECATED
 	glxflags	EXT
 	version		1.2
+	deprecated	3.1
 	glxropcode	4113
-	glsopcode	0x013B
 	offset		370
 
-# OpenGL 1.2 (EXT_texture3D) commands
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.3 commands
+#
+###############################################################################
+###############################################################################
 
+# OpenGL 1.3 (ARB_multitexture) commands
+
+ActiveTexture(texture)
+	return		void
+	param		texture		TextureUnit in value
+	category	VERSION_1_3
+	glxflags	ARB
+	version		1.3
+	glxropcode	197
+	offset		374
+
+# OpenGL 1.3 (ARB_multisample) commands
+
+SampleCoverage(value, invert)
+	return		void
+	param		value		ClampedFloat32 in value
+	param		invert		Boolean in value
+	category	VERSION_1_3
+	glxflags	ARB
+	version		1.3
+	glxropcode	229
+	offset		412
+
+# OpenGL 1.3 (ARB_texture_compression) commands
+
 # Arguably TexelInternalFormat, not PixelInternalFormat
-TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels)
+CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data)
 	return		void
 	param		target		TextureTarget in value
 	param		level		CheckedInt32 in value
-	param		internalformat	TextureComponentCount in value
+	param		internalformat	PixelInternalFormat in value
 	param		width		SizeI in value
 	param		height		SizeI in value
 	param		depth		SizeI in value
 	param		border		CheckedInt32 in value
-	param		format		PixelFormat in value
-	param		type		PixelType in value
-	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
-	category	VERSION_1_2
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
 	dlflags		handcode
-	glxflags	client-handcode server-handcode EXT
-	version		1.2
-	glxropcode	4114
-	glsflags	pixel-null pixel-unpack
-	glsopcode	0x013C
-	offset		371
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	216
+	wglflags	client-handcode server-handcode
+	offset		554
 
-TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data)
 	return		void
 	param		target		TextureTarget in value
 	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	215
+	wglflags	client-handcode server-handcode
+	offset		555
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	214
+	wglflags	client-handcode server-handcode
+	offset		556
+
+CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
 	param		xoffset		CheckedInt32 in value
 	param		yoffset		CheckedInt32 in value
 	param		zoffset		CheckedInt32 in value
@@ -4434,75 +4525,91 @@
 	param		height		SizeI in value
 	param		depth		SizeI in value
 	param		format		PixelFormat in value
-	param		type		PixelType in value
-	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
-	category	VERSION_1_2
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
 	dlflags		handcode
-	glxflags	client-handcode server-handcode EXT
-	version		1.2
-	glxropcode	4115
-	glsflags	pixel-unpack
-	glsopcode	0x013D
-	offset		372
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	219
+	wglflags	client-handcode server-handcode
+	offset		557
 
-# OpenGL 1.2 (EXT_copy_texture) commands (specific to texture3D)
-
-CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height)
+CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data)
 	return		void
 	param		target		TextureTarget in value
 	param		level		CheckedInt32 in value
 	param		xoffset		CheckedInt32 in value
 	param		yoffset		CheckedInt32 in value
-	param		zoffset		CheckedInt32 in value
-	param		x		WinCoord in value
-	param		y		WinCoord in value
 	param		width		SizeI in value
 	param		height		SizeI in value
-	category	VERSION_1_2
-	glxflags	EXT
-	version		1.2
-	glxropcode	4123
-	glsopcode	0x0151
-	offset		373
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	218
+	wglflags	client-handcode server-handcode
+	offset		558
 
+CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	217
+	wglflags	client-handcode server-handcode
+	offset		559
+
+GetCompressedTexImage(target, level, img)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		img		CompressedTextureARB out array [COMPSIZE(target/level)]
+	category	VERSION_1_3
+	dlflags		notlistable
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxsingle	160
+	wglflags	client-handcode server-handcode
+	offset		560
+
 ###############################################################################
 ###############################################################################
 #
-# OpenGL 1.3 commands
+# OpenGL 1.3 deprecated commands
 #
 ###############################################################################
 ###############################################################################
 
-# OpenGL 1.3 (ARB_multitexture) commands
-
-ActiveTexture(texture)
-	return		void
-	param		texture		TextureUnit in value
-	category	VERSION_1_3
-	glxflags	ARB
-	version		1.3
-	glxropcode	197
-	glsopcode	0x01B1
-	offset		374
-
 ClientActiveTexture(texture)
 	return		void
 	param		texture		TextureUnit in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	dlflags		notlistable
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
-	glsflags	client
-	glsopcode	0x01B2
+	deprecated	3.1
 	offset		375
 
 MultiTexCoord1d(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordD in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord1dv
 	offset		376
 
@@ -4510,20 +4617,21 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [1]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	198
-	glsopcode	0x01B3
 	offset		377
 
 MultiTexCoord1f(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordF in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord1fv
 	offset		378
 
@@ -4531,20 +4639,21 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [1]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	199
-	glsopcode	0x01B4
 	offset		379
 
 MultiTexCoord1i(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordI in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord1iv
 	offset		380
 
@@ -4552,20 +4661,21 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [1]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	200
-	glsopcode	0x01B5
 	offset		381
 
 MultiTexCoord1s(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordS in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord1sv
 	offset		382
 
@@ -4573,11 +4683,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [1]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	201
-	glsopcode	0x01B6
 	offset		383
 
 MultiTexCoord2d(target, s, t)
@@ -4585,9 +4695,10 @@
 	param		target		TextureUnit in value
 	param		s		CoordD in value
 	param		t		CoordD in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord2dv
 	offset		384
 
@@ -4595,11 +4706,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [2]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	202
-	glsopcode	0x01B7
 	offset		385
 
 MultiTexCoord2f(target, s, t)
@@ -4607,9 +4718,10 @@
 	param		target		TextureUnit in value
 	param		s		CoordF in value
 	param		t		CoordF in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord2fv
 	offset		386
 
@@ -4617,11 +4729,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [2]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	203
-	glsopcode	0x01B8
 	offset		387
 
 MultiTexCoord2i(target, s, t)
@@ -4629,9 +4741,10 @@
 	param		target		TextureUnit in value
 	param		s		CoordI in value
 	param		t		CoordI in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord2iv
 	offset		388
 
@@ -4639,11 +4752,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [2]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	204
-	glsopcode	0x01B9
 	offset		389
 
 MultiTexCoord2s(target, s, t)
@@ -4651,9 +4764,10 @@
 	param		target		TextureUnit in value
 	param		s		CoordS in value
 	param		t		CoordS in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord2sv
 	offset		390
 
@@ -4661,11 +4775,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [2]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	205
-	glsopcode	0x01BA
 	offset		391
 
 MultiTexCoord3d(target, s, t, r)
@@ -4674,9 +4788,10 @@
 	param		s		CoordD in value
 	param		t		CoordD in value
 	param		r		CoordD in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord3dv
 	offset		392
 
@@ -4684,11 +4799,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [3]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	206
-	glsopcode	0x01BB
 	offset		393
 
 MultiTexCoord3f(target, s, t, r)
@@ -4697,9 +4812,10 @@
 	param		s		CoordF in value
 	param		t		CoordF in value
 	param		r		CoordF in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord3fv
 	offset		394
 
@@ -4707,11 +4823,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [3]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	207
-	glsopcode	0x01BC
 	offset		395
 
 MultiTexCoord3i(target, s, t, r)
@@ -4720,9 +4836,10 @@
 	param		s		CoordI in value
 	param		t		CoordI in value
 	param		r		CoordI in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord3iv
 	offset		396
 
@@ -4730,11 +4847,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [3]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	208
-	glsopcode	0x01BD
 	offset		397
 
 MultiTexCoord3s(target, s, t, r)
@@ -4743,9 +4860,10 @@
 	param		s		CoordS in value
 	param		t		CoordS in value
 	param		r		CoordS in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord3sv
 	offset		398
 
@@ -4753,11 +4871,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [3]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	version		1.3
+	deprecated	3.1
 	glxflags	ARB
 	glxropcode	209
-	glsopcode	0x01BE
 	offset		399
 
 MultiTexCoord4d(target, s, t, r, q)
@@ -4767,9 +4885,10 @@
 	param		t		CoordD in value
 	param		r		CoordD in value
 	param		q		CoordD in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord4dv
 	offset		400
 
@@ -4777,11 +4896,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [4]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	210
-	glsopcode	0x01BF
 	offset		401
 
 MultiTexCoord4f(target, s, t, r, q)
@@ -4791,9 +4910,10 @@
 	param		t		CoordF in value
 	param		r		CoordF in value
 	param		q		CoordF in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord4fv
 	offset		402
 
@@ -4801,11 +4921,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [4]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	211
-	glsopcode	0x01C0
 	offset		403
 
 MultiTexCoord4i(target, s, t, r, q)
@@ -4815,9 +4935,10 @@
 	param		t		CoordI in value
 	param		r		CoordI in value
 	param		q		CoordI in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord4iv
 	offset		404
 
@@ -4825,11 +4946,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [4]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	212
-	glsopcode	0x01C1
 	offset		405
 
 MultiTexCoord4s(target, s, t, r, q)
@@ -4839,9 +4960,10 @@
 	param		t		CoordS in value
 	param		r		CoordS in value
 	param		q		CoordS in value
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	vectorequiv	MultiTexCoord4sv
 	offset		406
 
@@ -4849,11 +4971,11 @@
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [4]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB
 	version		1.3
+	deprecated	3.1
 	glxropcode	213
-	glsopcode	0x01C2
 	offset		407
 
 # OpenGL 1.3 (ARB_transpose_matrix) commands
@@ -4861,194 +4983,39 @@
 LoadTransposeMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
-	glsflags	matrix
-	glsopcode	0x01C3
+	deprecated	3.1
 	offset		408
 
 LoadTransposeMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
-	glsflags	matrix
-	glsopcode	0x01C4
+	deprecated	3.1
 	offset		409
 
 MultTransposeMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
-	glsflags	matrix
-	glsopcode	0x01C5
+	deprecated	3.1
 	offset		410
 
 MultTransposeMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_3
+	category	VERSION_1_3_DEPRECATED
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
-	glsflags	matrix
-	glsopcode	0x01C6
+	deprecated	3.1
 	offset		411
 
-# OpenGL 1.3 (ARB_multisample) commands
-
-SampleCoverage(value, invert)
-	return		void
-	param		value		ClampedFloat32 in value
-	param		invert		Boolean in value
-	category	VERSION_1_3
-	glxflags	ARB
-	version		1.3
-	glxropcode	229
-	glsopcode	0x01C7
-	offset		412
-
-# OpenGL 1.3 (ARB_texture_compression) commands
-
-# Arguably TexelInternalFormat, not PixelInternalFormat
-CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		internalformat	PixelInternalFormat in value
-	param		width		SizeI in value
-	param		height		SizeI in value
-	param		depth		SizeI in value
-	param		border		CheckedInt32 in value
-	param		imageSize	SizeI in value
-	param		data		CompressedTextureARB in array [imageSize]
-	category	VERSION_1_3
-	dlflags		handcode
-	glxflags	ARB client-handcode server-handcode
-	version		1.3
-	glxropcode	216
-	glsopcode	0x01C9
-	wglflags	client-handcode server-handcode
-	offset		554
-
-# Arguably TexelInternalFormat, not PixelInternalFormat
-CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		internalformat	PixelInternalFormat in value
-	param		width		SizeI in value
-	param		height		SizeI in value
-	param		border		CheckedInt32 in value
-	param		imageSize	SizeI in value
-	param		data		CompressedTextureARB in array [imageSize]
-	category	VERSION_1_3
-	dlflags		handcode
-	glxflags	ARB client-handcode server-handcode
-	version		1.3
-	glxropcode	215
-	glsopcode	0x01CA
-	wglflags	client-handcode server-handcode
-	offset		555
-
-# Arguably TexelInternalFormat, not PixelInternalFormat
-CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		internalformat	PixelInternalFormat in value
-	param		width		SizeI in value
-	param		border		CheckedInt32 in value
-	param		imageSize	SizeI in value
-	param		data		CompressedTextureARB in array [imageSize]
-	category	VERSION_1_3
-	dlflags		handcode
-	glxflags	ARB client-handcode server-handcode
-	version		1.3
-	glxropcode	214
-	glsopcode	0x01CB
-	wglflags	client-handcode server-handcode
-	offset		556
-
-CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		xoffset		CheckedInt32 in value
-	param		yoffset		CheckedInt32 in value
-	param		zoffset		CheckedInt32 in value
-	param		width		SizeI in value
-	param		height		SizeI in value
-	param		depth		SizeI in value
-	param		format		PixelFormat in value
-	param		imageSize	SizeI in value
-	param		data		CompressedTextureARB in array [imageSize]
-	category	VERSION_1_3
-	dlflags		handcode
-	glxflags	ARB client-handcode server-handcode
-	version		1.3
-	glxropcode	219
-	glsopcode	0x01CC
-	wglflags	client-handcode server-handcode
-	offset		557
-
-CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		xoffset		CheckedInt32 in value
-	param		yoffset		CheckedInt32 in value
-	param		width		SizeI in value
-	param		height		SizeI in value
-	param		format		PixelFormat in value
-	param		imageSize	SizeI in value
-	param		data		CompressedTextureARB in array [imageSize]
-	category	VERSION_1_3
-	dlflags		handcode
-	glxflags	ARB client-handcode server-handcode
-	version		1.3
-	glxropcode	218
-	glsopcode	0x01CD
-	wglflags	client-handcode server-handcode
-	offset		558
-
-CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		xoffset		CheckedInt32 in value
-	param		width		SizeI in value
-	param		format		PixelFormat in value
-	param		imageSize	SizeI in value
-	param		data		CompressedTextureARB in array [imageSize]
-	category	VERSION_1_3
-	dlflags		handcode
-	glxflags	ARB client-handcode server-handcode
-	version		1.3
-	glxropcode	217
-	glsopcode	0x01CE
-	wglflags	client-handcode server-handcode
-	offset		559
-
-GetCompressedTexImage(target, level, img)
-	return		void
-	param		target		TextureTarget in value
-	param		level		CheckedInt32 in value
-	param		img		CompressedTextureARB out array [COMPSIZE(target/level)]
-	category	VERSION_1_3
-	dlflags		notlistable
-	glxflags	ARB client-handcode server-handcode
-	version		1.3
-	glxsingle	160
-	glsflags	get
-	glsopcode	0x01CF
-	wglflags	client-handcode server-handcode
-	offset		560
-
-
 ###############################################################################
 ###############################################################################
 #
@@ -5069,58 +5036,8 @@
 	glxropcode	4134
 	version		1.4
 	extension
-	glsopcode	0x01DC
 	offset		537
 
-# OpenGL 1.4 (EXT_fog_coord) commands
-
-FogCoordf(coord)
-	return		void
-	param		coord		CoordF in value
-	category	VERSION_1_4
-	vectorequiv	FogCoordfv
-	version		1.4
-	offset		545
-
-FogCoordfv(coord)
-	return		void
-	param		coord		CoordF in array [1]
-	category	VERSION_1_4
-	version		1.4
-	glxropcode	4124
-	glsopcode	0x01D8
-	offset		546
-
-FogCoordd(coord)
-	return		void
-	param		coord		CoordD in value
-	category	VERSION_1_4
-	vectorequiv	FogCoorddv
-	version		1.4
-	offset		547
-
-FogCoorddv(coord)
-	return		void
-	param		coord		CoordD in array [1]
-	category	VERSION_1_4
-	version		1.4
-	glxropcode	4125
-	glsopcode	0x01DA
-	offset		548
-
-FogCoordPointer(type, stride, pointer)
-	return		void
-	param		type		FogPointerTypeEXT in value
-	param		stride		SizeI in value
-	param		pointer		Void in array [COMPSIZE(type/stride)] retained
-	category	VERSION_1_4
-	dlflags		notlistable
-	version		1.4
-	glxflags	client-handcode server-handcode
-	glsflags	client
-	glsopcode	0x01DB
-	offset		549
-
 # OpenGL 1.4 (EXT_multi_draw_arrays) commands
 
 # first and count are really 'in'
@@ -5133,7 +5050,6 @@
 	category	VERSION_1_4
 	version		1.4
 	glxropcode	?
-	glsflags	ignore
 	offset		644
 
 MultiDrawElements(mode, count, type, indices, primcount)
@@ -5146,7 +5062,6 @@
 	category	VERSION_1_4
 	version		1.4
 	glxropcode	?
-	glsflags	ignore
 	offset		645
 
 # OpenGL 1.4 (ARB_point_parameters, NV_point_sprite) commands
@@ -5159,7 +5074,6 @@
 	version		1.4
 	glxropcode	2065
 	extension
-	glsopcode	0x0177
 	offset		458
 
 PointParameterfv(pname, params)
@@ -5170,7 +5084,6 @@
 	version		1.4
 	glxropcode	2066
 	extension
-	glsopcode	0x0178
 	offset		459
 
 PointParameteri(pname, param)
@@ -5181,7 +5094,6 @@
 	version		1.4
 	extension	soft WINSOFT NV20
 	glxropcode	4221
-	glsflags	ignore
 	offset		642
 
 PointParameteriv(pname, params)
@@ -5192,9 +5104,66 @@
 	version		1.4
 	extension	soft WINSOFT NV20
 	glxropcode	4222re
-	glsflags	ignore
 	offset		643
 
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.4 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.4 (EXT_fog_coord) commands
+
+FogCoordf(coord)
+	return		void
+	param		coord		CoordF in value
+	category	VERSION_1_4_DEPRECATED
+	vectorequiv	FogCoordfv
+	version		1.4
+	deprecated	3.1
+	offset		545
+
+FogCoordfv(coord)
+	return		void
+	param		coord		CoordF in array [1]
+	category	VERSION_1_4_DEPRECATED
+	version		1.4
+	deprecated	3.1
+	glxropcode	4124
+	offset		546
+
+FogCoordd(coord)
+	return		void
+	param		coord		CoordD in value
+	category	VERSION_1_4_DEPRECATED
+	vectorequiv	FogCoorddv
+	version		1.4
+	deprecated	3.1
+	offset		547
+
+FogCoorddv(coord)
+	return		void
+	param		coord		CoordD in array [1]
+	category	VERSION_1_4_DEPRECATED
+	version		1.4
+	deprecated	3.1
+	glxropcode	4125
+	offset		548
+
+FogCoordPointer(type, stride, pointer)
+	return		void
+	param		type		FogPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	VERSION_1_4_DEPRECATED
+	dlflags		notlistable
+	version		1.4
+	deprecated	3.1
+	glxflags	client-handcode server-handcode
+	offset		549
+
 # OpenGL 1.4 (EXT_secondary_color) commands
 
 SecondaryColor3b(red, green, blue)
@@ -5202,18 +5171,19 @@
 	param		red		ColorB in value
 	param		green		ColorB in value
 	param		blue		ColorB in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	SecondaryColor3bv
 	version		1.4
+	deprecated	3.1
 	offset		561
 
 SecondaryColor3bv(v)
 	return		void
 	param		v		ColorB in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	4126
-	glsopcode	0x01FD
 	offset		562
 
 SecondaryColor3d(red, green, blue)
@@ -5221,18 +5191,19 @@
 	param		red		ColorD in value
 	param		green		ColorD in value
 	param		blue		ColorD in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	SecondaryColor3dv
 	version		1.4
+	deprecated	3.1
 	offset		563
 
 SecondaryColor3dv(v)
 	return		void
 	param		v		ColorD in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	4130
-	glsopcode	0x01FE
 	offset		564
 
 SecondaryColor3f(red, green, blue)
@@ -5240,18 +5211,19 @@
 	param		red		ColorF in value
 	param		green		ColorF in value
 	param		blue		ColorF in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	SecondaryColor3fv
 	version		1.4
+	deprecated	3.1
 	offset		565
 
 SecondaryColor3fv(v)
 	return		void
 	param		v		ColorF in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	4129
-	glsopcode	0x01FF
 	offset		566
 
 SecondaryColor3i(red, green, blue)
@@ -5259,18 +5231,19 @@
 	param		red		ColorI in value
 	param		green		ColorI in value
 	param		blue		ColorI in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	SecondaryColor3iv
 	version		1.4
+	deprecated	3.1
 	offset		567
 
 SecondaryColor3iv(v)
 	return		void
 	param		v		ColorI in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	4128
-	glsopcode	0x0200
 	offset		568
 
 SecondaryColor3s(red, green, blue)
@@ -5278,18 +5251,19 @@
 	param		red		ColorS in value
 	param		green		ColorS in value
 	param		blue		ColorS in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	SecondaryColor3sv
 	version		1.4
+	deprecated	3.1
 	offset		569
 
 SecondaryColor3sv(v)
 	return		void
 	param		v		ColorS in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	4127
-	glsopcode	0x0201
 	offset		570
 
 SecondaryColor3ub(red, green, blue)
@@ -5297,18 +5271,19 @@
 	param		red		ColorUB in value
 	param		green		ColorUB in value
 	param		blue		ColorUB in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	SecondaryColor3ubv
 	version		1.4
+	deprecated	3.1
 	offset		571
 
 SecondaryColor3ubv(v)
 	return		void
 	param		v		ColorUB in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	4131
-	glsopcode	0x0202
 	offset		572
 
 SecondaryColor3ui(red, green, blue)
@@ -5316,18 +5291,19 @@
 	param		red		ColorUI in value
 	param		green		ColorUI in value
 	param		blue		ColorUI in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	SecondaryColor3uiv
 	version		1.4
+	deprecated	3.1
 	offset		573
 
 SecondaryColor3uiv(v)
 	return		void
 	param		v		ColorUI in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	4133
-	glsopcode	0x0203
 	offset		574
 
 SecondaryColor3us(red, green, blue)
@@ -5335,18 +5311,19 @@
 	param		red		ColorUS in value
 	param		green		ColorUS in value
 	param		blue		ColorUS in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	SecondaryColor3usv
 	version		1.4
+	deprecated	3.1
 	offset		575
 
 SecondaryColor3usv(v)
 	return		void
 	param		v		ColorUS in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	4132
-	glsopcode	0x0204
 	offset		576
 
 SecondaryColorPointer(size, type, stride, pointer)
@@ -5355,13 +5332,12 @@
 	param		type		ColorPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.4
+	deprecated	3.1
 	extension
-	glsflags	client
-	glsopcode	0x0205
 	offset		577
 
 # OpenGL 1.4 (ARB_window_pos) commands
@@ -5371,76 +5347,80 @@
 	return		void
 	param		x		CoordD in value
 	param		y		CoordD in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	WindowPos2dv
 	version		1.4
+	deprecated	3.1
 	offset		513
 
 WindowPos2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	230
 	glxflags	client-handcode server-handcode
-	glsopcode	0x01F0
 	offset		514
 
 WindowPos2f(x, y)
 	return		void
 	param		x		CoordF in value
 	param		y		CoordF in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	WindowPos2fv
 	version		1.4
+	deprecated	3.1
 	offset		515
 
 WindowPos2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	230
 	glxflags	client-handcode server-handcode
-	glsopcode	0x01F1
 	offset		516
 
 WindowPos2i(x, y)
 	return		void
 	param		x		CoordI in value
 	param		y		CoordI in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	WindowPos2iv
 	version		1.4
+	deprecated	3.1
 	offset		517
 
 WindowPos2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	230
 	glxflags	client-handcode server-handcode
-	glsopcode	0x01F2
 	offset		518
 
 WindowPos2s(x, y)
 	return		void
 	param		x		CoordS in value
 	param		y		CoordS in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	WindowPos2sv
 	version		1.4
+	deprecated	3.1
 	offset		519
 
 WindowPos2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	230
 	glxflags	client-handcode server-handcode
-	glsopcode	0x01F3
 	offset		520
 
 WindowPos3d(x, y, z)
@@ -5449,18 +5429,19 @@
 	param		y		CoordD in value
 	param		z		CoordD in value
 	vectorequiv	WindowPos3dv
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	offset		521
 
 WindowPos3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	230
 	glxflags	client-handcode server-handcode
-	glsopcode	0x01F4
 	offset		522
 
 WindowPos3f(x, y, z)
@@ -5468,19 +5449,20 @@
 	param		x		CoordF in value
 	param		y		CoordF in value
 	param		z		CoordF in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	WindowPos3fv
 	version		1.4
+	deprecated	3.1
 	offset		523
 
 WindowPos3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	230
 	glxflags	client-handcode server-handcode
-	glsopcode	0x01F5
 	offset		524
 
 WindowPos3i(x, y, z)
@@ -5488,19 +5470,20 @@
 	param		x		CoordI in value
 	param		y		CoordI in value
 	param		z		CoordI in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	WindowPos3iv
 	version		1.4
+	deprecated	3.1
 	offset		525
 
 WindowPos3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	230
 	glxflags	client-handcode server-handcode
-	glsopcode	0x01F6
 	offset		526
 
 WindowPos3s(x, y, z)
@@ -5508,22 +5491,22 @@
 	param		x		CoordS in value
 	param		y		CoordS in value
 	param		z		CoordS in value
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	vectorequiv	WindowPos3sv
 	version		1.4
+	deprecated	3.1
 	offset		527
 
 WindowPos3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	VERSION_1_4
+	category	VERSION_1_4_DEPRECATED
 	version		1.4
+	deprecated	3.1
 	glxropcode	230
 	glxflags	client-handcode server-handcode
-	glsopcode	0x01F7
 	offset		528
 
-
 ###############################################################################
 ###############################################################################
 #
@@ -5543,7 +5526,6 @@
 	extension
 	glxsingle	162
 	glxflags	ignore
-	glsopcode	?
 	offset		700
 
 DeleteQueries(n, ids)
@@ -5555,7 +5537,6 @@
 	extension
 	glxsingle	161
 	glxflags	ignore
-	glsopcode	?
 	offset		701
 
 IsQuery(id)
@@ -5566,7 +5547,6 @@
 	extension
 	glxsingle	163
 	glxflags	ignore
-	glsopcode	?
 	offset		702
 
 BeginQuery(target, id)
@@ -5578,7 +5558,6 @@
 	extension
 	glxropcode	231
 	glxflags	ignore
-	glsopcode	?
 	offset		703
 
 EndQuery(target)
@@ -5589,7 +5568,6 @@
 	extension
 	glxropcode	232
 	glxflags	ignore
-	glsopcode	?
 	offset		704
 
 GetQueryiv(target, pname, params)
@@ -5603,8 +5581,6 @@
 	extension
 	glxsingle	164
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		705
 
 GetQueryObjectiv(id, pname, params)
@@ -5618,8 +5594,6 @@
 	extension
 	glxsingle	165
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		706
 
 GetQueryObjectuiv(id, pname, params)
@@ -5633,8 +5607,6 @@
 	extension
 	glxsingle	166
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		707
 
 # OpenGL 1.5 (ARB_vertex_buffer_object) commands
@@ -5648,7 +5620,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		688
 
 DeleteBuffers(n, buffers)
@@ -5660,7 +5631,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		691
 
 GenBuffers(n, buffers)
@@ -5672,7 +5642,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		692
 
 IsBuffer(buffer)
@@ -5683,7 +5652,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		696
 
 BufferData(target, size, data, usage)
@@ -5697,7 +5665,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		689
 
 BufferSubData(target, offset, size, data)
@@ -5711,7 +5678,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		690
 
 GetBufferSubData(target, offset, size, data)
@@ -5726,8 +5692,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		695
 
 MapBuffer(target, access)
@@ -5739,7 +5703,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		697
 
 UnmapBuffer(target)
@@ -5750,7 +5713,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		698
 
 GetBufferParameteriv(target, pname, params)
@@ -5764,8 +5726,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		693
 
 GetBufferPointerv(target, pname, params)
@@ -5779,8 +5739,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		694
 
 # OpenGL 1.5 (EXT_shadow_funcs) commands - none
@@ -5804,7 +5762,6 @@
 	version		2.0
 	extension
 	glxropcode	4228
-	glsopcode	?
 
 # OpenGL 2.0 (ARB_draw_buffers) commands
 
@@ -5817,7 +5774,6 @@
 	extension
 	glxropcode	233
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 # OpenGL 2.0 (ARB_stencil_two_side) commands
@@ -5833,7 +5789,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 StencilFuncSeparate(frontfunc, backfunc, ref, mask)
@@ -5847,7 +5802,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 StencilMaskSeparate(face, mask)
@@ -5859,7 +5813,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 # OpenGL 2.0 (ARB_shader_objects / ARB_vertex_shader / ARB_fragment_shader) commands
@@ -5873,7 +5826,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 BindAttribLocation(program, index, name)
@@ -5886,7 +5838,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 CompileShader(shader)
@@ -5897,7 +5848,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 CreateProgram()
@@ -5907,7 +5857,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 CreateShader(type)
@@ -5918,7 +5867,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DeleteProgram(program)
@@ -5929,7 +5877,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DeleteShader(shader)
@@ -5940,7 +5887,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DetachShader(program, shader)
@@ -5952,7 +5898,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DisableVertexAttribArray(index)
@@ -5962,7 +5907,6 @@
 	category	VERSION_2_0
 	version		2.0
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		666
 
@@ -5973,7 +5917,6 @@
 	category	VERSION_2_0
 	version		2.0
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		665
 
@@ -5992,8 +5935,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetActiveUniform(program, index, bufSize, length, size, type, name)
@@ -6011,8 +5952,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetAttachedShaders(program, maxCount, count, obj)
@@ -6027,8 +5966,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetAttribLocation(program, name)
@@ -6041,8 +5978,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetProgramiv(program, pname, params)
@@ -6056,8 +5991,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetProgramInfoLog(program, bufSize, length, infoLog)
@@ -6072,8 +6005,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetShaderiv(shader, pname, params)
@@ -6087,8 +6018,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetShaderInfoLog(shader, bufSize, length, infoLog)
@@ -6103,8 +6032,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetShaderSource(shader, bufSize, length, source)
@@ -6119,8 +6046,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetUniformLocation(program, name)
@@ -6133,8 +6058,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetUniformfv(program, location, params)
@@ -6148,8 +6071,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetUniformiv(program, location, params)
@@ -6163,8 +6084,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetVertexAttribdv(index, pname, params)
@@ -6177,8 +6096,6 @@
 	version		2.0
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1301
-	glsflags	client get
-	glsopcode	0x0232
 	offset		588
 
 GetVertexAttribfv(index, pname, params)
@@ -6191,8 +6108,6 @@
 	version		2.0
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1302
-	glsflags	client get
-	glsopcode	0x0233
 	offset		589
 
 GetVertexAttribiv(index, pname, params)
@@ -6205,8 +6120,6 @@
 	version		2.0
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1303
-	glsflags	client get
-	glsopcode	0x0234
 	offset		590
 
 GetVertexAttribPointerv(index, pname, pointer)
@@ -6219,8 +6132,6 @@
 	version		2.0
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	client get
-	glsopcode	0x0235
 	offset		591
 
 IsProgram(program)
@@ -6231,8 +6142,6 @@
 	version		2.0
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1304
-	glsflags	get
-	glsopcode	0x0236
 	offset		592
 
 IsShader(shader)
@@ -6243,8 +6152,6 @@
 	version		2.0
 	extension	soft WINSOFT NV10
 	glxvendorpriv	?
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 LinkProgram(program)
@@ -6255,7 +6162,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ShaderSource(shader, count, string, length)
@@ -6269,7 +6175,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UseProgram(program)
@@ -6280,7 +6185,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform1f(location, v0)
@@ -6292,7 +6196,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform2f(location, v0, v1)
@@ -6305,7 +6208,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform3f(location, v0, v1, v2)
@@ -6319,7 +6221,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform4f(location, v0, v1, v2, v3)
@@ -6334,7 +6235,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform1i(location, v0)
@@ -6346,7 +6246,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform2i(location, v0, v1)
@@ -6359,7 +6258,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform3i(location, v0, v1, v2)
@@ -6373,7 +6271,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform4i(location, v0, v1, v2, v3)
@@ -6388,7 +6285,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform1fv(location, count, value)
@@ -6401,7 +6297,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform2fv(location, count, value)
@@ -6414,7 +6309,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform3fv(location, count, value)
@@ -6427,7 +6321,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform4fv(location, count, value)
@@ -6440,7 +6333,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform1iv(location, count, value)
@@ -6453,7 +6345,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform2iv(location, count, value)
@@ -6466,7 +6357,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform3iv(location, count, value)
@@ -6479,7 +6369,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Uniform4iv(location, count, value)
@@ -6492,7 +6381,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UniformMatrix2fv(location, count, transpose, value)
@@ -6506,7 +6394,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UniformMatrix3fv(location, count, transpose, value)
@@ -6520,7 +6407,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UniformMatrix4fv(location, count, transpose, value)
@@ -6534,7 +6420,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ValidateProgram(program)
@@ -6545,7 +6430,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttrib1d(index, x)
@@ -6554,9 +6438,9 @@
 	param		x		Float64 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib1dv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		603
 
@@ -6566,9 +6450,9 @@
 	param		v		Float64 in array [1]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4197
-	glsopcode	0x0240
 	offset		604
 
 VertexAttrib1f(index, x)
@@ -6577,9 +6461,9 @@
 	param		x		Float32 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib1fv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		605
 
@@ -6589,9 +6473,9 @@
 	param		v		Float32 in array [1]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4193
-	glsopcode	0x023F
 	offset		606
 
 VertexAttrib1s(index, x)
@@ -6600,9 +6484,9 @@
 	param		x		Int16 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib1sv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		607
 
@@ -6612,9 +6496,9 @@
 	param		v		Int16 in array [1]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4189
-	glsopcode	0x023E
 	offset		608
 
 VertexAttrib2d(index, x, y)
@@ -6624,9 +6508,9 @@
 	param		y		Float64 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib2dv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		609
 
@@ -6636,9 +6520,9 @@
 	param		v		Float64 in array [2]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4198
-	glsopcode	0x0243
 	offset		610
 
 VertexAttrib2f(index, x, y)
@@ -6648,9 +6532,9 @@
 	param		y		Float32 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib2fv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		611
 
@@ -6660,9 +6544,9 @@
 	param		v		Float32 in array [2]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4194
-	glsopcode	0x0242
 	offset		612
 
 VertexAttrib2s(index, x, y)
@@ -6672,9 +6556,9 @@
 	param		y		Int16 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib2sv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		613
 
@@ -6684,9 +6568,9 @@
 	param		v		Int16 in array [2]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4190
-	glsopcode	0x0241
 	offset		614
 
 VertexAttrib3d(index, x, y, z)
@@ -6697,9 +6581,9 @@
 	param		z		Float64 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib3dv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		615
 
@@ -6709,9 +6593,9 @@
 	param		v		Float64 in array [3]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4199
-	glsopcode	0x0246
 	offset		616
 
 VertexAttrib3f(index, x, y, z)
@@ -6722,9 +6606,9 @@
 	param		z		Float32 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib3fv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		617
 
@@ -6734,9 +6618,9 @@
 	param		v		Float32 in array [3]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4195
-	glsopcode	0x0245
 	offset		618
 
 VertexAttrib3s(index, x, y, z)
@@ -6747,9 +6631,9 @@
 	param		z		Int16 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib3sv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		619
 
@@ -6759,9 +6643,9 @@
 	param		v		Int16 in array [3]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4191
-	glsopcode	0x0244
 	offset		620
 
 VertexAttrib4Nbv(index, v)
@@ -6770,8 +6654,8 @@
 	param		v		Int8 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		659
 
@@ -6781,8 +6665,8 @@
 	param		v		Int32 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		661
 
@@ -6792,8 +6676,8 @@
 	param		v		Int16 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		660
 
@@ -6806,8 +6690,8 @@
 	param		w		UInt8 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		627
 
@@ -6817,11 +6701,10 @@
 	param		v		UInt8 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	glxropcode	4201
-	glsopcode	0x024A
 	offset		628
 
 VertexAttrib4Nuiv(index, v)
@@ -6830,8 +6713,8 @@
 	param		v		UInt32 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		663
 
@@ -6841,8 +6724,8 @@
 	param		v		UInt16 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		662
 
@@ -6852,8 +6735,8 @@
 	param		v		Int8 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		654
 
@@ -6866,9 +6749,9 @@
 	param		w		Float64 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib4dv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		621
 
@@ -6878,9 +6761,9 @@
 	param		v		Float64 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4200
-	glsopcode	0x0249
 	offset		622
 
 VertexAttrib4f(index, x, y, z, w)
@@ -6892,9 +6775,9 @@
 	param		w		Float32 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib4fv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		623
 
@@ -6904,9 +6787,9 @@
 	param		v		Float32 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
 	glxropcode	4196
-	glsopcode	0x0248
 	offset		624
 
 VertexAttrib4iv(index, v)
@@ -6915,8 +6798,8 @@
 	param		v		Int32 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		655
 
@@ -6929,9 +6812,9 @@
 	param		w		Int16 in value
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	vectorequiv	VertexAttrib4sv
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		625
 
@@ -6941,11 +6824,10 @@
 	param		v		Int16 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	glxropcode	4192
-	glsopcode	0x0247
 	offset		626
 
 VertexAttrib4ubv(index, v)
@@ -6954,8 +6836,8 @@
 	param		v		UInt8 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		656
 
@@ -6965,8 +6847,8 @@
 	param		v		UInt32 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		658
 
@@ -6976,8 +6858,8 @@
 	param		v		UInt16 in array [4]
 	category	VERSION_2_0
 	version		2.0
+	deprecated	3.1
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		657
 
@@ -6993,7 +6875,6 @@
 	category	VERSION_2_0
 	version		2.0
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		664
 
@@ -7023,7 +6904,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UniformMatrix3x2fv(location, count, transpose, value)
@@ -7037,7 +6917,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UniformMatrix2x4fv(location, count, transpose, value)
@@ -7051,7 +6930,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UniformMatrix4x2fv(location, count, transpose, value)
@@ -7065,7 +6943,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UniformMatrix3x4fv(location, count, transpose, value)
@@ -7079,7 +6956,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UniformMatrix4x3fv(location, count, transpose, value)
@@ -7093,10 +6969,8 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
-
 ###############################################################################
 ###############################################################################
 #
@@ -7119,7 +6993,6 @@
 	extension
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 GetBooleani_v(target, index, data)
 	return		void
@@ -7132,7 +7005,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 GetIntegeri_v(target, index, data)
 	return		void
@@ -7145,7 +7017,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 Enablei(target, index)
 	return		void
@@ -7156,7 +7027,6 @@
 	extension
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 Disablei(target, index)
 	return		void
@@ -7167,7 +7037,6 @@
 	extension
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 IsEnabledi(target, index)
 	return		Boolean
@@ -7179,7 +7048,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 # OpenGL 3.0 (EXT_transform_feedback) commands
 
@@ -7192,7 +7060,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 EndTransformFeedback()
 	return		void
@@ -7202,7 +7069,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 BindBufferRange(target, index, buffer, offset, size)
 	return		void
@@ -7217,7 +7083,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 BindBufferBase(target, index, buffer)
 	return		void
@@ -7230,13 +7095,12 @@
 	dlflags		notlistable
 	glxflags	ignore
 	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
@@ -7244,19 +7108,21 @@
 	dlflags		notlistable
 	glxflags	ignore
 	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
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ClampColor(target, clamp)
@@ -7268,7 +7134,6 @@
 	extension
 	glxropcode	234
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 BeginConditionalRender(id, mode)
@@ -7278,7 +7143,6 @@
 	category	VERSION_3_0
 	version		3.0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 EndConditionalRender()
@@ -7286,9 +7150,46 @@
 	category	VERSION_3_0
 	version		3.0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
+VertexAttribIPointer(index, size, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribEnum in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_3_0
+	version		3.0
+	dlflags		notlistable
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetVertexAttribIiv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		Int32 out array [1]
+	category	VERSION_3_0
+	version		3.0
+	dlflags		notlistable
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetVertexAttribIuiv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		UInt32 out array [1]
+	category	VERSION_3_0
+	version		3.0
+	dlflags		notlistable
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
 # OpenGL 3.0 (NV_vertex_program4) commands
 
 VertexAttribI1i(index, x)
@@ -7297,12 +7198,12 @@
 	param		x		Int32 in value
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	vectorequiv	VertexAttribI1iv
 	glxvectorequiv	VertexAttribI1iv
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI2i(index, x, y)
@@ -7312,12 +7213,12 @@
 	param		y		Int32 in value
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	vectorequiv	VertexAttribI2iv
 	glxvectorequiv	VertexAttribI2iv
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI3i(index, x, y, z)
@@ -7328,12 +7229,12 @@
 	param		z		Int32 in value
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	vectorequiv	VertexAttribI3iv
 	glxvectorequiv	VertexAttribI3iv
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI4i(index, x, y, z, w)
@@ -7345,12 +7246,12 @@
 	param		w		Int32 in value
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	vectorequiv	VertexAttribI4iv
 	glxvectorequiv	VertexAttribI4iv
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI1ui(index, x)
@@ -7359,12 +7260,12 @@
 	param		x		UInt32 in value
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	vectorequiv	VertexAttribI1uiv
 	glxvectorequiv	VertexAttribI1uiv
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI2ui(index, x, y)
@@ -7374,12 +7275,12 @@
 	param		y		UInt32 in value
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	vectorequiv	VertexAttribI2uiv
 	glxvectorequiv	VertexAttribI2uiv
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI3ui(index, x, y, z)
@@ -7390,12 +7291,12 @@
 	param		z		UInt32 in value
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	vectorequiv	VertexAttribI3uiv
 	glxvectorequiv	VertexAttribI3uiv
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI4ui(index, x, y, z, w)
@@ -7407,12 +7308,12 @@
 	param		w		UInt32 in value
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	vectorequiv	VertexAttribI4uiv
 	glxvectorequiv	VertexAttribI4uiv
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI1iv(index, v)
@@ -7421,10 +7322,10 @@
 	param		v		Int32 in array [1]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI2iv(index, v)
@@ -7433,10 +7334,10 @@
 	param		v		Int32 in array [2]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI3iv(index, v)
@@ -7445,10 +7346,10 @@
 	param		v		Int32 in array [3]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI4iv(index, v)
@@ -7457,10 +7358,10 @@
 	param		v		Int32 in array [4]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI1uiv(index, v)
@@ -7469,10 +7370,10 @@
 	param		v		UInt32 in array [1]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI2uiv(index, v)
@@ -7481,10 +7382,10 @@
 	param		v		UInt32 in array [2]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI3uiv(index, v)
@@ -7493,10 +7394,10 @@
 	param		v		UInt32 in array [3]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI4uiv(index, v)
@@ -7505,10 +7406,10 @@
 	param		v		UInt32 in array [4]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI4bv(index, v)
@@ -7517,10 +7418,10 @@
 	param		v		Int8 in array [4]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI4sv(index, v)
@@ -7529,10 +7430,10 @@
 	param		v		Int16 in array [4]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI4ubv(index, v)
@@ -7541,10 +7442,10 @@
 	param		v		UInt8 in array [4]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 VertexAttribI4usv(index, v)
@@ -7553,53 +7454,12 @@
 	param		v		UInt16 in array [4]
 	category	VERSION_3_0
 	version		3.0
+	deprecated	3.1
 	beginend	allow-inside
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
-VertexAttribIPointer(index, size, type, stride, pointer)
-	return		void
-	param		index		UInt32 in value
-	param		size		Int32 in value
-	param		type		VertexAttribEnum in value
-	param		stride		SizeI in value
-	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_3_0
-	version		3.0
-	dlflags		notlistable
-	extension
-	glfflags	ignore
-	glsflags	ignore
-	glxflags	ignore
-
-GetVertexAttribIiv(index, pname, params)
-	return		void
-	param		index		UInt32 in value
-	param		pname		VertexAttribEnum in value
-	param		params		Int32 out array [1]
-	category	VERSION_3_0
-	version		3.0
-	dlflags		notlistable
-	extension
-	glfflags	ignore
-	glsflags	ignore
-	glxflags	ignore
-
-GetVertexAttribIuiv(index, pname, params)
-	return		void
-	param		index		UInt32 in value
-	param		pname		VertexAttribEnum in value
-	param		params		UInt32 out array [1]
-	category	VERSION_3_0
-	version		3.0
-	dlflags		notlistable
-	extension
-	glfflags	ignore
-	glsflags	ignore
-	glxflags	ignore
-
 # OpenGL 3.0 (EXT_gpu_shader4) commands
 
 GetUniformuiv(program, location, params)
@@ -7612,7 +7472,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 BindFragDataLocation(program, color, name)
@@ -7625,7 +7484,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetFragDataLocation(program, name)
@@ -7637,7 +7495,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 Uniform1ui(location, v0)
@@ -7648,7 +7505,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 Uniform2ui(location, v0, v1)
@@ -7660,7 +7516,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 Uniform3ui(location, v0, v1, v2)
@@ -7673,7 +7528,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 Uniform4ui(location, v0, v1, v2, v3)
@@ -7687,7 +7541,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 Uniform1uiv(location, count, value)
@@ -7699,7 +7552,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 Uniform2uiv(location, count, value)
@@ -7711,7 +7563,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 Uniform3uiv(location, count, value)
@@ -7723,7 +7574,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 Uniform4uiv(location, count, value)
@@ -7735,7 +7585,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 # OpenGL 3.0 (EXT_texture_integer) commands
@@ -7749,7 +7598,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 TexParameterIuiv(target, pname, params)
@@ -7761,7 +7609,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetTexParameterIiv(target, pname, params)
@@ -7774,7 +7621,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetTexParameterIuiv(target, pname, params)
@@ -7787,7 +7633,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 # New commands in OpenGL 3.0
@@ -7801,7 +7646,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ClearBufferuiv(buffer, drawbuffer, value)
@@ -7813,7 +7657,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ClearBufferfv(buffer, drawbuffer, value)
@@ -7825,7 +7668,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ClearBufferfi(buffer, drawbuffer, depth, stencil)
@@ -7838,7 +7680,6 @@
 	version		3.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetStringi(name, index)
@@ -7851,7 +7692,6 @@
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	glfflags	ignore
-	glsflags	get
 	glxsingle	?
 
 passthru: /* OpenGL 3.0 also reuses entry points from these extensions: */
@@ -7859,10 +7699,201 @@
 passthru: /* ARB_map_buffer_range */
 passthru: /* ARB_vertex_array_object */
 
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.0 deprecated commands
+#
+###############################################################################
+###############################################################################
 
+# (none - VertexAttribI* were moved back into non-deprecated)
+
+
 ###############################################################################
 ###############################################################################
 #
+# OpenGL 3.1 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 3.1 - none
+
+# OpenGL 3.1 (ARB_draw_instanced) commands
+
+DrawArraysInstanced(mode, first, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		primcount	SizeI in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+
+DrawElementsInstanced(mode, count, type, indices, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		primcount	SizeI in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.1 (ARB_texture_buffer_object) commands
+
+TexBuffer(target, internalformat, buffer)
+	return		void
+	param		target		TextureTarget in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.1 (ARB_texture_rectangle) commands - none
+
+# OpenGL 3.1 (SNORM texture) commands - none
+
+# OpenGL 3.1 (NV_primitive_restart) commands
+# This is *not* an alias of PrimitiveRestartIndexNV, since it sets
+# server instead of client state.
+
+PrimitiveRestartIndex(index)
+	return		void
+	param		index		UInt32 in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+passthru: /* OpenGL 3.1 also reuses entry points from these extensions: */
+passthru: /* ARB_copy_buffer */
+passthru: /* ARB_uniform_buffer_object */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.2 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 3.2
+
+GetInteger64i_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Int64 out array [COMPSIZE(target)]
+	category	VERSION_3_2
+	version		3.2
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+
+GetBufferParameteri64v(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPNameARB in value
+	param		params		Int64 out array [COMPSIZE(pname)]
+	category	VERSION_3_2
+	dlflags		notlistable
+	version		3.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+
+# OpenGL 3.2 (ARB_depth_clamp) commands - none
+# OpenGL 3.2 (ARB_fragment_coord_conventions) commands - none
+
+# OpenGL 3.2 (ARB_geometry_shader4) commands
+
+ProgramParameteri(program, pname, value)
+	return		void
+	param		program		UInt32 in value
+	param		pname		GLenum in value
+	param		value		Int32 in value
+	category	VERSION_3_2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FramebufferTexture(target, attachment, texture, level)
+	return		void
+	param		target		GLenum in value
+	param		attachment	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	VERSION_3_2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# FramebufferTextureLayer redeclared in ARB_framebuffer_object
+# FramebufferTextureLayer(target, attachment, texture, level, layer)
+#	  return	  void
+#	  param		  target	  GLenum in value
+#	  param		  attachment	  GLenum in value
+#	  param		  texture	  UInt32 in value
+#	  param		  level		  Int32 in value
+#	  param		  layer		  Int32 in value
+#	  category	  VERSION_3_2
+#	  version	  1.2
+#	  extension
+#	  glxropcode	  ?
+#	  glxflags	  ignore
+#	  offset	  ?
+
+FramebufferTextureFace(target, attachment, texture, level, face)
+	return		void
+	param		target		GLenum in value
+	param		attachment	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		face		GLenum in value
+	category	VERSION_3_2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# OpenGL 3.2  (ARB_seamless_cube_map) commands - none
+# OpenGL 3.2  (ARB_vertex_array_bgra) commands - none
+
+passthru: /* OpenGL 3.2 also reuses entry points from these extensions: */
+passthru: /* ARB_draw_elements_base_vertex */
+passthru: /* ARB_provoking_vertex */
+passthru: /* ARB_sync */
+passthru: /* ARB_texture_multisample */
+
+
+###############################################################################
+###############################################################################
+#
 # ARB extensions, in order by ARB extension number
 #
 ###############################################################################
@@ -7883,7 +7914,6 @@
 	version		1.2
 	glxropcode	197
 	alias		ActiveTexture
-	glsalias	ActiveTexture
 
 ClientActiveTextureARB(texture)
 	return		void
@@ -7893,7 +7923,6 @@
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.2
 	alias		ClientActiveTexture
-	glsalias	ClientActiveTexture
 
 MultiTexCoord1dARB(target, s)
 	return		void
@@ -7913,7 +7942,6 @@
 	version		1.2
 	glxropcode	198
 	alias		MultiTexCoord1dv
-	glsalias	MultiTexCoord1dv
 
 MultiTexCoord1fARB(target, s)
 	return		void
@@ -7933,7 +7961,6 @@
 	version		1.2
 	glxropcode	199
 	alias		MultiTexCoord1fv
-	glsalias	MultiTexCoord1fv
 
 MultiTexCoord1iARB(target, s)
 	return		void
@@ -7953,7 +7980,6 @@
 	version		1.2
 	glxropcode	200
 	alias		MultiTexCoord1iv
-	glsalias	MultiTexCoord1iv
 
 MultiTexCoord1sARB(target, s)
 	return		void
@@ -7973,7 +7999,6 @@
 	version		1.2
 	glxropcode	201
 	alias		MultiTexCoord1sv
-	glsalias	MultiTexCoord1sv
 
 MultiTexCoord2dARB(target, s, t)
 	return		void
@@ -7994,7 +8019,6 @@
 	version		1.2
 	glxropcode	202
 	alias		MultiTexCoord2dv
-	glsalias	MultiTexCoord2dv
 
 MultiTexCoord2fARB(target, s, t)
 	return		void
@@ -8015,7 +8039,6 @@
 	version		1.2
 	glxropcode	203
 	alias		MultiTexCoord2fv
-	glsalias	MultiTexCoord2fv
 
 MultiTexCoord2iARB(target, s, t)
 	return		void
@@ -8036,7 +8059,6 @@
 	version		1.2
 	glxropcode	204
 	alias		MultiTexCoord2iv
-	glsalias	MultiTexCoord2iv
 
 MultiTexCoord2sARB(target, s, t)
 	return		void
@@ -8057,7 +8079,6 @@
 	version		1.2
 	glxropcode	205
 	alias		MultiTexCoord2sv
-	glsalias	MultiTexCoord2sv
 
 MultiTexCoord3dARB(target, s, t, r)
 	return		void
@@ -8079,7 +8100,6 @@
 	version		1.2
 	glxropcode	206
 	alias		MultiTexCoord3dv
-	glsalias	MultiTexCoord3dv
 
 MultiTexCoord3fARB(target, s, t, r)
 	return		void
@@ -8101,7 +8121,6 @@
 	version		1.2
 	glxropcode	207
 	alias		MultiTexCoord3fv
-	glsalias	MultiTexCoord3fv
 
 MultiTexCoord3iARB(target, s, t, r)
 	return		void
@@ -8123,7 +8142,6 @@
 	version		1.2
 	glxropcode	208
 	alias		MultiTexCoord3iv
-	glsalias	MultiTexCoord3iv
 
 MultiTexCoord3sARB(target, s, t, r)
 	return		void
@@ -8145,7 +8163,6 @@
 	glxflags	ARB
 	glxropcode	209
 	alias		MultiTexCoord3sv
-	glsalias	MultiTexCoord3sv
 
 MultiTexCoord4dARB(target, s, t, r, q)
 	return		void
@@ -8168,7 +8185,6 @@
 	version		1.2
 	glxropcode	210
 	alias		MultiTexCoord4dv
-	glsalias	MultiTexCoord4dv
 
 MultiTexCoord4fARB(target, s, t, r, q)
 	return		void
@@ -8191,7 +8207,6 @@
 	version		1.2
 	glxropcode	211
 	alias		MultiTexCoord4fv
-	glsalias	MultiTexCoord4fv
 
 MultiTexCoord4iARB(target, s, t, r, q)
 	return		void
@@ -8214,7 +8229,6 @@
 	version		1.2
 	glxropcode	212
 	alias		MultiTexCoord4iv
-	glsalias	MultiTexCoord4iv
 
 MultiTexCoord4sARB(target, s, t, r, q)
 	return		void
@@ -8237,7 +8251,6 @@
 	version		1.2
 	glxropcode	213
 	alias		MultiTexCoord4sv
-	glsalias	MultiTexCoord4sv
 
 ################################################################################
 #
@@ -8259,7 +8272,6 @@
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.2
 	alias		LoadTransposeMatrixf
-	glsalias	LoadTransposeMatrixf
 
 LoadTransposeMatrixdARB(m)
 	return		void
@@ -8268,7 +8280,6 @@
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.2
 	alias		LoadTransposeMatrixd
-	glsalias	LoadTransposeMatrixd
 
 MultTransposeMatrixfARB(m)
 	return		void
@@ -8277,7 +8288,6 @@
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.2
 	alias		MultTransposeMatrixf
-	glsalias	MultTransposeMatrixf
 
 MultTransposeMatrixdARB(m)
 	return		void
@@ -8286,7 +8296,6 @@
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.2
 	alias		MultTransposeMatrixd
-	glsalias	MultTransposeMatrixd
 
 ################################################################################
 #
@@ -8309,7 +8318,6 @@
 	glxflags	ARB
 	version		1.2
 	alias		SampleCoverage
-	glsalias	SampleCoverage
 
 ################################################################################
 #
@@ -8365,7 +8373,6 @@
 	version		1.2
 	glxropcode	216
 	alias		CompressedTexImage3D
-	glsalias	CompressedTexImage3D
 	wglflags	client-handcode server-handcode
 
 # Arguably TexelInternalFormat, not PixelInternalFormat
@@ -8385,7 +8392,6 @@
 	version		1.2
 	glxropcode	215
 	alias		CompressedTexImage2D
-	glsalias	CompressedTexImage2D
 	wglflags	client-handcode server-handcode
 
 # Arguably TexelInternalFormat, not PixelInternalFormat
@@ -8404,7 +8410,6 @@
 	version		1.2
 	glxropcode	214
 	alias		CompressedTexImage1D
-	glsalias	CompressedTexImage1D
 	wglflags	client-handcode server-handcode
 
 CompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)
@@ -8426,7 +8431,6 @@
 	version		1.2
 	glxropcode	219
 	alias		CompressedTexSubImage3D
-	glsalias	CompressedTexSubImage3D
 	wglflags	client-handcode server-handcode
 
 CompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, data)
@@ -8446,7 +8450,6 @@
 	version		1.2
 	glxropcode	218
 	alias		CompressedTexSubImage2D
-	glsalias	CompressedTexSubImage2D
 	wglflags	client-handcode server-handcode
 
 CompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, data)
@@ -8464,7 +8467,6 @@
 	version		1.2
 	glxropcode	217
 	alias		CompressedTexSubImage1D
-	glsalias	CompressedTexSubImage1D
 	wglflags	client-handcode server-handcode
 
 GetCompressedTexImageARB(target, level, img)
@@ -8478,7 +8480,6 @@
 	version		1.2
 	glxsingle	160
 	alias		GetCompressedTexImage
-	glsalias	GetCompressedTexImage
 	wglflags	client-handcode server-handcode
 
 ################################################################################
@@ -8508,7 +8509,6 @@
 	glxropcode	2065
 	extension
 	alias		PointParameterf
-	glsalias	PointParameterf
 
 PointParameterfvARB(pname, params)
 	return		void
@@ -8520,7 +8520,6 @@
 	glxropcode	2066
 	extension
 	alias		PointParameterfv
-	glsalias	PointParameterfv
 
 ################################################################################
 #
@@ -8538,7 +8537,6 @@
 	extension
 	glxropcode	220
 	glxflags	ignore
-	glsopcode	0x0206
 	offset		?
 
 WeightsvARB(size, weights)
@@ -8550,7 +8548,6 @@
 	extension
 	glxropcode	222
 	glxflags	ignore
-	glsopcode	0x0207
 	offset		?
 
 WeightivARB(size, weights)
@@ -8562,7 +8559,6 @@
 	extension
 	glxropcode	224
 	glxflags	ignore
-	glsopcode	0x0208
 	offset		?
 
 WeightfvARB(size, weights)
@@ -8574,7 +8570,6 @@
 	extension
 	glxropcode	227
 	glxflags	ignore
-	glsopcode	0x0209
 	offset		?
 
 WeightdvARB(size, weights)
@@ -8586,7 +8581,6 @@
 	extension
 	glxropcode	228
 	glxflags	ignore
-	glsopcode	0x020A
 	offset		?
 
 WeightubvARB(size, weights)
@@ -8598,7 +8592,6 @@
 	extension
 	glxropcode	221
 	glxflags	ignore
-	glsopcode	0x020B
 	offset		?
 
 WeightusvARB(size, weights)
@@ -8610,7 +8603,6 @@
 	extension
 	glxropcode	223
 	glxflags	ignore
-	glsopcode	0x020C
 	offset		?
 
 WeightuivARB(size, weights)
@@ -8622,7 +8614,6 @@
 	extension
 	glxropcode	225
 	glxflags	ignore
-	glsopcode	0x020D
 	offset		?
 
 WeightPointerARB(size, type, stride, pointer)
@@ -8636,8 +8627,6 @@
 	extension
 	dlflags		notlistable
 	glxflags	ignore
-	glsflags	client
-	glsopcode	0x020E
 	offset		?
 
 VertexBlendARB(count)
@@ -8648,7 +8637,6 @@
 	extension
 	glxropcode	226
 	glxflags	ignore
-	glsopcode	0x020F
 	offset		?
 
 ################################################################################
@@ -8666,7 +8654,6 @@
 	extension
 	glxropcode	4329
 	glxflags	ignore
-	glsopcode	0x0210
 	offset		?
 
 MatrixIndexubvARB(size, indices)
@@ -8678,7 +8665,6 @@
 	extension
 	glxropcode	4326
 	glxflags	ignore
-	glsopcode	0x0211
 	offset		?
 
 MatrixIndexusvARB(size, indices)
@@ -8690,7 +8676,6 @@
 	extension
 	glxropcode	4327
 	glxflags	ignore
-	glsopcode	0x0212
 	offset		?
 
 MatrixIndexuivARB(size, indices)
@@ -8702,7 +8687,6 @@
 	extension
 	glxropcode	4328
 	glxflags	ignore
-	glsopcode	0x0213
 	offset		?
 
 MatrixIndexPointerARB(size, type, stride, pointer)
@@ -8716,8 +8700,6 @@
 	extension
 	dlflags		notlistable
 	glxflags	ignore
-	glsflags	client
-	glsopcode	0x0214
 	offset		?
 
 ################################################################################
@@ -8812,7 +8794,6 @@
 	vectorequiv	WindowPos2dvARB
 	version		1.0
 	alias		WindowPos2d
-	glsalias	WindowPos2d
 
 WindowPos2dvARB(v)
 	return		void
@@ -8822,7 +8803,6 @@
 	glxropcode	230
 	glxflags	client-handcode server-handcode
 	alias		WindowPos2dv
-	glsalias	WindowPos2dv
 
 WindowPos2fARB(x, y)
 	return		void
@@ -8832,7 +8812,6 @@
 	vectorequiv	WindowPos2fvARB
 	version		1.0
 	alias		WindowPos2f
-	glsalias	WindowPos2f
 
 WindowPos2fvARB(v)
 	return		void
@@ -8842,7 +8821,6 @@
 	glxropcode	230
 	glxflags	client-handcode server-handcode
 	alias		WindowPos2fv
-	glsalias	WindowPos2fv
 
 WindowPos2iARB(x, y)
 	return		void
@@ -8852,7 +8830,6 @@
 	vectorequiv	WindowPos2ivARB
 	version		1.0
 	alias		WindowPos2i
-	glsalias	WindowPos2i
 
 WindowPos2ivARB(v)
 	return		void
@@ -8862,7 +8839,6 @@
 	glxropcode	230
 	glxflags	client-handcode server-handcode
 	alias		WindowPos2iv
-	glsalias	WindowPos2iv
 
 WindowPos2sARB(x, y)
 	return		void
@@ -8872,7 +8848,6 @@
 	vectorequiv	WindowPos2svARB
 	version		1.0
 	alias		WindowPos2s
-	glsalias	WindowPos2s
 
 WindowPos2svARB(v)
 	return		void
@@ -8882,7 +8857,6 @@
 	glxropcode	230
 	glxflags	client-handcode server-handcode
 	alias		WindowPos2sv
-	glsalias	WindowPos2sv
 
 WindowPos3dARB(x, y, z)
 	return		void
@@ -8893,7 +8867,6 @@
 	category	ARB_window_pos
 	version		1.0
 	alias		WindowPos3d
-	glsalias	WindowPos3d
 
 WindowPos3dvARB(v)
 	return		void
@@ -8903,7 +8876,6 @@
 	glxropcode	230
 	glxflags	client-handcode server-handcode
 	alias		WindowPos3dv
-	glsalias	WindowPos3dv
 
 WindowPos3fARB(x, y, z)
 	return		void
@@ -8914,7 +8886,6 @@
 	vectorequiv	WindowPos3fvARB
 	version		1.0
 	alias		WindowPos3f
-	glsalias	WindowPos3f
 
 WindowPos3fvARB(v)
 	return		void
@@ -8924,7 +8895,6 @@
 	glxropcode	230
 	glxflags	client-handcode server-handcode
 	alias		WindowPos3fv
-	glsalias	WindowPos3fv
 
 WindowPos3iARB(x, y, z)
 	return		void
@@ -8935,7 +8905,6 @@
 	vectorequiv	WindowPos3ivARB
 	version		1.0
 	alias		WindowPos3i
-	glsalias	WindowPos3i
 
 WindowPos3ivARB(v)
 	return		void
@@ -8945,7 +8914,6 @@
 	glxropcode	230
 	glxflags	client-handcode server-handcode
 	alias		WindowPos3iv
-	glsalias	WindowPos3iv
 
 WindowPos3sARB(x, y, z)
 	return		void
@@ -8956,7 +8924,6 @@
 	vectorequiv	WindowPos3svARB
 	version		1.0
 	alias		WindowPos3s
-	glsalias	WindowPos3s
 
 WindowPos3svARB(v)
 	return		void
@@ -8966,7 +8933,6 @@
 	glxropcode	230
 	glxflags	client-handcode server-handcode
 	alias		WindowPos3sv
-	glsalias	WindowPos3sv
 
 ###############################################################################
 #
@@ -8984,7 +8950,6 @@
 	vectorequiv	VertexAttrib1dvARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib1d
-	glsalias	VertexAttrib1d
 
 VertexAttrib1dvARB(index, v)
 	return		void
@@ -8994,9 +8959,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4197
-	glsopcode	0x0240
 	alias		VertexAttrib1dv
-	glsalias	VertexAttrib1dv
 
 VertexAttrib1fARB(index, x)
 	return		void
@@ -9007,7 +8970,6 @@
 	vectorequiv	VertexAttrib1fvARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib1f
-	glsalias	VertexAttrib1f
 
 VertexAttrib1fvARB(index, v)
 	return		void
@@ -9017,9 +8979,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4193
-	glsopcode	0x023F
 	alias		VertexAttrib1fv
-	glsalias	VertexAttrib1fv
 
 VertexAttrib1sARB(index, x)
 	return		void
@@ -9030,7 +8990,6 @@
 	vectorequiv	VertexAttrib1svARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib1s
-	glsalias	VertexAttrib1s
 
 VertexAttrib1svARB(index, v)
 	return		void
@@ -9040,9 +8999,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4189
-	glsopcode	0x023E
 	alias		VertexAttrib1sv
-	glsalias	VertexAttrib1sv
 
 VertexAttrib2dARB(index, x, y)
 	return		void
@@ -9054,7 +9011,6 @@
 	vectorequiv	VertexAttrib2dvARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib2d
-	glsalias	VertexAttrib2d
 
 VertexAttrib2dvARB(index, v)
 	return		void
@@ -9064,9 +9020,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4198
-	glsopcode	0x0243
 	alias		VertexAttrib2dv
-	glsalias	VertexAttrib2dv
 
 VertexAttrib2fARB(index, x, y)
 	return		void
@@ -9078,7 +9032,6 @@
 	vectorequiv	VertexAttrib2fvARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib2f
-	glsalias	VertexAttrib2f
 
 VertexAttrib2fvARB(index, v)
 	return		void
@@ -9088,9 +9041,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4194
-	glsopcode	0x0242
 	alias		VertexAttrib2fv
-	glsalias	VertexAttrib2fv
 
 VertexAttrib2sARB(index, x, y)
 	return		void
@@ -9102,7 +9053,6 @@
 	vectorequiv	VertexAttrib2svARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib2s
-	glsalias	VertexAttrib2s
 
 VertexAttrib2svARB(index, v)
 	return		void
@@ -9112,9 +9062,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4190
-	glsopcode	0x0241
 	alias		VertexAttrib2sv
-	glsalias	VertexAttrib2sv
 
 VertexAttrib3dARB(index, x, y, z)
 	return		void
@@ -9127,7 +9075,6 @@
 	vectorequiv	VertexAttrib3dvARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib3d
-	glsalias	VertexAttrib3d
 
 VertexAttrib3dvARB(index, v)
 	return		void
@@ -9137,9 +9084,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4199
-	glsopcode	0x0246
 	alias		VertexAttrib3dv
-	glsalias	VertexAttrib3dv
 
 VertexAttrib3fARB(index, x, y, z)
 	return		void
@@ -9152,7 +9097,6 @@
 	vectorequiv	VertexAttrib3fvARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib3f
-	glsalias	VertexAttrib3f
 
 VertexAttrib3fvARB(index, v)
 	return		void
@@ -9162,9 +9106,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4195
-	glsopcode	0x0245
 	alias		VertexAttrib3fv
-	glsalias	VertexAttrib3fv
 
 VertexAttrib3sARB(index, x, y, z)
 	return		void
@@ -9177,7 +9119,6 @@
 	vectorequiv	VertexAttrib3svARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib3s
-	glsalias	VertexAttrib3s
 
 VertexAttrib3svARB(index, v)
 	return		void
@@ -9187,9 +9128,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4191
-	glsopcode	0x0244
 	alias		VertexAttrib3sv
-	glsalias	VertexAttrib3sv
 
 VertexAttrib4NbvARB(index, v)
 	return		void
@@ -9199,7 +9138,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4Nbv
-	glsalias	VertexAttrib4Nbv
 
 VertexAttrib4NivARB(index, v)
 	return		void
@@ -9209,7 +9147,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4Niv
-	glsalias	VertexAttrib4Niv
 
 VertexAttrib4NsvARB(index, v)
 	return		void
@@ -9219,7 +9156,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4Nsv
-	glsalias	VertexAttrib4Nsv
 
 VertexAttrib4NubARB(index, x, y, z, w)
 	return		void
@@ -9232,7 +9168,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4Nub
-	glsalias	VertexAttrib4Nub
 
 VertexAttrib4NubvARB(index, v)
 	return		void
@@ -9242,9 +9177,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4201
-	glsopcode	0x024A
 	alias		VertexAttrib4Nubv
-	glsalias	VertexAttrib4Nubv
 
 VertexAttrib4NuivARB(index, v)
 	return		void
@@ -9254,7 +9187,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4Nuiv
-	glsalias	VertexAttrib4Nuiv
 
 VertexAttrib4NusvARB(index, v)
 	return		void
@@ -9264,7 +9196,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4Nusv
-	glsalias	VertexAttrib4Nusv
 
 VertexAttrib4bvARB(index, v)
 	return		void
@@ -9274,7 +9205,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4bv
-	glsalias	VertexAttrib4bv
 
 VertexAttrib4dARB(index, x, y, z, w)
 	return		void
@@ -9288,7 +9218,6 @@
 	vectorequiv	VertexAttrib4dvARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4d
-	glsalias	VertexAttrib4d
 
 VertexAttrib4dvARB(index, v)
 	return		void
@@ -9298,9 +9227,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4200
-	glsopcode	0x0249
 	alias		VertexAttrib4dv
-	glsalias	VertexAttrib4dv
 
 VertexAttrib4fARB(index, x, y, z, w)
 	return		void
@@ -9314,7 +9241,6 @@
 	vectorequiv	VertexAttrib4fvARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4f
-	glsalias	VertexAttrib4f
 
 VertexAttrib4fvARB(index, v)
 	return		void
@@ -9324,9 +9250,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4196
-	glsopcode	0x0248
 	alias		VertexAttrib4fv
-	glsalias	VertexAttrib4fv
 
 VertexAttrib4ivARB(index, v)
 	return		void
@@ -9336,7 +9260,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4iv
-	glsalias	VertexAttrib4iv
 
 VertexAttrib4sARB(index, x, y, z, w)
 	return		void
@@ -9350,7 +9273,6 @@
 	vectorequiv	VertexAttrib4svARB
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4s
-	glsalias	VertexAttrib4s
 
 VertexAttrib4svARB(index, v)
 	return		void
@@ -9360,9 +9282,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4192
-	glsopcode	0x0247
 	alias		VertexAttrib4sv
-	glsalias	VertexAttrib4sv
 
 VertexAttrib4ubvARB(index, v)
 	return		void
@@ -9372,7 +9292,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4ubv
-	glsalias	VertexAttrib4ubv
 
 VertexAttrib4uivARB(index, v)
 	return		void
@@ -9382,7 +9301,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4uiv
-	glsalias	VertexAttrib4uiv
 
 VertexAttrib4usvARB(index, v)
 	return		void
@@ -9392,7 +9310,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4usv
-	glsalias	VertexAttrib4usv
 
 VertexAttribPointerARB(index, size, type, normalized, stride, pointer)
 	return		void
@@ -9407,7 +9324,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		VertexAttribPointer
-	glsalias	VertexAttribPointer
 
 EnableVertexAttribArrayARB(index)
 	return		void
@@ -9417,7 +9333,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		EnableVertexAttribArray
-	glsalias	EnableVertexAttribArray
 
 DisableVertexAttribArrayARB(index)
 	return		void
@@ -9427,7 +9342,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	alias		DisableVertexAttribArray
-	glsalias	DisableVertexAttribArray
 
 ProgramStringARB(target, format, len, string)
 	return		void
@@ -9438,7 +9352,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		667
 
@@ -9450,7 +9363,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxropcode	4180
-	glsopcode	0x0227
 	offset		579
 
 DeleteProgramsARB(n, programs)
@@ -9462,7 +9374,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1294
-	glsopcode	0x0228
 	offset		580
 
 GenProgramsARB(n, programs)
@@ -9474,7 +9385,6 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1295
-	glsopcode	0x022A
 	offset		582
 
 ProgramEnvParameter4dARB(target, index, x, y, z, w)
@@ -9489,7 +9399,6 @@
 	version		1.3
 	vectorequiv	ProgramEnvParameter4dvARB
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		668
 
@@ -9501,7 +9410,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		669
 
@@ -9517,7 +9425,6 @@
 	version		1.3
 	vectorequiv	ProgramEnvParameter4fvARB
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		670
 
@@ -9529,7 +9436,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		671
 
@@ -9545,7 +9451,6 @@
 	version		1.3
 	vectorequiv	ProgramLocalParameter4dvARB
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		672
 
@@ -9557,7 +9462,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		673
 
@@ -9573,7 +9477,6 @@
 	version		1.3
 	vectorequiv	ProgramLocalParameter4fvARB
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		674
 
@@ -9585,7 +9488,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		675
 
@@ -9598,7 +9500,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		676
 
@@ -9611,7 +9512,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		677
 
@@ -9624,7 +9524,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		678
 
@@ -9637,7 +9536,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		679
 
@@ -9650,7 +9548,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		680
 
@@ -9663,7 +9560,6 @@
 	category	ARB_vertex_program
 	version		1.3
 	extension	soft WINSOFT NV10
-	glsflags	ignore
 	glxflags	ignore
 	offset		681
 
@@ -9677,10 +9573,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1301
-	glsflags	client get
-	glsopcode	0x0232
 	alias		GetVertexAttribdv
-	glsalias	GetVertexAttribdv
 
 GetVertexAttribfvARB(index, pname, params)
 	return		void
@@ -9692,10 +9585,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1302
-	glsflags	client get
-	glsopcode	0x0233
 	alias		GetVertexAttribfv
-	glsalias	GetVertexAttribfv
 
 GetVertexAttribivARB(index, pname, params)
 	return		void
@@ -9707,10 +9597,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1303
-	glsflags	client get
-	glsopcode	0x0234
 	alias		GetVertexAttribiv
-	glsalias	GetVertexAttribiv
 
 GetVertexAttribPointervARB(index, pname, pointer)
 	return		void
@@ -9722,10 +9609,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	client get
-	glsopcode	0x0235
 	alias		GetVertexAttribPointerv
-	glsalias	GetVertexAttribPointerv
 
 IsProgramARB(program)
 	return		Boolean
@@ -9735,9 +9619,7 @@
 	version		1.3
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1304
-	glsflags	get
 	alias		IsProgram
-	glsalias	IsProgram
 
 
 ###############################################################################
@@ -9767,7 +9649,6 @@
 	version		1.2
 	extension
 	alias		BindBuffer
-	glsalias	BindBuffer
 
 DeleteBuffersARB(n, buffers)
 	return		void
@@ -9777,7 +9658,6 @@
 	version		1.2
 	extension
 	alias		DeleteBuffers
-	glsalias	DeleteBuffers
 
 GenBuffersARB(n, buffers)
 	return		void
@@ -9787,7 +9667,6 @@
 	version		1.2
 	extension
 	alias		GenBuffers
-	glsalias	GenBuffers
 
 IsBufferARB(buffer)
 	return		Boolean
@@ -9796,7 +9675,6 @@
 	version		1.2
 	extension
 	alias		IsBuffer
-	glsalias	IsBuffer
 
 BufferDataARB(target, size, data, usage)
 	return		void
@@ -9808,7 +9686,6 @@
 	version		1.2
 	extension
 	alias		BufferData
-	glsalias	BufferData
 
 BufferSubDataARB(target, offset, size, data)
 	return		void
@@ -9820,7 +9697,6 @@
 	version		1.2
 	extension
 	alias		BufferSubData
-	glsalias	BufferSubData
 
 GetBufferSubDataARB(target, offset, size, data)
 	return		void
@@ -9833,7 +9709,6 @@
 	version		1.2
 	extension
 	alias		GetBufferSubData
-	glsalias	GetBufferSubData
 
 MapBufferARB(target, access)
 	return		VoidPointer
@@ -9843,7 +9718,6 @@
 	version		1.2
 	extension
 	alias		MapBuffer
-	glsalias	MapBuffer
 
 UnmapBufferARB(target)
 	return		Boolean
@@ -9852,7 +9726,6 @@
 	version		1.2
 	extension
 	alias		UnmapBuffer
-	glsalias	UnmapBuffer
 
 GetBufferParameterivARB(target, pname, params)
 	return		void
@@ -9864,7 +9737,6 @@
 	version		1.2
 	extension
 	alias		GetBufferParameteriv
-	glsalias	GetBufferParameteriv
 
 GetBufferPointervARB(target, pname, params)
 	return		void
@@ -9876,7 +9748,6 @@
 	version		1.2
 	extension
 	alias		GetBufferPointerv
-	glsalias	GetBufferPointerv
 
 ###############################################################################
 #
@@ -9893,7 +9764,6 @@
 	version		1.5
 	extension
 	alias		GenQueries
-	glsalias	GenQueries
 
 DeleteQueriesARB(n, ids)
 	return		void
@@ -9903,7 +9773,6 @@
 	version		1.5
 	extension
 	alias		DeleteQueries
-	glsalias	DeleteQueries
 
 IsQueryARB(id)
 	return		Boolean
@@ -9912,7 +9781,6 @@
 	version		1.5
 	extension
 	alias		IsQuery
-	glsalias	IsQuery
 
 BeginQueryARB(target, id)
 	return		void
@@ -9922,7 +9790,6 @@
 	version		1.5
 	extension
 	alias		BeginQuery
-	glsalias	BeginQuery
 
 EndQueryARB(target)
 	return		void
@@ -9931,7 +9798,6 @@
 	version		1.5
 	extension
 	alias		EndQuery
-	glsalias	EndQuery
 
 GetQueryivARB(target, pname, params)
 	return		void
@@ -9943,7 +9809,6 @@
 	version		1.5
 	extension
 	alias		GetQueryiv
-	glsalias	GetQueryiv
 
 GetQueryObjectivARB(id, pname, params)
 	return		void
@@ -9955,7 +9820,6 @@
 	version		1.5
 	extension
 	alias		GetQueryObjectiv
-	glsalias	GetQueryObjectiv
 
 GetQueryObjectuivARB(id, pname, params)
 	return		void
@@ -9967,7 +9831,6 @@
 	version		1.5
 	extension
 	alias		GetQueryObjectuiv
-	glsalias	GetQueryObjectuiv
 
 ###############################################################################
 #
@@ -9984,7 +9847,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 GetHandleARB(pname)
@@ -9996,8 +9858,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 DetachObjectARB(containerObj, attachedObj)
@@ -10010,7 +9870,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		DetachShader
-	glsalias	DetachShader
 
 CreateShaderObjectARB(shaderType)
 	return		handleARB
@@ -10021,7 +9880,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		CreateShader
-	glsalias	CreateShader
 
 ShaderSourceARB(shaderObj, count, string, length)
 	return		void
@@ -10035,7 +9893,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		ShaderSource
-	glsalias	ShaderSource
 
 CompileShaderARB(shaderObj)
 	return		void
@@ -10046,7 +9903,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		CompileShader
-	glsalias	CompileShader
 
 CreateProgramObjectARB()
 	return		handleARB
@@ -10056,7 +9912,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		CreateProgram
-	glsalias	CreateProgram
 
 AttachObjectARB(containerObj, obj)
 	return		void
@@ -10068,7 +9923,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		AttachShader
-	glsalias	AttachShader
 
 LinkProgramARB(programObj)
 	return		void
@@ -10079,7 +9933,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		LinkProgram
-	glsalias	LinkProgram
 
 UseProgramObjectARB(programObj)
 	return		void
@@ -10090,7 +9943,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		UseProgram
-	glsalias	UseProgram
 
 ValidateProgramARB(programObj)
 	return		void
@@ -10101,7 +9953,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		ValidateProgram
-	glsalias	ValidateProgram
 
 Uniform1fARB(location, v0)
 	return		void
@@ -10113,7 +9964,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform1f
-	glsalias	Uniform1f
 
 Uniform2fARB(location, v0, v1)
 	return		void
@@ -10126,7 +9976,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform2f
-	glsalias	Uniform2f
 
 Uniform3fARB(location, v0, v1, v2)
 	return		void
@@ -10140,7 +9989,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform3f
-	glsalias	Uniform3f
 
 Uniform4fARB(location, v0, v1, v2, v3)
 	return		void
@@ -10155,7 +10003,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform4f
-	glsalias	Uniform4f
 
 Uniform1iARB(location, v0)
 	return		void
@@ -10167,7 +10014,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform1i
-	glsalias	Uniform1i
 
 Uniform2iARB(location, v0, v1)
 	return		void
@@ -10180,7 +10026,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform2i
-	glsalias	Uniform2i
 
 Uniform3iARB(location, v0, v1, v2)
 	return		void
@@ -10194,7 +10039,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform3i
-	glsalias	Uniform3i
 
 Uniform4iARB(location, v0, v1, v2, v3)
 	return		void
@@ -10209,7 +10053,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform4i
-	glsalias	Uniform4i
 
 Uniform1fvARB(location, count, value)
 	return		void
@@ -10222,7 +10065,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform1fv
-	glsalias	Uniform1fv
 
 Uniform2fvARB(location, count, value)
 	return		void
@@ -10235,7 +10077,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform2fv
-	glsalias	Uniform2fv
 
 Uniform3fvARB(location, count, value)
 	return		void
@@ -10248,7 +10089,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform3fv
-	glsalias	Uniform3fv
 
 Uniform4fvARB(location, count, value)
 	return		void
@@ -10261,7 +10101,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform4fv
-	glsalias	Uniform4fv
 
 Uniform1ivARB(location, count, value)
 	return		void
@@ -10274,7 +10113,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform1iv
-	glsalias	Uniform1iv
 
 Uniform2ivARB(location, count, value)
 	return		void
@@ -10287,7 +10125,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform2iv
-	glsalias	Uniform2iv
 
 Uniform3ivARB(location, count, value)
 	return		void
@@ -10300,7 +10137,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform3iv
-	glsalias	Uniform3iv
 
 Uniform4ivARB(location, count, value)
 	return		void
@@ -10313,7 +10149,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		Uniform4iv
-	glsalias	Uniform4iv
 
 UniformMatrix2fvARB(location, count, transpose, value)
 	return		void
@@ -10327,7 +10162,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		UniformMatrix2fv
-	glsalias	UniformMatrix2fv
 
 UniformMatrix3fvARB(location, count, transpose, value)
 	return		void
@@ -10341,7 +10175,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		UniformMatrix3fv
-	glsalias	UniformMatrix3fv
 
 UniformMatrix4fvARB(location, count, transpose, value)
 	return		void
@@ -10355,7 +10188,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		UniformMatrix4fv
-	glsalias	UniformMatrix4fv
 
 GetObjectParameterfvARB(obj, pname, params)
 	return		void
@@ -10368,8 +10200,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetObjectParameterivARB(obj, pname, params)
@@ -10383,8 +10213,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetInfoLogARB(obj, maxLength, length, infoLog)
@@ -10399,8 +10227,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetAttachedObjectsARB(containerObj, maxCount, count, obj)
@@ -10416,7 +10242,6 @@
 	glxsingle	?
 	glxflags	ignore
 	alias		GetAttachedShaders
-	glsalias	GetAttachedShaders
 
 GetUniformLocationARB(programObj, name)
 	return		Int32
@@ -10429,7 +10254,6 @@
 	glxsingle	?
 	glxflags	ignore
 	alias		GetUniformLocation
-	glsalias	GetUniformLocation
 
 GetActiveUniformARB(programObj, index, maxLength, length, size, type, name)
 	return		void
@@ -10447,7 +10271,6 @@
 	glxsingle	?
 	glxflags	ignore
 	alias		GetActiveUniform
-	glsalias	GetActiveUniform
 
 GetUniformfvARB(programObj, location, params)
 	return		void
@@ -10461,7 +10284,6 @@
 	glxsingle	?
 	glxflags	ignore
 	alias		GetUniformfv
-	glsalias	GetUniformfv
 
 GetUniformivARB(programObj, location, params)
 	return		void
@@ -10475,7 +10297,6 @@
 	glxsingle	?
 	glxflags	ignore
 	alias		GetUniformiv
-	glsalias	GetUniformiv
 
 GetShaderSourceARB(obj, maxLength, length, source)
 	return		void
@@ -10490,7 +10311,6 @@
 	glxsingle	?
 	glxflags	ignore
 	alias		GetShaderSource
-	glsalias	GetShaderSource
 
 
 ###############################################################################
@@ -10511,7 +10331,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		BindAttribLocation
-	glsalias	BindAttribLocation
 
 GetActiveAttribARB(programObj, index, maxLength, length, size, type, name)
 	return		void
@@ -10529,7 +10348,6 @@
 	glxsingle	?
 	glxflags	ignore
 	alias		GetActiveAttrib
-	glsalias	GetActiveAttrib
 
 GetAttribLocationARB(programObj, name)
 	return		Int32
@@ -10542,7 +10360,6 @@
 	glxsingle	?
 	glxflags	ignore
 	alias		GetAttribLocation
-	glsalias	GetAttribLocation
 
 ###############################################################################
 #
@@ -10609,7 +10426,6 @@
 	version		1.5
 	extension
 	alias		DrawBuffers
-	glsalias	DrawBuffers
 
 ###############################################################################
 #
@@ -10638,7 +10454,6 @@
 	glxropcode	234
 	glxflags	ignore
 	alias		ClampColor
-	glsalias	ClampColor
 
 ###############################################################################
 #
@@ -10699,8 +10514,8 @@
 	dlflags		notlistable
 	vectorequiv	ArrayElement
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
+	alias		DrawArraysInstanced
 
 DrawElementsInstancedARB(mode, count, type, indices, primcount)
 	return		void
@@ -10715,8 +10530,8 @@
 	dlflags		notlistable
 	vectorequiv	ArrayElement
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
+	alias		DrawElementsInstanced
 
 ###############################################################################
 #
@@ -10734,7 +10549,6 @@
 	extension
 	glxvendorpriv	1422
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 BindRenderbuffer(target, renderbuffer)
@@ -10746,7 +10560,6 @@
 	extension
 	glxropcode	4316
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DeleteRenderbuffers(n, renderbuffers)
@@ -10758,7 +10571,6 @@
 	extension
 	glxropcode	4317
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 GenRenderbuffers(n, renderbuffers)
@@ -10770,7 +10582,6 @@
 	extension
 	glxvendorpriv	1423
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 RenderbufferStorage(target, internalformat, width, height)
@@ -10784,7 +10595,6 @@
 	extension
 	glxropcode	4318
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 GetRenderbufferParameteriv(target, pname, params)
@@ -10798,8 +10608,6 @@
 	extension
 	glxvendorpriv	1424
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 IsFramebuffer(framebuffer)
@@ -10810,7 +10618,6 @@
 	extension
 	glxvendorpriv	1425
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 BindFramebuffer(target, framebuffer)
@@ -10822,7 +10629,6 @@
 	extension
 	glxropcode	4319
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DeleteFramebuffers(n, framebuffers)
@@ -10834,7 +10640,6 @@
 	extension
 	glxropcode	4320
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 GenFramebuffers(n, framebuffers)
@@ -10846,7 +10651,6 @@
 	extension
 	glxvendorpriv	1426
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 CheckFramebufferStatus(target)
@@ -10857,7 +10661,6 @@
 	extension
 	glxvendorpriv	1427
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FramebufferTexture1D(target, attachment, textarget, texture, level)
@@ -10872,7 +10675,6 @@
 	extension
 	glxropcode	4321
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FramebufferTexture2D(target, attachment, textarget, texture, level)
@@ -10887,7 +10689,6 @@
 	extension
 	glxropcode	4322
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset)
@@ -10903,7 +10704,6 @@
 	extension
 	glxropcode	4323
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer)
@@ -10917,7 +10717,6 @@
 	extension
 	glxropcode	4324
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 GetFramebufferAttachmentParameteriv(target, attachment, pname, params)
@@ -10932,8 +10731,6 @@
 	extension
 	glxvendorpriv	1428
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GenerateMipmap(target)
@@ -10944,7 +10741,6 @@
 	extension
 	glxropcode	4325
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 # Promoted from EXT_framebuffer_blit
@@ -10963,7 +10759,6 @@
 	category	ARB_framebuffer_object
 	version		3.0
 	glxropcode	4330
-	glsopcode	?
 	offset		?
 
 # Promoted from EXT_framebuffer_multisample
@@ -10977,7 +10772,6 @@
 	category	ARB_framebuffer_object
 	version		3.0
 	glxropcode	4331
-	glsopcode	?
 	offset		?
 
 # Promoted from ARB_geometry_shader4
@@ -10993,7 +10787,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 
@@ -11023,7 +10816,6 @@
 	version		3.0
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 FramebufferTextureARB(target, attachment, texture, level)
@@ -11037,7 +10829,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 FramebufferTextureLayerARB(target, attachment, texture, level, layer)
@@ -11054,7 +10845,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		FramebufferTextureLayer
-	glsalias	FramebufferTextureLayer
 
 FramebufferTextureFaceARB(target, attachment, texture, level, face)
 	return		void
@@ -11068,7 +10858,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -11088,7 +10877,7 @@
 #
 ###############################################################################
 
-VertexAttribDivisor(index, divisor)
+VertexAttribDivisorARB(index, divisor)
 	return		void
 	param		index		UInt32 in value
 	param		divisor		UInt32 in value
@@ -11096,7 +10885,6 @@
 	version		2.0
 	extension
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -11107,7 +10895,7 @@
 ###############################################################################
 
 MapBufferRange(target, offset, length, access)
-	return		void
+	return		VoidPointer
 	param		target		BufferTargetARB in value
 	param		offset		BufferOffset in value
 	param		length		BufferSize in value
@@ -11117,7 +10905,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 # Promoted from APPLE_flush_buffer_range
@@ -11131,7 +10918,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -11150,8 +10936,7 @@
 	version		3.0
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
-	glxflags	ignore
+	alias		TexBuffer
 
 ###############################################################################
 #
@@ -11189,7 +10974,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DeleteVertexArrays(n, arrays)
@@ -11201,7 +10985,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 GenVertexArrays(n, arrays)
@@ -11213,7 +10996,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 IsVertexArray(array)
@@ -11224,13 +11006,550 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
+###############################################################################
+#
+# ARB Extension #55 - WGL_ARB_create_context
+# ARB Extension #56 - GLX_ARB_create_context
+#
+###############################################################################
 
 ###############################################################################
+#
+# ARB Extension #57
+# ARB_uniform_buffer_object commands
+#
 ###############################################################################
+
+GetUniformIndices(program, uniformCount, uniformNames, uniformIndices)
+	return		void
+	param		program		UInt32 in value
+	param		uniformCount	SizeI in value
+	param		uniformNames	CharPointer in array [COMPSIZE(uniformCount)]
+	param		uniformIndices	UInt32 out array [COMPSIZE(uniformCount)]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		uniformCount	SizeI in value
+	param		uniformIndices	UInt32 in array [COMPSIZE(uniformCount)]
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName)
+	return		void
+	param		program		UInt32 in value
+	param		uniformIndex	UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		uniformName	Char out array [bufSize]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetUniformBlockIndex(program, uniformBlockName)
+	return		UInt32
+	param		program		UInt32 in value
+	param		uniformBlockName	Char in array [COMPSIZE()]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		uniformBlockIndex	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName)
+	return		void
+	param		program		UInt32 in value
+	param		uniformBlockIndex	UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		uniformBlockName	Char out array [bufSize]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding)
+	return		void
+	param		program		UInt32 in value
+	param		uniformBlockIndex	UInt32 in value
+	param		uniformBlockBinding	UInt32 in value
+	category	ARB_uniform_buffer_object
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
 #
+# ARB Extension #58
+# ARB_compatibility commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_compatibility
+
+###############################################################################
+#
+# ARB Extension #59
+# ARB_copy_buffer commands
+#
+###############################################################################
+
+CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size)
+	return		void
+	param		readTarget	GLenum in value
+	param		writeTarget	GLenum in value
+	param		readOffset	BufferOffset in value
+	param		writeOffset	BufferOffset in value
+	param		size		BufferSize in value
+	category	ARB_copy_buffer
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #60
+# ARB_shader_texture_lod commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shader_texture_lod
+
+###############################################################################
+#
+# ARB Extension #61
+# ARB_depth_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_depth_clamp
+
+###############################################################################
+#
+# ARB Extension #62
+# ARB_draw_elements_base_vertex commands
+#
+###############################################################################
+
+DrawElementsBaseVertex(mode, count, type, indices, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		basevertex	Int32 in value
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		basevertex	Int32 in value
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsInstancedBaseVertex(mode, count, type, indices, primcount, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		primcount	SizeI in value
+	param		basevertex	Int32 in value
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementsBaseVertex(mode, count, type, indices, primcount, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in array [COMPSIZE(primcount)]
+	param		type		DrawElementsType in value
+	param		indices		VoidPointer in array [COMPSIZE(primcount)]
+	param		primcount	SizeI in value
+	param		basevertex	Int32 in array [COMPSIZE(primcount)]
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #63
+# ARB_fragment_coord_conventions commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_fragment_coord_conventions
+
+###############################################################################
+#
+# ARB Extension #64
+# ARB_provoking_vertex commands
+#
+###############################################################################
+
+ProvokingVertex(mode)
+	return		void
+	param		mode		GLenum in value
+	category	ARB_provoking_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #65
+# ARB_seamless_cube_map commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_seamless_cube_map
+
+###############################################################################
+#
+# ARB Extension #66
+# ARB_sync commands
+#
+###############################################################################
+
+FenceSync(condition, flags)
+	return		sync
+	param		condition	GLenum in value
+	param		flags		GLbitfield in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsSync(sync)
+	return		Boolean
+	param		sync		sync in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteSync(sync)
+	return		void
+	param		sync		sync in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClientWaitSync(sync, flags, timeout)
+	return		GLenum
+	param		sync		sync in value
+	param		flags		GLbitfield in value
+	param		timeout		UInt64 in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+WaitSync(sync, flags, timeout)
+	return		void
+	param		sync		sync in value
+	param		flags		GLbitfield in value
+	param		timeout		UInt64 in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetInteger64v(pname, params)
+	return		void
+	param		pname		GLenum in value
+	param		params		Int64 out array [COMPSIZE(pname)]
+	category	ARB_sync
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSynciv(sync, pname, bufSize, length, values)
+	return		void
+	param		sync		sync in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		values		Int32 out array [length]
+	category	ARB_sync
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #67
+# ARB_texture_multisample commands
+#
+###############################################################################
+
+TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_multisample
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_multisample
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetMultisamplefv(pname, index, val)
+	return		void
+	param		pname		GLenum in value
+	param		index		UInt32 in value
+	param		val		Float32 out array [COMPSIZE(pname)]
+	category	ARB_texture_multisample
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+SampleMaski(index, mask)
+	return		void
+	param		index		UInt32 in value
+	param		mask		GLbitfield in value
+	category	ARB_texture_multisample
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #68
+# ARB_vertex_array_bgra commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_vertex_array_bgra
+
+###############################################################################
+#
+# ARB Extension #69
+# ARB_draw_buffers_blend commands
+#
+###############################################################################
+
+BlendEquationi(buf, mode)
+	return		void
+	param		buf		UInt32 in value
+	param		mode		GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendEquationSeparatei(buf, modeRGB, modeAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		modeRGB		GLenum in value
+	param		modeAlpha	GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendFunci(buf, src, dst)
+	return		void
+	param		buf		UInt32 in value
+	param		src		GLenum in value
+	param		dst		GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		srcRGB		GLenum in value
+	param		dstRGB		GLenum in value
+	param		srcAlpha	GLenum in value
+	param		dstAlpha	GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #70
+# ARB_sample_shading commands
+#
+###############################################################################
+
+MinSampleShading(value)
+	return		void
+	param		value		ClampedColorF in value
+	category	ARB_sample_shading
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #71
+# ARB_texture_cube_map_array commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_cube_map_array
+
+###############################################################################
+#
+# ARB Extension #72
+# ARB_texture_gather commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_gather
+
+###############################################################################
+#
+# ARB Extension #73
+# ARB_texture_query_lod commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_query_lod
+
+###############################################################################
+#
+# ARB Extension #74 - WGL_ARB_create_context_profile
+# ARB Extension #75 - GLX_ARB_create_context_profile
+#
+###############################################################################
+
+
+###############################################################################
+###############################################################################
+#
 # Non-ARB extensions, in order by registry extension number
 #
 ###############################################################################
@@ -11265,7 +11584,6 @@
 	glxflags	EXT
 	extension	soft
 	alias		BlendColor
-	glsalias	BlendColor
 
 ###############################################################################
 #
@@ -11283,7 +11601,6 @@
 	glxropcode	4098
 	glxflags	EXT
 	extension	soft
-	glsopcode	0x0122
 	offset		414
 
 ###############################################################################
@@ -11329,7 +11646,6 @@
 	glxropcode	4114
 	extension
 	alias		TexImage3D
-	glsalias	TexImage3D
 
 TexSubImage3DEXT(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
 	return		void
@@ -11351,7 +11667,6 @@
 	glxropcode	4115
 	extension
 	alias		TexSubImage3D
-	glsalias	TexSubImage3D
 
 ###############################################################################
 #
@@ -11371,8 +11686,6 @@
 	glxflags	SGI
 	glxvendorpriv	4101
 	extension
-	glsflags	get
-	glsopcode	0x0175
 	offset		415
 
 TexFilterFuncSGIS(target, filter, n, weights)
@@ -11386,7 +11699,6 @@
 	version		1.0
 	glxropcode	2064
 	extension
-	glsopcode	0x0176
 	offset		416
 
 ###############################################################################
@@ -11418,7 +11730,6 @@
 	glxropcode	4099
 	extension
 	alias		TexSubImage1D
-	glsalias	TexSubImage1D
 
 TexSubImage2DEXT(target, level, xoffset, yoffset, width, height, format, type, pixels)
 	return		void
@@ -11438,7 +11749,6 @@
 	glxropcode	4100
 	extension
 	alias		TexSubImage2D
-	glsalias	TexSubImage2D
 
 ###############################################################################
 #
@@ -11463,7 +11773,6 @@
 	glxropcode	4119
 	extension
 	alias		CopyTexImage1D
-	glsalias	CopyTexImage1D
 
 # Arguably TexelInternalFormat, not PixelInternalFormat
 CopyTexImage2DEXT(target, level, internalformat, x, y, width, height, border)
@@ -11482,7 +11791,6 @@
 	glxropcode	4120
 	extension
 	alias		CopyTexImage2D
-	glsalias	CopyTexImage2D
 
 CopyTexSubImage1DEXT(target, level, xoffset, x, y, width)
 	return		void
@@ -11498,7 +11806,6 @@
 	glxropcode	4121
 	extension
 	alias		CopyTexSubImage1D
-	glsalias	CopyTexSubImage1D
 
 CopyTexSubImage2DEXT(target, level, xoffset, yoffset, x, y, width, height)
 	return		void
@@ -11516,7 +11823,6 @@
 	glxropcode	4122
 	extension
 	alias		CopyTexSubImage2D
-	glsalias	CopyTexSubImage2D
 
 CopyTexSubImage3DEXT(target, level, xoffset, yoffset, zoffset, x, y, width, height)
 	return		void
@@ -11535,7 +11841,6 @@
 	glxropcode	4123
 	extension
 	alias		CopyTexSubImage3D
-	glsalias	CopyTexSubImage3D
 
 ###############################################################################
 #
@@ -11557,8 +11862,6 @@
 	version		1.0
 	glxvendorpriv	5
 	extension
-	glsflags	get pixel-pack
-	glsopcode	0x0132
 	offset		417
 
 GetHistogramParameterfvEXT(target, pname, params)
@@ -11572,8 +11875,6 @@
 	glxvendorpriv	6
 	glxflags	EXT
 	extension
-	glsflags	get
-	glsopcode	0x0133
 	offset		418
 
 GetHistogramParameterivEXT(target, pname, params)
@@ -11587,8 +11888,6 @@
 	glxvendorpriv	7
 	glxflags	EXT
 	extension
-	glsflags	get
-	glsopcode	0x0134
 	offset		419
 
 GetMinmaxEXT(target, reset, format, type, values)
@@ -11604,8 +11903,6 @@
 	version		1.0
 	glxvendorpriv	8
 	extension
-	glsflags	get pixel-pack
-	glsopcode	0x0135
 	offset		420
 
 GetMinmaxParameterfvEXT(target, pname, params)
@@ -11619,8 +11916,6 @@
 	glxvendorpriv	9
 	glxflags	EXT
 	extension
-	glsflags	get
-	glsopcode	0x0136
 	offset		421
 
 GetMinmaxParameterivEXT(target, pname, params)
@@ -11634,8 +11929,6 @@
 	glxvendorpriv	10
 	glxflags	EXT
 	extension
-	glsflags	get
-	glsopcode	0x0137
 	offset		422
 
 HistogramEXT(target, width, internalformat, sink)
@@ -11650,7 +11943,6 @@
 	glxflags	EXT
 	extension
 	alias		Histogram
-	glsalias	Histogram
 
 MinmaxEXT(target, internalformat, sink)
 	return		void
@@ -11663,7 +11955,6 @@
 	glxflags	EXT
 	extension
 	alias		Minmax
-	glsalias	Minmax
 
 ResetHistogramEXT(target)
 	return		void
@@ -11674,7 +11965,6 @@
 	glxflags	EXT
 	extension
 	alias		ResetHistogram
-	glsalias	ResetHistogram
 
 ResetMinmaxEXT(target)
 	return		void
@@ -11685,7 +11975,6 @@
 	glxflags	EXT
 	extension
 	alias		ResetMinmax
-	glsalias	ResetMinmax
 
 ###############################################################################
 #
@@ -11709,7 +11998,6 @@
 	glxropcode	4101
 	extension
 	alias		ConvolutionFilter1D
-	glsalias	ConvolutionFilter1D
 
 ConvolutionFilter2DEXT(target, internalformat, width, height, format, type, image)
 	return		void
@@ -11727,7 +12015,6 @@
 	glxropcode	4102
 	extension
 	alias		ConvolutionFilter2D
-	glsalias	ConvolutionFilter2D
 
 ConvolutionParameterfEXT(target, pname, params)
 	return		void
@@ -11740,7 +12027,6 @@
 	glxflags	EXT
 	extension
 	alias		ConvolutionParameterf
-	glsalias	ConvolutionParameterf
 
 ConvolutionParameterfvEXT(target, pname, params)
 	return		void
@@ -11753,7 +12039,6 @@
 	glxflags	EXT
 	extension
 	alias		ConvolutionParameterfv
-	glsalias	ConvolutionParameterfv
 
 ConvolutionParameteriEXT(target, pname, params)
 	return		void
@@ -11766,7 +12051,6 @@
 	glxflags	EXT
 	extension
 	alias		ConvolutionParameteri
-	glsalias	ConvolutionParameteri
 
 ConvolutionParameterivEXT(target, pname, params)
 	return		void
@@ -11779,7 +12063,6 @@
 	glxflags	EXT
 	extension
 	alias		ConvolutionParameteriv
-	glsalias	ConvolutionParameteriv
 
 CopyConvolutionFilter1DEXT(target, internalformat, x, y, width)
 	return		void
@@ -11794,7 +12077,6 @@
 	glxflags	EXT
 	extension
 	alias		CopyConvolutionFilter1D
-	glsalias	CopyConvolutionFilter1D
 
 CopyConvolutionFilter2DEXT(target, internalformat, x, y, width, height)
 	return		void
@@ -11810,7 +12092,6 @@
 	glxflags	EXT
 	extension
 	alias		CopyConvolutionFilter2D
-	glsalias	CopyConvolutionFilter2D
 
 GetConvolutionFilterEXT(target, format, type, image)
 	return		void
@@ -11824,8 +12105,6 @@
 	version		1.0
 	glxvendorpriv	1
 	extension
-	glsflags	get pixel-pack
-	glsopcode	0x012D
 	offset		423
 
 GetConvolutionParameterfvEXT(target, pname, params)
@@ -11839,8 +12118,6 @@
 	glxvendorpriv	2
 	glxflags	EXT
 	extension
-	glsflags	get
-	glsopcode	0x012E
 	offset		424
 
 GetConvolutionParameterivEXT(target, pname, params)
@@ -11854,8 +12131,6 @@
 	glxvendorpriv	3
 	glxflags	EXT
 	extension
-	glsflags	get
-	glsopcode	0x012F
 	offset		425
 
 GetSeparableFilterEXT(target, format, type, row, column, span)
@@ -11872,8 +12147,6 @@
 	version		1.0
 	glxvendorpriv	4
 	extension
-	glsflags	get pixel-pack
-	glsopcode	0x0130
 	offset		426
 
 SeparableFilter2DEXT(target, internalformat, width, height, format, type, row, column)
@@ -11893,7 +12166,6 @@
 	glxropcode	4109
 	extension
 	alias		SeparableFilter2D
-	glsalias	SeparableFilter2D
 
 ###############################################################################
 #
@@ -11927,7 +12199,6 @@
 	glxropcode	2053
 	extension
 	alias		ColorTable
-	glsalias	ColorTable
 
 ColorTableParameterfvSGI(target, pname, params)
 	return		void
@@ -11940,7 +12211,6 @@
 	glxflags	SGI
 	extension
 	alias		ColorTableParameterfv
-	glsalias	ColorTableParameterfv
 
 ColorTableParameterivSGI(target, pname, params)
 	return		void
@@ -11953,7 +12223,6 @@
 	glxflags	SGI
 	extension
 	alias		ColorTableParameteriv
-	glsalias	ColorTableParameteriv
 
 CopyColorTableSGI(target, internalformat, x, y, width)
 	return		void
@@ -11968,7 +12237,6 @@
 	glxflags	SGI
 	extension
 	alias		CopyColorTable
-	glsalias	CopyColorTable
 
 GetColorTableSGI(target, format, type, table)
 	return		void
@@ -11982,8 +12250,6 @@
 	version		1.0
 	glxvendorpriv	4098
 	extension
-	glsflags	get pixel-pack
-	glsopcode	0x016B
 	offset		427
 
 GetColorTableParameterfvSGI(target, pname, params)
@@ -11997,8 +12263,6 @@
 	glxflags	SGI
 	glxvendorpriv	4099
 	extension
-	glsflags	get
-	glsopcode	0x016C
 	offset		428
 
 GetColorTableParameterivSGI(target, pname, params)
@@ -12012,8 +12276,6 @@
 	glxflags	SGI
 	glxvendorpriv	4100
 	extension
-	glsflags	get
-	glsopcode	0x016D
 	offset		429
 
 ###############################################################################
@@ -12031,7 +12293,6 @@
 	glxflags	SGI
 	glxropcode	2059
 	extension
-	glsopcode	0x0170
 	offset		430
 
 ###############################################################################
@@ -12051,8 +12312,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	gl-enum
-	glsopcode	0x0192
 	offset		431
 
 PixelTexGenParameterivSGIS(pname, params)
@@ -12064,8 +12323,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	gl-enum
-	glsopcode	0x0193
 	offset		432
 
 PixelTexGenParameterfSGIS(pname, param)
@@ -12077,8 +12334,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	gl-enum
-	glsopcode	0x0194
 	offset		433
 
 PixelTexGenParameterfvSGIS(pname, params)
@@ -12090,8 +12345,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	gl-enum
-	glsopcode	0x0195
 	offset		434
 
 GetPixelTexGenParameterivSGIS(pname, params)
@@ -12104,8 +12357,6 @@
 	extension
 	glxvendorpriv	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x0196
 	offset		435
 
 GetPixelTexGenParameterfvSGIS(pname, params)
@@ -12118,8 +12369,6 @@
 	extension
 	glxvendorpriv	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x0197
 	offset		436
 
 ###############################################################################
@@ -12148,8 +12397,6 @@
 	version		1.0
 	glxropcode	2057
 	extension
-	glsflags	pixel-null pixel-unpack
-	glsopcode	0x016E
 	offset		437
 
 TexSubImage4DSGIS(target, level, xoffset, yoffset, zoffset, woffset, width, height, depth, size4d, format, type, pixels)
@@ -12173,8 +12420,6 @@
 	version		1.0
 	glxropcode	2058
 	extension
-	glsflags	pixel-unpack
-	glsopcode	0x016F
 	offset		438
 
 ###############################################################################
@@ -12221,8 +12466,6 @@
 	dlflags		notlistable
 	version		1.0
 	extension
-	glsflags	get
-	glsopcode	0x0147
 	offset		439
 
 BindTextureEXT(target, texture)
@@ -12235,7 +12478,6 @@
 	glxropcode	4117
 	extension
 	alias		BindTexture
-	glsalias	BindTexture
 
 DeleteTexturesEXT(n, textures)
 	return		void
@@ -12247,7 +12489,6 @@
 	glxflags	EXT
 	glxvendorpriv	12
 	extension
-	glsopcode	0x0149
 	offset		561
 
 GenTexturesEXT(n, textures)
@@ -12260,7 +12501,6 @@
 	glxflags	EXT
 	glxvendorpriv	13
 	extension
-	glsopcode	0x014A
 	offset		440
 
 IsTextureEXT(texture)
@@ -12272,8 +12512,6 @@
 	glxflags	EXT
 	glxvendorpriv	14
 	extension
-	glsflags	get
-	glsopcode	0x014B
 	offset		441
 
 PrioritizeTexturesEXT(n, textures, priorities)
@@ -12287,7 +12525,6 @@
 	glxropcode	4118
 	extension
 	alias		PrioritizeTextures
-	glsalias	PrioritizeTextures
 
 ###############################################################################
 #
@@ -12306,7 +12543,6 @@
 	version		1.0
 	glxropcode	2051
 	extension
-	glsopcode	0x0163
 	offset		442
 
 GetDetailTexFuncSGIS(target, points)
@@ -12319,8 +12555,6 @@
 	glxflags	SGI
 	glxvendorpriv	4096
 	extension
-	glsflags	get
-	glsopcode	0x0164
 	offset		443
 
 ###############################################################################
@@ -12340,7 +12574,6 @@
 	version		1.0
 	glxropcode	2052
 	extension
-	glsopcode	0x0165
 	offset		444
 
 GetSharpenTexFuncSGIS(target, points)
@@ -12353,8 +12586,6 @@
 	glxflags	SGI
 	glxvendorpriv	4097
 	extension
-	glsflags	get
-	glsopcode	0x0166
 	offset		445
 
 ###############################################################################
@@ -12394,7 +12625,6 @@
 	glxflags	SGI
 	extension
 	alias		SampleMaskEXT
-	glsalias	SampleMaskEXT
 
 SamplePatternSGIS(pattern)
 	return		void
@@ -12405,7 +12635,6 @@
 	glxflags	SGI
 	extension
 	alias		SamplePatternEXT
-	glsalias	SamplePatternEXT
 
 ###############################################################################
 #
@@ -12446,7 +12675,6 @@
 	version		1.0
 	extension
 	alias		ArrayElement
-	glsalias	ArrayElement
 
 ColorPointerEXT(size, type, stride, count, pointer)
 	return		void
@@ -12460,8 +12688,6 @@
 	glxflags	client-handcode server-handcode EXT
 	version		1.0
 	extension
-	glsflags	client
-	glsopcode	0x013F
 	offset		448
 
 DrawArraysEXT(mode, first, count)
@@ -12476,7 +12702,6 @@
 	glxropcode	4116
 	extension
 	alias		DrawArrays
-	glsopcode	0x0140
 
 EdgeFlagPointerEXT(stride, count, pointer)
 	return		void
@@ -12488,8 +12713,6 @@
 	glxflags	client-handcode server-handcode EXT
 	version		1.0
 	extension
-	glsflags	client
-	glsopcode	0x0141
 	offset		449
 
 GetPointervEXT(pname, params)
@@ -12502,7 +12725,6 @@
 	version		1.0
 	extension
 	alias		GetPointerv
-	glsalias	GetPointerv
 
 IndexPointerEXT(type, stride, count, pointer)
 	return		void
@@ -12515,8 +12737,6 @@
 	glxflags	client-handcode server-handcode EXT
 	version		1.0
 	extension
-	glsflags	client
-	glsopcode	0x0143
 	offset		450
 
 NormalPointerEXT(type, stride, count, pointer)
@@ -12530,8 +12750,6 @@
 	glxflags	client-handcode server-handcode EXT
 	version		1.0
 	extension
-	glsflags	client
-	glsopcode	0x0144
 	offset		451
 
 TexCoordPointerEXT(size, type, stride, count, pointer)
@@ -12546,8 +12764,6 @@
 	glxflags	client-handcode server-handcode EXT
 	version		1.0
 	extension
-	glsflags	client
-	glsopcode	0x0145
 	offset		452
 
 VertexPointerEXT(size, type, stride, count, pointer)
@@ -12562,8 +12778,6 @@
 	glxflags	client-handcode server-handcode EXT
 	version		1.0
 	extension
-	glsflags	client
-	glsopcode	0x0146
 	offset		453
 
 ###############################################################################
@@ -12642,7 +12856,6 @@
 	glxflags	EXT
 	extension	soft
 	alias		BlendEquation
-	glsalias	BlendEquation
 
 ###############################################################################
 #
@@ -12729,8 +12942,6 @@
 	glxflags	SGI
 	glxropcode	2060
 	extension
-	glsflags	gl-enum
-	glsopcode	0x0171
 	offset		454
 
 SpriteParameterfvSGIX(pname, params)
@@ -12742,8 +12953,6 @@
 	glxflags	SGI
 	glxropcode	2061
 	extension
-	glsflags	gl-enum
-	glsopcode	0x0172
 	offset		455
 
 SpriteParameteriSGIX(pname, param)
@@ -12755,8 +12964,6 @@
 	glxflags	SGI
 	glxropcode	2062
 	extension
-	glsflags	gl-enum
-	glsopcode	0x0173
 	offset		456
 
 SpriteParameterivSGIX(pname, params)
@@ -12768,8 +12975,6 @@
 	glxflags	SGI
 	glxropcode	2063
 	extension
-	glsflags	gl-enum
-	glsopcode	0x0174
 	offset		457
 
 ###############################################################################
@@ -12798,7 +13003,6 @@
 	glxflags	SGI
 	extension
 	alias		PointParameterfARB
-	glsalias	PointParameterfARB
 
 PointParameterfvEXT(pname, params)
 	return		void
@@ -12809,7 +13013,6 @@
 	glxflags	SGI
 	extension
 	alias		PointParameterfvARB
-	glsalias	PointParameterfvARB
 
 PointParameterfSGIS(pname, param)
 	return		void
@@ -12820,7 +13023,6 @@
 	glxflags	SGI
 	extension
 	alias		PointParameterfARB
-	glsalias	PointParameterfARB
 
 PointParameterfvSGIS(pname, params)
 	return		void
@@ -12831,7 +13033,6 @@
 	glxflags	SGI
 	extension
 	alias		PointParameterfvARB
-	glsalias	PointParameterfvARB
 
 ###############################################################################
 #
@@ -12848,8 +13049,6 @@
 	glxflags	SGI
 	glxvendorpriv	4102
 	extension
-	glsflags	get
-	glsopcode	0x017A
 	offset		460
 
 InstrumentsBufferSGIX(size, buffer)
@@ -12862,8 +13061,6 @@
 	glxflags	SGI
 	glxvendorpriv	4103
 	extension
-	glsflags	client
-	glsopcode	0x017B
 	offset		461
 
 PollInstrumentsSGIX(marker_p)
@@ -12875,8 +13072,6 @@
 	glxflags	SGI
 	glxvendorpriv	4104
 	extension
-	glsflags	get
-	glsopcode	0x017C
 	offset		462
 
 ReadInstrumentsSGIX(marker)
@@ -12887,7 +13082,6 @@
 	glxflags	SGI
 	glxropcode	2077
 	extension
-	glsopcode	0x017D
 	offset		463
 
 StartInstrumentsSGIX()
@@ -12897,7 +13091,6 @@
 	glxflags	SGI
 	glxropcode	2069
 	extension
-	glsopcode	0x017E
 	offset		464
 
 StopInstrumentsSGIX(marker)
@@ -12908,7 +13101,6 @@
 	glxflags	SGI
 	glxropcode	2070
 	extension
-	glsopcode	0x017F
 	offset		465
 
 ###############################################################################
@@ -12936,7 +13128,6 @@
 	glxflags	SGI
 	glxropcode	2072
 	extension
-	glsopcode	0x0182
 	offset		466
 
 ###############################################################################
@@ -12953,7 +13144,6 @@
 	glxropcode	2050
 	glxflags	SGI
 	extension
-	glsopcode	0x0162
 	offset		467
 
 ###############################################################################
@@ -12985,8 +13175,6 @@
 	glxflags	SGI ignore
 	glxropcode	2073
 	extension
-	glsflags	capture-handcode
-	glsopcode	0x0184
 	offset		?
 
 DeformationMap3fSGIX(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points)
@@ -13011,8 +13199,6 @@
 	glxflags	SGI ignore
 	glxropcode	2074
 	extension
-	glsflags	capture-handcode
-	glsopcode	0x0185
 	offset		?
 
 DeformSGIX(mask)
@@ -13023,7 +13209,6 @@
 	glxflags	SGI ignore
 	glxropcode	2075
 	extension
-	glsopcode	0x0186
 	offset		?
 
 LoadIdentityDeformationMapSGIX(mask)
@@ -13034,7 +13219,6 @@
 	glxflags	SGI ignore
 	glxropcode	2076
 	extension
-	glsopcode	0x0187
 	offset		?
 
 ###############################################################################
@@ -13052,7 +13236,6 @@
 	glxflags	SGI
 	glxropcode	2071
 	extension
-	glsopcode	0x0181
 	offset		468
 
 ###############################################################################
@@ -13070,7 +13253,6 @@
 	glxflags	SGI
 	glxvendorpriv	4105
 	extension
-	glsopcode	0x0180
 	offset		469
 
 ###############################################################################
@@ -13105,7 +13287,6 @@
 	glxflags	SGI
 	glxropcode	2067
 	extension
-	glsopcode	0x0179
 	offset
 
 # Need to insert GLX information
@@ -13117,8 +13298,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	extension
-	glsflags	get
-	glsopcode	0x0191
 	offset
 
 ###############################################################################
@@ -13146,7 +13325,6 @@
 	category	HP_image_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ImageTransformParameterfHP(target, pname, param)
@@ -13157,7 +13335,6 @@
 	category	HP_image_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ImageTransformParameterivHP(target, pname, params)
@@ -13168,7 +13345,6 @@
 	category	HP_image_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ImageTransformParameterfvHP(target, pname, params)
@@ -13179,7 +13355,6 @@
 	category	HP_image_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 GetImageTransformParameterivHP(target, pname, params)
@@ -13191,7 +13366,6 @@
 	category	HP_image_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 GetImageTransformParameterfvHP(target, pname, params)
@@ -13202,7 +13376,6 @@
 	category	HP_image_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -13264,7 +13437,6 @@
 	category	EXT_color_subtable
 	version		1.2
 	alias		ColorSubTable
-	glsalias	ColorSubTable
 
 CopyColorSubTableEXT(target, start, x, y, width)
 	return		void
@@ -13276,7 +13448,6 @@
 	category	EXT_color_subtable
 	version		1.2
 	alias		CopyColorSubTable
-	glsalias	CopyColorSubTable
 
 ###############################################################################
 #
@@ -13308,7 +13479,6 @@
 	category	PGI_misc_hints
 	version		1.1
 	offset		544
-	glsopcode	0x01D0
 
 ###############################################################################
 #
@@ -13328,7 +13498,6 @@
 	category	EXT_paletted_texture
 	version		1.1
 	alias		ColorTable
-	glsalias	ColorTable
 
 GetColorTableEXT(target, format, type, data)
 	return		void
@@ -13339,7 +13508,6 @@
 	category	EXT_paletted_texture
 	version		1.1
 	offset		550
-	glsalias	GetColorTable
 
 GetColorTableParameterivEXT(target, pname, params)
 	return		void
@@ -13349,7 +13517,6 @@
 	category	EXT_paletted_texture
 	version		1.1
 	offset		551
-	glsalias	GetColorTableParameteriv
 
 GetColorTableParameterfvEXT(target, pname, params)
 	return		void
@@ -13359,7 +13526,6 @@
 	category	EXT_paletted_texture
 	version		1.1
 	offset		552
-	glsalias	GetColorTableParameterfv
 
 ###############################################################################
 #
@@ -13390,7 +13556,6 @@
 	version		1.0
 	glxvendorpriv	?
 	extension
-	glsopcode	0x0188
 	offset		470
 
 # @@@ Needs vendorpriv opcodes assigned
@@ -13405,7 +13570,6 @@
 	version		1.0
 	glxvendorpriv	?
 	extension
-	glsopcode	0x0189
 	offset		471
 
 ListParameterfSGIX(list, pname, param)
@@ -13419,7 +13583,6 @@
 	version		1.0
 	glxropcode	2078
 	extension
-	glsopcode	0x018A
 	offset		472
 
 ListParameterfvSGIX(list, pname, params)
@@ -13433,7 +13596,6 @@
 	version		1.0
 	glxropcode	2079
 	extension
-	glsopcode	0x018B
 	offset		473
 
 ListParameteriSGIX(list, pname, param)
@@ -13447,7 +13609,6 @@
 	version		1.0
 	glxropcode	2080
 	extension
-	glsopcode	0x018C
 	offset		474
 
 ListParameterivSGIX(list, pname, params)
@@ -13461,7 +13622,6 @@
 	version		1.0
 	glxropcode	2081
 	extension
-	glsopcode	0x018D
 	offset		475
 
 ###############################################################################
@@ -13552,7 +13712,6 @@
 	version		1.1
 	extension	soft
 	glxflags	ignore
-	glsopcode	0x01D1
 	offset		538
 
 ###############################################################################
@@ -13570,7 +13729,6 @@
 	version		1.1
 	extension	soft
 	glxflags	ignore
-	glsopcode	0x01D2
 	offset		539
 
 ###############################################################################
@@ -13599,7 +13757,6 @@
 	dlflags		notlistable
 	extension	soft
 	glxflags	ignore
-	glsopcode	0x01D3
 	offset		540
 
 UnlockArraysEXT()
@@ -13609,7 +13766,6 @@
 	dlflags		notlistable
 	extension	soft
 	glxflags	ignore
-	glsopcode	0x01D4
 	offset		541
 
 ###############################################################################
@@ -13628,7 +13784,6 @@
 	dlflags		notlistable
 	extension	soft
 	glxflags	ignore
-	glsopcode	0x01D5
 	offset		542
 
 CullParameterfvEXT(pname, params)
@@ -13640,7 +13795,6 @@
 	dlflags		notlistable
 	extension	soft
 	glxflags	ignore
-	glsopcode	0x01D6
 	offset		543
 
 ###############################################################################
@@ -13675,7 +13829,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsopcode	0x019E
 	offset		476
 
 FragmentLightfSGIX(light, pname, param)
@@ -13687,7 +13840,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsopcode	0x019F
 	offset		477
 
 FragmentLightfvSGIX(light, pname, params)
@@ -13699,7 +13851,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsopcode	0x01A0
 	offset		478
 
 FragmentLightiSGIX(light, pname, param)
@@ -13711,7 +13862,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsopcode	0x01A1
 	offset		479
 
 FragmentLightivSGIX(light, pname, params)
@@ -13723,7 +13873,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsopcode	0x01A2
 	offset		480
 
 FragmentLightModelfSGIX(pname, param)
@@ -13734,8 +13883,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsflags	gl-enum
-	glsopcode	0x01A3
 	offset		481
 
 FragmentLightModelfvSGIX(pname, params)
@@ -13746,8 +13893,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsflags	gl-enum
-	glsopcode	0x01A4
 	offset		482
 
 FragmentLightModeliSGIX(pname, param)
@@ -13758,8 +13903,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsflags	gl-enum
-	glsopcode	0x01A5
 	offset		483
 
 FragmentLightModelivSGIX(pname, params)
@@ -13770,8 +13913,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsflags	gl-enum
-	glsopcode	0x01A6
 	offset		484
 
 FragmentMaterialfSGIX(face, pname, param)
@@ -13783,7 +13924,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsopcode	0x01A7
 	offset		485
 
 FragmentMaterialfvSGIX(face, pname, params)
@@ -13795,7 +13935,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsopcode	0x01A8
 	offset		486
 
 FragmentMaterialiSGIX(face, pname, param)
@@ -13807,7 +13946,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsopcode	0x01A9
 	offset		487
 
 FragmentMaterialivSGIX(face, pname, params)
@@ -13819,7 +13957,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsopcode	0x01AA
 	offset		488
 
 GetFragmentLightfvSGIX(light, pname, params)
@@ -13832,8 +13969,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsflags	get
-	glsopcode	0x01AB
 	offset		489
 
 GetFragmentLightivSGIX(light, pname, params)
@@ -13846,8 +13981,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsflags	get
-	glsopcode	0x01AC
 	offset		490
 
 GetFragmentMaterialfvSGIX(face, pname, params)
@@ -13860,8 +13993,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsflags	get
-	glsopcode	0x01AD
 	offset		491
 
 GetFragmentMaterialivSGIX(face, pname, params)
@@ -13874,8 +14005,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsflags	get
-	glsopcode	0x01AE
 	offset		492
 
 LightEnviSGIX(pname, param)
@@ -13886,8 +14015,6 @@
 	glxflags	ignore
 	version		1.0
 	extension
-	glsflags	gl-enum
-	glsopcode	0x01AF
 	offset		493
 
 ###############################################################################
@@ -13943,7 +14070,6 @@
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
 	alias		DrawRangeElements
-	glsalias	DrawRangeElements
 
 ###############################################################################
 #
@@ -13986,7 +14112,6 @@
 	category	EXT_light_texture
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TextureLightEXT(pname)
@@ -13995,7 +14120,6 @@
 	category	EXT_light_texture
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TextureMaterialEXT(face, mode)
@@ -14005,7 +14129,6 @@
 	category	EXT_light_texture
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -14069,7 +14192,6 @@
 	version		1.0
 	glxflags	ignore
 	extension
-	glsopcode	0x0198
 	offset		?
 
 FinishAsyncSGIX(markerp)
@@ -14080,7 +14202,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	extension
-	glsopcode	0x0199
 	offset		?
 
 PollAsyncSGIX(markerp)
@@ -14091,7 +14212,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	extension
-	glsopcode	0x019A
 	offset		?
 
 GenAsyncMarkersSGIX(range)
@@ -14102,7 +14222,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	extension
-	glsopcode	0x019B
 	offset		?
 
 DeleteAsyncMarkersSGIX(marker, range)
@@ -14114,7 +14233,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	extension
-	glsopcode	0x019C
 	offset		?
 
 IsAsyncMarkerSGIX(marker)
@@ -14125,7 +14243,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	extension
-	glsopcode	0x019D
 	offset		?
 
 ###############################################################################
@@ -14170,7 +14287,6 @@
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode EXT
 	version		1.1
-	glsflags	ignore client
 	offset		?
 
 NormalPointervINTEL(type, pointer)
@@ -14181,7 +14297,6 @@
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode EXT
 	version		1.1
-	glsflags	ignore client
 	offset		?
 
 ColorPointervINTEL(size, type, pointer)
@@ -14193,7 +14308,6 @@
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode EXT
 	version		1.1
-	glsflags	ignore client
 	offset		?
 
 TexCoordPointervINTEL(size, type, pointer)
@@ -14205,7 +14319,6 @@
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode EXT
 	version		1.1
-	glsflags	ignore client
 	offset		?
 
 
@@ -14234,7 +14347,6 @@
 	category	EXT_pixel_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 PixelTransformParameterfEXT(target, pname, param)
@@ -14245,7 +14357,6 @@
 	category	EXT_pixel_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 PixelTransformParameterivEXT(target, pname, params)
@@ -14256,7 +14367,6 @@
 	category	EXT_pixel_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 PixelTransformParameterfvEXT(target, pname, params)
@@ -14267,7 +14377,6 @@
 	category	EXT_pixel_transform
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -14329,7 +14438,6 @@
 	vectorequiv	SecondaryColor3bvEXT
 	version		1.1
 	alias		SecondaryColor3b
-	glsalias	SecondaryColor3b
 
 SecondaryColor3bvEXT(v)
 	return		void
@@ -14338,7 +14446,6 @@
 	version		1.1
 	glxropcode	4126
 	alias		SecondaryColor3bv
-	glsalias	SecondaryColor3bv
 
 SecondaryColor3dEXT(red, green, blue)
 	return		void
@@ -14349,7 +14456,6 @@
 	vectorequiv	SecondaryColor3dvEXT
 	version		1.1
 	alias		SecondaryColor3d
-	glsalias	SecondaryColor3d
 
 SecondaryColor3dvEXT(v)
 	return		void
@@ -14358,7 +14464,6 @@
 	version		1.1
 	glxropcode	4130
 	alias		SecondaryColor3dv
-	glsalias	SecondaryColor3dv
 
 SecondaryColor3fEXT(red, green, blue)
 	return		void
@@ -14369,7 +14474,6 @@
 	vectorequiv	SecondaryColor3fvEXT
 	version		1.1
 	alias		SecondaryColor3f
-	glsalias	SecondaryColor3f
 
 SecondaryColor3fvEXT(v)
 	return		void
@@ -14378,7 +14482,6 @@
 	version		1.1
 	glxropcode	4129
 	alias		SecondaryColor3fv
-	glsalias	SecondaryColor3fv
 
 SecondaryColor3iEXT(red, green, blue)
 	return		void
@@ -14389,7 +14492,6 @@
 	vectorequiv	SecondaryColor3ivEXT
 	version		1.1
 	alias		SecondaryColor3i
-	glsalias	SecondaryColor3i
 
 SecondaryColor3ivEXT(v)
 	return		void
@@ -14397,10 +14499,8 @@
 	category	EXT_secondary_color
 	version		1.1
 	glxropcode	4128
-	glsopcode	0x0200
 	offset		568
 	alias		SecondaryColor3iv
-	glsalias	SecondaryColor3iv
 
 SecondaryColor3sEXT(red, green, blue)
 	return		void
@@ -14411,7 +14511,6 @@
 	vectorequiv	SecondaryColor3svEXT
 	version		1.1
 	alias		SecondaryColor3s
-	glsalias	SecondaryColor3s
 
 SecondaryColor3svEXT(v)
 	return		void
@@ -14420,7 +14519,6 @@
 	version		1.1
 	glxropcode	4127
 	alias		SecondaryColor3sv
-	glsalias	SecondaryColor3sv
 
 SecondaryColor3ubEXT(red, green, blue)
 	return		void
@@ -14431,7 +14529,6 @@
 	vectorequiv	SecondaryColor3ubvEXT
 	version		1.1
 	alias		SecondaryColor3ub
-	glsalias	SecondaryColor3ub
 
 SecondaryColor3ubvEXT(v)
 	return		void
@@ -14440,7 +14537,6 @@
 	version		1.1
 	glxropcode	4131
 	alias		SecondaryColor3ubv
-	glsalias	SecondaryColor3ubv
 
 SecondaryColor3uiEXT(red, green, blue)
 	return		void
@@ -14451,7 +14547,6 @@
 	vectorequiv	SecondaryColor3uivEXT
 	version		1.1
 	alias		SecondaryColor3ui
-	glsalias	SecondaryColor3ui
 
 SecondaryColor3uivEXT(v)
 	return		void
@@ -14460,7 +14555,6 @@
 	version		1.1
 	glxropcode	4133
 	alias		SecondaryColor3uiv
-	glsalias	SecondaryColor3uiv
 
 SecondaryColor3usEXT(red, green, blue)
 	return		void
@@ -14471,7 +14565,6 @@
 	vectorequiv	SecondaryColor3usvEXT
 	version		1.1
 	alias		SecondaryColor3us
-	glsalias	SecondaryColor3us
 
 SecondaryColor3usvEXT(v)
 	return		void
@@ -14480,7 +14573,6 @@
 	version		1.1
 	glxropcode	4132
 	alias		SecondaryColor3usv
-	glsalias	SecondaryColor3usv
 
 SecondaryColorPointerEXT(size, type, stride, pointer)
 	return		void
@@ -14494,7 +14586,6 @@
 	version		1.1
 	extension
 	alias		SecondaryColorPointer
-	glsalias	SecondaryColorPointer
 
 ###############################################################################
 #
@@ -14520,7 +14611,6 @@
 	category	EXT_texture_perturb_normal
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -14541,7 +14631,6 @@
 	version		1.1
 	glxropcode	?
 	alias		MultiDrawArrays
-	glsalias	MultiDrawArrays
 
 MultiDrawElementsEXT(mode, count, type, indices, primcount)
 	return		void
@@ -14554,7 +14643,6 @@
 	version		1.1
 	glxropcode	?
 	alias		MultiDrawElements
-	glsalias	MultiDrawElements
 
 ###############################################################################
 #
@@ -14570,7 +14658,6 @@
 	vectorequiv	FogCoordfvEXT
 	version		1.1
 	alias		FogCoordf
-	glsalias	FogCoordf
 
 FogCoordfvEXT(coord)
 	return		void
@@ -14579,7 +14666,6 @@
 	version		1.1
 	glxropcode	4124
 	alias		FogCoordfv
-	glsalias	FogCoordfv
 
 FogCoorddEXT(coord)
 	return		void
@@ -14588,7 +14674,6 @@
 	vectorequiv	FogCoorddvEXT
 	version		1.1
 	alias		FogCoordd
-	glsalias	FogCoordd
 
 FogCoorddvEXT(coord)
 	return		void
@@ -14597,7 +14682,6 @@
 	version		1.1
 	glxropcode	4125
 	alias		FogCoorddv
-	glsalias	FogCoorddv
 
 FogCoordPointerEXT(type, stride, pointer)
 	return		void
@@ -14609,7 +14693,6 @@
 	version		1.1
 	glxflags	client-handcode server-handcode EXT
 	alias		FogCoordPointer
-	glsalias	FogCoordPointer
 
 ###############################################################################
 #
@@ -14646,7 +14729,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Tangent3bvEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Tangent3bvEXT(v)
@@ -14655,7 +14737,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Tangent3dEXT(tx, ty, tz)
@@ -14666,7 +14747,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Tangent3dvEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Tangent3dvEXT(v)
@@ -14675,7 +14755,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Tangent3fEXT(tx, ty, tz)
@@ -14686,7 +14765,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Tangent3fvEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Tangent3fvEXT(v)
@@ -14695,7 +14773,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Tangent3iEXT(tx, ty, tz)
@@ -14706,7 +14783,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Tangent3ivEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Tangent3ivEXT(v)
@@ -14715,7 +14791,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Tangent3sEXT(tx, ty, tz)
@@ -14726,7 +14801,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Tangent3svEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Tangent3svEXT(v)
@@ -14735,7 +14809,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Binormal3bEXT(bx, by, bz)
@@ -14746,7 +14819,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Binormal3bvEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Binormal3bvEXT(v)
@@ -14755,7 +14827,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Binormal3dEXT(bx, by, bz)
@@ -14766,7 +14837,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Binormal3dvEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Binormal3dvEXT(v)
@@ -14775,7 +14845,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Binormal3fEXT(bx, by, bz)
@@ -14786,7 +14855,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Binormal3fvEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Binormal3fvEXT(v)
@@ -14795,7 +14863,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Binormal3iEXT(bx, by, bz)
@@ -14806,7 +14873,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Binormal3ivEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Binormal3ivEXT(v)
@@ -14815,7 +14881,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Binormal3sEXT(bx, by, bz)
@@ -14826,7 +14891,6 @@
 	category	EXT_coordinate_frame
 	vectorequiv	Binormal3svEXT
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 Binormal3svEXT(v)
@@ -14835,7 +14899,6 @@
 	category	EXT_coordinate_frame
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TangentPointerEXT(type, stride, pointer)
@@ -14847,7 +14910,6 @@
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 BinormalPointerEXT(type, stride, pointer)
@@ -14859,7 +14921,6 @@
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -14926,7 +14987,6 @@
 	category	SUNX_constant_data
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -14942,7 +15002,6 @@
 	category	SUN_global_alpha
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 GlobalAlphaFactorsSUN(factor)
@@ -14951,7 +15010,6 @@
 	category	SUN_global_alpha
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 GlobalAlphaFactoriSUN(factor)
@@ -14960,7 +15018,6 @@
 	category	SUN_global_alpha
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 GlobalAlphaFactorfSUN(factor)
@@ -14969,7 +15026,6 @@
 	category	SUN_global_alpha
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 GlobalAlphaFactordSUN(factor)
@@ -14978,7 +15034,6 @@
 	category	SUN_global_alpha
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 GlobalAlphaFactorubSUN(factor)
@@ -14987,7 +15042,6 @@
 	category	SUN_global_alpha
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 GlobalAlphaFactorusSUN(factor)
@@ -14996,7 +15050,6 @@
 	category	SUN_global_alpha
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 GlobalAlphaFactoruiSUN(factor)
@@ -15005,7 +15058,6 @@
 	category	SUN_global_alpha
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -15021,7 +15073,6 @@
 	category	SUN_triangle_list
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeusSUN(code)
@@ -15030,7 +15081,6 @@
 	category	SUN_triangle_list
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeubSUN(code)
@@ -15039,7 +15089,6 @@
 	category	SUN_triangle_list
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuivSUN(code)
@@ -15048,7 +15097,6 @@
 	category	SUN_triangle_list
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeusvSUN(code)
@@ -15057,7 +15105,6 @@
 	category	SUN_triangle_list
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeubvSUN(code)
@@ -15066,7 +15113,6 @@
 	category	SUN_triangle_list
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodePointerSUN(type, stride, pointer)
@@ -15077,7 +15123,6 @@
 	category	SUN_triangle_list
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -15098,7 +15143,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Color4ubVertex2fvSUN(c, v)
@@ -15108,7 +15152,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Color4ubVertex3fSUN(r, g, b, a, x, y, z)
@@ -15123,7 +15166,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Color4ubVertex3fvSUN(c, v)
@@ -15133,7 +15175,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Color3fVertex3fSUN(r, g, b, x, y, z)
@@ -15147,7 +15188,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Color3fVertex3fvSUN(c, v)
@@ -15157,7 +15197,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Normal3fVertex3fSUN(nx, ny, nz, x, y, z)
@@ -15171,7 +15210,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Normal3fVertex3fvSUN(n, v)
@@ -15181,7 +15219,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Color4fNormal3fVertex3fSUN(r, g, b, a, nx, ny, nz, x, y, z)
@@ -15199,7 +15236,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 Color4fNormal3fVertex3fvSUN(c, n, v)
@@ -15210,7 +15246,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fVertex3fSUN(s, t, x, y, z)
@@ -15223,7 +15258,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fVertex3fvSUN(tc, v)
@@ -15233,7 +15267,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord4fVertex4fSUN(s, t, p, q, x, y, z, w)
@@ -15249,7 +15282,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord4fVertex4fvSUN(tc, v)
@@ -15259,7 +15291,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fColor4ubVertex3fSUN(s, t, r, g, b, a, x, y, z)
@@ -15276,7 +15307,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fColor4ubVertex3fvSUN(tc, c, v)
@@ -15287,7 +15317,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fColor3fVertex3fSUN(s, t, r, g, b, x, y, z)
@@ -15303,7 +15332,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fColor3fVertex3fvSUN(tc, c, v)
@@ -15314,7 +15342,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fNormal3fVertex3fSUN(s, t, nx, ny, nz, x, y, z)
@@ -15330,7 +15357,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fNormal3fVertex3fvSUN(tc, n, v)
@@ -15341,7 +15367,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fColor4fNormal3fVertex3fSUN(s, t, r, g, b, a, nx, ny, nz, x, y, z)
@@ -15361,7 +15386,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord2fColor4fNormal3fVertex3fvSUN(tc, c, n, v)
@@ -15373,7 +15397,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord4fColor4fNormal3fVertex4fSUN(s, t, p, q, r, g, b, a, nx, ny, nz, x, y, z, w)
@@ -15396,7 +15419,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoord4fColor4fNormal3fVertex4fvSUN(tc, c, n, v)
@@ -15408,7 +15430,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiVertex3fSUN(rc, x, y, z)
@@ -15420,7 +15441,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiVertex3fvSUN(rc, v)
@@ -15430,7 +15450,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiColor4ubVertex3fSUN(rc, r, g, b, a, x, y, z)
@@ -15446,7 +15465,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiColor4ubVertex3fvSUN(rc, c, v)
@@ -15457,7 +15475,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiColor3fVertex3fSUN(rc, r, g, b, x, y, z)
@@ -15472,7 +15489,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiColor3fVertex3fvSUN(rc, c, v)
@@ -15483,7 +15499,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiNormal3fVertex3fSUN(rc, nx, ny, nz, x, y, z)
@@ -15498,7 +15513,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiNormal3fVertex3fvSUN(rc, n, v)
@@ -15509,7 +15523,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiColor4fNormal3fVertex3fSUN(rc, r, g, b, a, nx, ny, nz, x, y, z)
@@ -15528,7 +15541,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiColor4fNormal3fVertex3fvSUN(rc, c, n, v)
@@ -15540,7 +15552,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiTexCoord2fVertex3fSUN(rc, s, t, x, y, z)
@@ -15554,7 +15565,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiTexCoord2fVertex3fvSUN(rc, tc, v)
@@ -15565,7 +15575,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN(rc, s, t, nx, ny, nz, x, y, z)
@@ -15582,7 +15591,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN(rc, tc, n, v)
@@ -15594,7 +15602,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN(rc, s, t, r, g, b, a, nx, ny, nz, x, y, z)
@@ -15615,7 +15622,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN(rc, tc, c, n, v)
@@ -15628,7 +15634,6 @@
 	category	SUN_vertex
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -15660,7 +15665,6 @@
 	version		1.0
 	extension
 	alias		BlendFuncSeparate
-	glsalias	BlendFuncSeparate
 
 BlendFuncSeparateINGR(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha)
 	return		void
@@ -15673,7 +15677,6 @@
 	version		1.0
 	extension
 	alias		BlendFuncSeparateEXT
-	glsalias	BlendFuncSeparateEXT
 
 ###############################################################################
 #
@@ -15820,7 +15823,6 @@
 	extension	soft WINSOFT NV10
 	glxropcode	4135
 	glxflags	ignore
-	glsopcode	0x01DE
 	offset		495
 
 VertexWeightPointerEXT(size, type, stride, pointer)
@@ -15834,8 +15836,6 @@
 	extension	soft WINSOFT NV10
 	dlflags		notlistable
 	glxflags	ignore
-	glsflags	client
-	glsopcode	0x01DF
 	offset		496
 
 ###############################################################################
@@ -15862,8 +15862,6 @@
 	extension	soft WINSOFT NV10
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode ignore
-	glsflags	client
-	glsopcode	0x01E0
 	offset		497
 
 VertexArrayRangeNV(length, pointer)
@@ -15875,8 +15873,6 @@
 	extension	soft WINSOFT NV10
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode ignore
-	glsflags	client
-	glsopcode	0x01E1
 	offset		498
 
 ###############################################################################
@@ -15895,8 +15891,6 @@
 	extension	soft WINSOFT NV10
 	glxropcode	4137
 	glxflags	ignore
-	glsflags	gl-enum
-	glsopcode	0x01E2
 	offset		499
 
 CombinerParameterfNV(pname, param)
@@ -15908,8 +15902,6 @@
 	extension	soft WINSOFT NV10
 	glxropcode	4136
 	glxflags	ignore
-	glsflags	gl-enum
-	glsopcode	0x01E3
 	offset		500
 
 CombinerParameterivNV(pname, params)
@@ -15921,8 +15913,6 @@
 	extension	soft WINSOFT NV10
 	glxropcode	4139
 	glxflags	ignore
-	glsflags	gl-enum
-	glsopcode	0x01E4
 	offset		501
 
 CombinerParameteriNV(pname, param)
@@ -15934,8 +15924,6 @@
 	extension	soft WINSOFT NV10
 	glxropcode	4138
 	glxflags	ignore
-	glsflags	gl-enum
-	glsopcode	0x01E5
 	offset		502
 
 CombinerInputNV(stage, portion, variable, input, mapping, componentUsage)
@@ -15951,7 +15939,6 @@
 	extension	soft WINSOFT NV10
 	glxropcode	4140
 	glxflags	ignore
-	glsopcode	0x01E6
 	offset		503
 
 CombinerOutputNV(stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum)
@@ -15971,7 +15958,6 @@
 	extension	soft WINSOFT NV10
 	glxropcode	4141
 	glxflags	ignore
-	glsopcode	0x01E7
 	offset		504
 
 FinalCombinerInputNV(variable, input, mapping, componentUsage)
@@ -15985,7 +15971,6 @@
 	extension	soft WINSOFT NV10
 	glxropcode	4142
 	glxflags	ignore
-	glsopcode	0x01E8
 	offset		505
 
 GetCombinerInputParameterfvNV(stage, portion, variable, pname, params)
@@ -16001,8 +15986,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1270
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x01E9
 	offset		506
 
 GetCombinerInputParameterivNV(stage, portion, variable, pname, params)
@@ -16018,8 +16001,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1271
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x01EA
 	offset		507
 
 GetCombinerOutputParameterfvNV(stage, portion, pname, params)
@@ -16034,8 +16015,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1272
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x01EB
 	offset		508
 
 GetCombinerOutputParameterivNV(stage, portion, pname, params)
@@ -16050,8 +16029,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1273
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x01EC
 	offset		509
 
 GetFinalCombinerInputParameterfvNV(variable, pname, params)
@@ -16065,8 +16042,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1274
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x01ED
 	offset		510
 
 GetFinalCombinerInputParameterivNV(variable, pname, params)
@@ -16080,8 +16055,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1275
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x01EE
 	offset		511
 
 ###############################################################################
@@ -16136,7 +16109,6 @@
 	category	MESA_resize_buffers
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01EF
 	offset		512
 
 ###############################################################################
@@ -16164,7 +16136,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F0
 	alias		WindowPos2dvARB
 
 WindowPos2fMESA(x, y)
@@ -16182,7 +16153,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F1
 	alias		WindowPos2fvARB
 
 WindowPos2iMESA(x, y)
@@ -16200,7 +16170,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F2
 	alias		WindowPos2ivARB
 
 WindowPos2sMESA(x, y)
@@ -16218,7 +16187,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F3
 	alias		WindowPos2svARB
 
 WindowPos3dMESA(x, y, z)
@@ -16237,7 +16205,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F4
 	alias		WindowPos3dvARB
 
 WindowPos3fMESA(x, y, z)
@@ -16256,7 +16223,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F5
 	alias		WindowPos3fvARB
 
 WindowPos3iMESA(x, y, z)
@@ -16275,7 +16241,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F6
 	alias		WindowPos3ivARB
 
 WindowPos3sMESA(x, y, z)
@@ -16294,7 +16259,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F7
 	alias		WindowPos3svARB
 
 WindowPos4dMESA(x, y, z, w)
@@ -16314,7 +16278,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F8
 	offset		530
 
 WindowPos4fMESA(x, y, z, w)
@@ -16334,7 +16297,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01F9
 	offset		532
 
 WindowPos4iMESA(x, y, z, w)
@@ -16354,7 +16316,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01FA
 	offset		534
 
 WindowPos4sMESA(x, y, z, w)
@@ -16374,7 +16335,6 @@
 	category	MESA_window_pos
 	version		1.0
 	glxropcode	?
-	glsopcode	0x01FB
 	offset		536
 
 ###############################################################################
@@ -16413,7 +16373,6 @@
 	category	IBM_multimode_draw_arrays
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		708
 
 
@@ -16428,7 +16387,6 @@
 	category	IBM_multimode_draw_arrays
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		709
 
 ###############################################################################
@@ -16448,7 +16406,6 @@
 	category	IBM_vertex_array_lists
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 SecondaryColorPointerListIBM(size, type, stride, pointer, ptrstride)
@@ -16461,7 +16418,6 @@
 	category	IBM_vertex_array_lists
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 EdgeFlagPointerListIBM(stride, pointer, ptrstride)
@@ -16472,7 +16428,6 @@
 	category	IBM_vertex_array_lists
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 FogCoordPointerListIBM(type, stride, pointer, ptrstride)
@@ -16484,7 +16439,6 @@
 	category	IBM_vertex_array_lists
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 IndexPointerListIBM(type, stride, pointer, ptrstride)
@@ -16496,7 +16450,6 @@
 	category	IBM_vertex_array_lists
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 NormalPointerListIBM(type, stride, pointer, ptrstride)
@@ -16508,7 +16461,6 @@
 	category	IBM_vertex_array_lists
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 TexCoordPointerListIBM(size, type, stride, pointer, ptrstride)
@@ -16521,7 +16473,6 @@
 	category	IBM_vertex_array_lists
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 VertexPointerListIBM(size, type, stride, pointer, ptrstride)
@@ -16534,7 +16485,6 @@
 	category	IBM_vertex_array_lists
 	version		1.1
 	glxropcode	?
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -16610,8 +16560,6 @@
 	category	3DFX_tbuffer
 	version		1.2
 	glxropcode	?
-	glsflags	ignore
-	glsopcode	0x01FC
 	offset		553
 
 ###############################################################################
@@ -16629,7 +16577,6 @@
 	version		1.0
 	glxropcode	?
 	extension
-	glsopcode	0x0160
 	offset		446
 
 SamplePatternEXT(pattern)
@@ -16640,7 +16587,6 @@
 	glxropcode	?
 	glxflags
 	extension
-	glsopcode	0x0161
 	offset		447
 
 ###############################################################################
@@ -16700,7 +16646,6 @@
 	version		1.1
 	glxropcode	2082
 	extension
-	glsopcode	0x01B0
 	offset		?
 
 ###############################################################################
@@ -16729,7 +16674,6 @@
 	glxflags	SGI ignore
 	extension
 	glxropcode	200
-	glsopcode	0x0183
 	offset		?
 
 ###############################################################################
@@ -16768,7 +16712,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1276
 	glxflags	ignore
-	glsopcode	0x0216
 	offset		647
 
 GenFencesNV(n, fences)
@@ -16781,7 +16724,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1277
 	glxflags	ignore
-	glsopcode	0x0215
 	offset		648
 
 IsFenceNV(fence)
@@ -16793,8 +16735,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1278
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x021A
 	offset		649
 
 TestFenceNV(fence)
@@ -16806,8 +16746,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1279
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x0218
 	offset		650
 
 GetFenceivNV(fence, pname, params)
@@ -16821,8 +16759,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1280
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x021B
 	offset		651
 
 FinishFenceNV(fence)
@@ -16834,8 +16770,6 @@
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1312
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x0219
 	offset		652
 
 SetFenceNV(fence, condition)
@@ -16846,7 +16780,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsopcode	0x0217
 	offset		653
 
 ###############################################################################
@@ -16872,8 +16805,6 @@
 	version		1.1
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	ignore
-	glsopcode	0x021C
 	offset		?
 
 MapParameterivNV(target, pname, params)
@@ -16885,8 +16816,6 @@
 	version		1.1
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	ignore
-	glsopcode	0x021D
 	offset		?
 
 MapParameterfvNV(target, pname, params)
@@ -16898,8 +16827,6 @@
 	version		1.1
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	ignore
-	glsopcode	0x021E
 	offset		?
 
 GetMapControlPointsNV(target, index, type, ustride, vstride, packed, points)
@@ -16916,8 +16843,6 @@
 	version		1.1
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x021F
 	offset		?
 
 GetMapParameterivNV(target, pname, params)
@@ -16930,8 +16855,6 @@
 	version		1.1
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x0220
 	offset		?
 
 GetMapParameterfvNV(target, pname, params)
@@ -16944,8 +16867,6 @@
 	version		1.1
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x0221
 	offset		?
 
 GetMapAttribParameterivNV(target, index, pname, params)
@@ -16959,8 +16880,6 @@
 	version		1.1
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x0222
 	offset		?
 
 GetMapAttribParameterfvNV(target, index, pname, params)
@@ -16974,8 +16893,6 @@
 	version		1.1
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x0223
 	offset		?
 
 EvalMapsNV(target, mode)
@@ -16986,7 +16903,6 @@
 	version		1.1
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsopcode	0x0224
 	offset		?
 
 ###############################################################################
@@ -17015,7 +16931,6 @@
 	version		1.1
 	extension
 	glxflags	ignore
-	glsopcode	0x0225
 	offset		?
 
 GetCombinerStageParameterfvNV(stage, pname, params)
@@ -17028,8 +16943,6 @@
 	version		1.1
 	extension
 	glxflags	ignore
-	glsflags	get
-	glsopcode	0x0226
 	offset		?
 
 ###############################################################################
@@ -17100,8 +17013,6 @@
 	extension	soft WINSOFT NV10
 	glxflags	ignore
 	glxvendorpriv	1293
-	glsflags	get
-	glsopcode	0x022B
 	offset		578
 
 BindProgramNV(target, id)
@@ -17112,9 +17023,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4180
-	glsopcode	0x0227
 	alias		BindProgramARB
-	glsalias	BindProgramARB
 
 DeleteProgramsNV(n, programs)
 	return		void
@@ -17125,9 +17034,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1294
-	glsopcode	0x0228
 	alias		DeleteProgramsARB
-	glsalias	DeleteProgramsARB
 
 ExecuteProgramNV(target, id, params)
 	return		void
@@ -17139,7 +17046,6 @@
 	extension	soft WINSOFT NV10
 	glxflags	ignore
 	glxropcode	4181
-	glsopcode	0x0229
 	offset		581
 
 GenProgramsNV(n, programs)
@@ -17151,9 +17057,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1295
-	glsopcode	0x022A
 	alias		GenProgramsARB
-	glsalias	GenProgramsARB
 
 GetProgramParameterdvNV(target, index, pname, params)
 	return		void
@@ -17167,8 +17071,6 @@
 	extension	soft WINSOFT NV10
 	glxflags	ignore
 	glxvendorpriv	1297
-	glsflags	get
-	glsopcode	0x022E
 	offset		583
 
 GetProgramParameterfvNV(target, index, pname, params)
@@ -17183,8 +17085,6 @@
 	extension	soft WINSOFT NV10
 	glxflags	ignore
 	glxvendorpriv	1296
-	glsflags	get
-	glsopcode	0x022D
 	offset		584
 
 # GetProgramParameterSigneddvNV(target, index, pname, params)
@@ -17197,7 +17097,6 @@
 #	  dlflags	  notlistable
 #	  version	  1.2
 #	  extension	  soft WINSOFT NV20
-#	  glsflags	  ignore
 #	  glxflags	  ignore
 #	  offset	  ?
 #
@@ -17211,7 +17110,6 @@
 #	  dlflags	  notlistable
 #	  version	  1.2
 #	  extension	  soft WINSOFT NV20
-#	  glsflags	  ignore
 #	  glxflags	  ignore
 #	  offset	  ?
 
@@ -17226,8 +17124,6 @@
 	extension	soft WINSOFT NV10
 	glxflags	ignore
 	glxvendorpriv	1298
-	glsflags	get
-	glsopcode	0x022F
 	offset		585
 
 GetProgramStringNV(id, pname, program)
@@ -17241,8 +17137,6 @@
 	extension	soft WINSOFT NV10
 	glxflags	ignore
 	glxvendorpriv	1299
-	glsflags	get
-	glsopcode	0x0230
 	offset		586
 
 GetTrackMatrixivNV(target, address, pname, params)
@@ -17257,8 +17151,6 @@
 	extension	soft WINSOFT NV10
 	glxflags	ignore
 	glxvendorpriv	1300
-	glsflags	get
-	glsopcode	0x0231
 	offset		587
 
 GetVertexAttribdvNV(index, pname, params)
@@ -17271,10 +17163,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1301
-	glsflags	client get
-	glsopcode	0x0232
 	alias		GetVertexAttribdv
-	glsalias	GetVertexAttribdv
 
 GetVertexAttribfvNV(index, pname, params)
 	return		void
@@ -17286,10 +17175,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1302
-	glsflags	client get
-	glsopcode	0x0233
 	alias		GetVertexAttribfv
-	glsalias	GetVertexAttribfv
 
 GetVertexAttribivNV(index, pname, params)
 	return		void
@@ -17301,10 +17187,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1303
-	glsflags	client get
-	glsopcode	0x0234
 	alias		GetVertexAttribiv
-	glsalias	GetVertexAttribiv
 
 GetVertexAttribPointervNV(index, pname, pointer)
 	return		void
@@ -17316,10 +17199,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	client get
-	glsopcode	0x0235
 	alias		GetVertexAttribPointerv
-	glsalias	GetVertexAttribPointerv
 
 IsProgramNV(id)
 	return		Boolean
@@ -17329,10 +17209,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxvendorpriv	1304
-	glsflags	get
-	glsopcode	0x0236
 	alias		IsProgram
-	glsalias	IsProgram
 
 LoadProgramNV(target, id, len, program)
 	return		void
@@ -17344,7 +17221,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4183
-	glsopcode	0x0237
 	offset		593
 
 ProgramParameter4dNV(target, index, x, y, z, w)
@@ -17370,7 +17246,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4185
-	glsopcode	0x0238
 	offset		595
 
 ProgramParameter4fNV(target, index, x, y, z, w)
@@ -17396,7 +17271,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4184
-	glsopcode	0x0239
 	offset		597
 
 #??? 'count' was SizeI in the latest NVIDIA gl.spec, but UInt32 in the
@@ -17411,7 +17285,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4187
-	glsopcode	0x023A
 	offset		598
 
 #??? 'count' was SizeI in the latest NVIDIA gl.spec, but UInt32 in the
@@ -17426,7 +17299,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4186
-	glsopcode	0x023B
 	offset		599
 
 # ProgramParameterSigned4dNV(target, index, x, y, z, w)
@@ -17451,7 +17323,6 @@
 #	  category	  NV_vertex_program1_1_dcc
 #	  version	  1.2
 #	  extension	  soft WINSOFT NV20
-#	  glsflags	  ignore
 #	  glxflags	  ignore
 #	  offset	  ?
 #
@@ -17477,7 +17348,6 @@
 #	  category	  NV_vertex_program1_1_dcc
 #	  version	  1.2
 #	  extension	  soft WINSOFT NV20
-#	  glsflags	  ignore
 #	  glxflags	  ignore
 #	  offset	  ?
 #
@@ -17490,7 +17360,6 @@
 #	  category	  NV_vertex_program1_1_dcc
 #	  version	  1.2
 #	  extension	  soft WINSOFT NV20
-#	  glsflags	  ignore
 #	  glxflags	  ignore
 #	  offset	  ?
 #
@@ -17503,7 +17372,6 @@
 #	  category	  NV_vertex_program1_1_dcc
 #	  version	  1.2
 #	  extension	  soft WINSOFT NV20
-#	  glsflags	  ignore
 #	  glxflags	  ignore
 #	  offset	  ?
 
@@ -17515,7 +17383,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4182
-	glsopcode	0x022C
 	offset		600
 
 TrackMatrixNV(target, address, matrix, transform)
@@ -17528,7 +17395,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4188
-	glsopcode	0x023C
 	offset		601
 
 VertexAttribPointerNV(index, fsize, type, stride, pointer)
@@ -17543,8 +17409,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxflags	ignore
-	glsflags	client
-	glsopcode	0x023D
 	offset		602
 
 VertexAttrib1dNV(index, x)
@@ -17556,7 +17420,6 @@
 	vectorequiv	VertexAttrib1dvNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib1d
-	glsalias	VertexAttrib1d
 
 VertexAttrib1dvNV(index, v)
 	return		void
@@ -17566,9 +17429,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4197
-	glsopcode	0x0240
 	alias		VertexAttrib1dv
-	glsalias	VertexAttrib1dv
 
 VertexAttrib1fNV(index, x)
 	return		void
@@ -17579,7 +17440,6 @@
 	vectorequiv	VertexAttrib1fvNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib1f
-	glsalias	VertexAttrib1f
 
 VertexAttrib1fvNV(index, v)
 	return		void
@@ -17589,9 +17449,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4193
-	glsopcode	0x023F
 	alias		VertexAttrib1fv
-	glsalias	VertexAttrib1fv
 
 VertexAttrib1sNV(index, x)
 	return		void
@@ -17602,7 +17460,6 @@
 	vectorequiv	VertexAttrib1svNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib1s
-	glsalias	VertexAttrib1s
 
 VertexAttrib1svNV(index, v)
 	return		void
@@ -17612,9 +17469,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4189
-	glsopcode	0x023E
 	alias		VertexAttrib1sv
-	glsalias	VertexAttrib1sv
 
 VertexAttrib2dNV(index, x, y)
 	return		void
@@ -17626,7 +17481,6 @@
 	vectorequiv	VertexAttrib2dvNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib2d
-	glsalias	VertexAttrib2d
 
 VertexAttrib2dvNV(index, v)
 	return		void
@@ -17636,9 +17490,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4198
-	glsopcode	0x0243
 	alias		VertexAttrib2dv
-	glsalias	VertexAttrib2dv
 
 VertexAttrib2fNV(index, x, y)
 	return		void
@@ -17650,7 +17502,6 @@
 	vectorequiv	VertexAttrib2fvNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib2f
-	glsalias	VertexAttrib2f
 
 VertexAttrib2fvNV(index, v)
 	return		void
@@ -17660,9 +17511,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4194
-	glsopcode	0x0242
 	alias		VertexAttrib2fv
-	glsalias	VertexAttrib2fv
 
 VertexAttrib2sNV(index, x, y)
 	return		void
@@ -17674,7 +17523,6 @@
 	vectorequiv	VertexAttrib2svNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib2s
-	glsalias	VertexAttrib2s
 
 VertexAttrib2svNV(index, v)
 	return		void
@@ -17684,9 +17532,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4190
-	glsopcode	0x0241
 	alias		VertexAttrib2sv
-	glsalias	VertexAttrib2sv
 
 VertexAttrib3dNV(index, x, y, z)
 	return		void
@@ -17699,7 +17545,6 @@
 	vectorequiv	VertexAttrib3dvNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib3d
-	glsalias	VertexAttrib3d
 
 VertexAttrib3dvNV(index, v)
 	return		void
@@ -17709,9 +17554,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4199
-	glsopcode	0x0246
 	alias		VertexAttrib3dv
-	glsalias	VertexAttrib3dv
 
 VertexAttrib3fNV(index, x, y, z)
 	return		void
@@ -17724,7 +17567,6 @@
 	vectorequiv	VertexAttrib3fvNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib3f
-	glsalias	VertexAttrib3f
 
 VertexAttrib3fvNV(index, v)
 	return		void
@@ -17734,9 +17576,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4195
-	glsopcode	0x0245
 	alias		VertexAttrib3fv
-	glsalias	VertexAttrib3fv
 
 VertexAttrib3sNV(index, x, y, z)
 	return		void
@@ -17749,7 +17589,6 @@
 	vectorequiv	VertexAttrib3svNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib3s
-	glsalias	VertexAttrib3s
 
 VertexAttrib3svNV(index, v)
 	return		void
@@ -17759,9 +17598,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4191
-	glsopcode	0x0244
 	alias		VertexAttrib3sv
-	glsalias	VertexAttrib3sv
 
 VertexAttrib4dNV(index, x, y, z, w)
 	return		void
@@ -17775,7 +17612,6 @@
 	vectorequiv	VertexAttrib4dvNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4d
-	glsalias	VertexAttrib4d
 
 VertexAttrib4dvNV(index, v)
 	return		void
@@ -17785,9 +17621,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4200
-	glsopcode	0x0249
 	alias		VertexAttrib4dv
-	glsalias	VertexAttrib4dv
 
 VertexAttrib4fNV(index, x, y, z, w)
 	return		void
@@ -17801,7 +17635,6 @@
 	vectorequiv	VertexAttrib4fvNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4f
-	glsalias	VertexAttrib4f
 
 VertexAttrib4fvNV(index, v)
 	return		void
@@ -17811,9 +17644,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4196
-	glsopcode	0x0248
 	alias		VertexAttrib4fv
-	glsalias	VertexAttrib4fv
 
 VertexAttrib4sNV(index, x, y, z, w)
 	return		void
@@ -17827,7 +17658,6 @@
 	vectorequiv	VertexAttrib4svNV
 	extension	soft WINSOFT NV10
 	alias		VertexAttrib4s
-	glsalias	VertexAttrib4s
 
 VertexAttrib4svNV(index, v)
 	return		void
@@ -17837,9 +17667,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4192
-	glsopcode	0x0247
 	alias		VertexAttrib4sv
-	glsalias	VertexAttrib4sv
 
 VertexAttrib4ubNV(index, x, y, z, w)
 	return		void
@@ -17853,7 +17681,6 @@
 	extension	soft WINSOFT NV10
 	vectorequiv	VertexAttrib4ubvNV
 	alias		VertexAttrib4Nub
-	glsalias	VertexAttrib4Nub
 
 VertexAttrib4ubvNV(index, v)
 	return		void
@@ -17863,9 +17690,7 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4201
-	glsopcode	0x024A
 	alias		VertexAttrib4Nubv
-	glsalias	VertexAttrib4Nubv
 
 VertexAttribs1dvNV(index, count, v)
 	return		void
@@ -17877,7 +17702,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4210
-	glsopcode	0x024D
 	offset		629
 
 VertexAttribs1fvNV(index, count, v)
@@ -17890,7 +17714,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4206
-	glsopcode	0x024C
 	offset		630
 
 VertexAttribs1svNV(index, count, v)
@@ -17903,7 +17726,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4202
-	glsopcode	0x024B
 	offset		631
 
 VertexAttribs2dvNV(index, count, v)
@@ -17916,7 +17738,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4211
-	glsopcode	0x0250
 	offset		632
 
 VertexAttribs2fvNV(index, count, v)
@@ -17929,7 +17750,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4207
-	glsopcode	0x024F
 	offset		633
 
 VertexAttribs2svNV(index, count, v)
@@ -17942,7 +17762,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4203
-	glsopcode	0x024E
 	offset		634
 
 VertexAttribs3dvNV(index, count, v)
@@ -17955,7 +17774,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4212
-	glsopcode	0x0253
 	offset		635
 
 VertexAttribs3fvNV(index, count, v)
@@ -17968,7 +17786,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4208
-	glsopcode	0x0252
 	offset		636
 
 VertexAttribs3svNV(index, count, v)
@@ -17981,7 +17798,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4204
-	glsopcode	0x0251
 	offset		637
 
 VertexAttribs4dvNV(index, count, v)
@@ -17994,7 +17810,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4213
-	glsopcode	0x0256
 	offset		638
 
 VertexAttribs4fvNV(index, count, v)
@@ -18007,7 +17822,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4209
-	glsopcode	0x0255
 	offset		639
 
 VertexAttribs4svNV(index, count, v)
@@ -18020,7 +17834,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4205
-	glsopcode	0x0254
 	offset		640
 
 VertexAttribs4ubvNV(index, count, v)
@@ -18033,7 +17846,6 @@
 	version		1.2
 	extension	soft WINSOFT NV10
 	glxropcode	4214
-	glsopcode	0x0257
 	offset		641
 
 
@@ -18132,7 +17944,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 TexBumpParameterfvATI(pname, param)
@@ -18144,7 +17955,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 GetTexBumpParameterivATI(pname, param)
@@ -18157,7 +17967,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetTexBumpParameterfvATI(pname, param)
@@ -18170,7 +17979,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 ###############################################################################
@@ -18188,7 +17996,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 BindFragmentShaderATI(id)
@@ -18199,7 +18006,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 DeleteFragmentShaderATI(id)
@@ -18210,7 +18016,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 BeginFragmentShaderATI()
@@ -18220,7 +18025,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 EndFragmentShaderATI()
@@ -18230,7 +18034,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 PassTexCoordATI(dst, coord, swizzle)
@@ -18243,7 +18046,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 SampleMapATI(dst, interp, swizzle)
@@ -18256,7 +18058,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ColorFragmentOp1ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod)
@@ -18273,7 +18074,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ColorFragmentOp2ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod)
@@ -18293,7 +18093,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ColorFragmentOp3ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod)
@@ -18316,7 +18115,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 AlphaFragmentOp1ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod)
@@ -18332,7 +18130,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 AlphaFragmentOp2ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod)
@@ -18351,7 +18148,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 AlphaFragmentOp3ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod)
@@ -18373,7 +18169,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 SetFragmentShaderConstantATI(dst, value)
@@ -18385,7 +18180,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -18404,7 +18198,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 PNTrianglesfATI(pname, param)
@@ -18416,7 +18209,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -18436,7 +18228,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 IsObjectBufferATI(buffer)
@@ -18447,7 +18238,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 UpdateObjectBufferATI(buffer, offset, size, pointer, preserve)
@@ -18462,7 +18252,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 GetObjectBufferfvATI(buffer, pname, params)
@@ -18476,7 +18265,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetObjectBufferivATI(buffer, pname, params)
@@ -18490,7 +18278,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 FreeObjectBufferATI(buffer)
@@ -18501,7 +18288,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ArrayObjectATI(array, size, type, stride, buffer, offset)
@@ -18517,7 +18303,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 GetArrayObjectfvATI(array, pname, params)
@@ -18531,7 +18316,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetArrayObjectivATI(array, pname, params)
@@ -18545,7 +18329,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 VariantArrayObjectATI(id, type, stride, buffer, offset)
@@ -18560,7 +18343,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 GetVariantArrayObjectfvATI(id, pname, params)
@@ -18574,7 +18356,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetVariantArrayObjectivATI(id, pname, params)
@@ -18588,7 +18369,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 ###############################################################################
@@ -18605,7 +18385,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 EndVertexShaderEXT()
@@ -18615,7 +18394,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 BindVertexShaderEXT(id)
@@ -18626,7 +18404,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 GenVertexShadersEXT(range)
@@ -18637,7 +18414,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 DeleteVertexShaderEXT(id)
@@ -18648,7 +18424,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ShaderOp1EXT(op, res, arg1)
@@ -18661,7 +18436,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ShaderOp2EXT(op, res, arg1, arg2)
@@ -18675,7 +18449,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ShaderOp3EXT(op, res, arg1, arg2, arg3)
@@ -18690,7 +18463,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 SwizzleEXT(res, in, outX, outY, outZ, outW)
@@ -18706,7 +18478,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 WriteMaskEXT(res, in, outX, outY, outZ, outW)
@@ -18722,7 +18493,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 InsertComponentEXT(res, src, num)
@@ -18735,7 +18505,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ExtractComponentEXT(res, src, num)
@@ -18748,7 +18517,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 GenSymbolsEXT(datatype, storagetype, range, components)
@@ -18762,7 +18530,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 SetInvariantEXT(id, type, addr)
@@ -18775,7 +18542,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 SetLocalConstantEXT(id, type, addr)
@@ -18788,7 +18554,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VariantbvEXT(id, addr)
@@ -18800,7 +18565,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VariantsvEXT(id, addr)
@@ -18812,7 +18576,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VariantivEXT(id, addr)
@@ -18824,7 +18587,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VariantfvEXT(id, addr)
@@ -18836,7 +18598,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VariantdvEXT(id, addr)
@@ -18848,7 +18609,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VariantubvEXT(id, addr)
@@ -18860,7 +18620,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VariantusvEXT(id, addr)
@@ -18872,7 +18631,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VariantuivEXT(id, addr)
@@ -18884,7 +18642,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VariantPointerEXT(id, type, stride, addr)
@@ -18898,7 +18655,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 EnableVariantClientStateEXT(id)
@@ -18909,7 +18665,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 DisableVariantClientStateEXT(id)
@@ -18920,7 +18675,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 BindLightParameterEXT(light, value)
@@ -18932,7 +18686,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 BindMaterialParameterEXT(face, value)
@@ -18944,7 +18697,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 BindTexGenParameterEXT(unit, coord, value)
@@ -18957,7 +18709,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 BindTextureUnitParameterEXT(unit, value)
@@ -18969,7 +18720,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 BindParameterEXT(value)
@@ -18980,7 +18730,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 IsVariantEnabledEXT(id, cap)
@@ -18992,7 +18741,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 GetVariantBooleanvEXT(id, value, data)
@@ -19006,7 +18754,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetVariantIntegervEXT(id, value, data)
@@ -19020,7 +18767,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetVariantFloatvEXT(id, value, data)
@@ -19034,7 +18780,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetVariantPointervEXT(id, value, data)
@@ -19048,7 +18793,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetInvariantBooleanvEXT(id, value, data)
@@ -19062,7 +18806,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetInvariantIntegervEXT(id, value, data)
@@ -19076,7 +18819,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetInvariantFloatvEXT(id, value, data)
@@ -19090,7 +18832,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetLocalConstantBooleanvEXT(id, value, data)
@@ -19104,7 +18845,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetLocalConstantIntegervEXT(id, value, data)
@@ -19118,7 +18858,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 GetLocalConstantFloatvEXT(id, value, data)
@@ -19132,7 +18871,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	ignore get
 	offset		?
 
 ###############################################################################
@@ -19151,7 +18889,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream1svATI(stream, coords)
@@ -19163,7 +18900,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream1iATI(stream, x)
@@ -19175,7 +18911,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream1ivATI(stream, coords)
@@ -19187,7 +18922,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream1fATI(stream, x)
@@ -19199,7 +18933,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream1fvATI(stream, coords)
@@ -19211,7 +18944,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream1dATI(stream, x)
@@ -19223,7 +18955,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream1dvATI(stream, coords)
@@ -19235,7 +18966,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream2sATI(stream, x, y)
@@ -19248,7 +18978,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream2svATI(stream, coords)
@@ -19260,7 +18989,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream2iATI(stream, x, y)
@@ -19273,7 +19001,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream2ivATI(stream, coords)
@@ -19285,7 +19012,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream2fATI(stream, x, y)
@@ -19298,7 +19024,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream2fvATI(stream, coords)
@@ -19310,7 +19035,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream2dATI(stream, x, y)
@@ -19323,7 +19047,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream2dvATI(stream, coords)
@@ -19335,7 +19058,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream3sATI(stream, x, y, z)
@@ -19349,7 +19071,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream3svATI(stream, coords)
@@ -19361,7 +19082,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream3iATI(stream, x, y, z)
@@ -19375,7 +19095,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream3ivATI(stream, coords)
@@ -19387,7 +19106,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream3fATI(stream, x, y, z)
@@ -19401,7 +19119,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream3fvATI(stream, coords)
@@ -19413,7 +19130,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream3dATI(stream, x, y, z)
@@ -19427,7 +19143,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream3dvATI(stream, coords)
@@ -19439,7 +19154,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream4sATI(stream, x, y, z, w)
@@ -19454,7 +19168,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream4svATI(stream, coords)
@@ -19466,7 +19179,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream4iATI(stream, x, y, z, w)
@@ -19481,7 +19193,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream4ivATI(stream, coords)
@@ -19493,7 +19204,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream4fATI(stream, x, y, z, w)
@@ -19508,7 +19218,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream4fvATI(stream, coords)
@@ -19520,7 +19229,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream4dATI(stream, x, y, z, w)
@@ -19535,7 +19243,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexStream4dvATI(stream, coords)
@@ -19547,7 +19254,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3bATI(stream, nx, ny, nz)
@@ -19561,7 +19267,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3bvATI(stream, coords)
@@ -19573,7 +19278,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3sATI(stream, nx, ny, nz)
@@ -19587,7 +19291,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3svATI(stream, coords)
@@ -19599,7 +19302,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3iATI(stream, nx, ny, nz)
@@ -19613,7 +19315,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3ivATI(stream, coords)
@@ -19625,7 +19326,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3fATI(stream, nx, ny, nz)
@@ -19639,7 +19339,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3fvATI(stream, coords)
@@ -19651,7 +19350,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3dATI(stream, nx, ny, nz)
@@ -19665,7 +19363,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 NormalStream3dvATI(stream, coords)
@@ -19677,7 +19374,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ClientActiveVertexStreamATI(stream)
@@ -19688,7 +19384,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexBlendEnviATI(pname, param)
@@ -19700,7 +19395,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 VertexBlendEnvfATI(pname, param)
@@ -19712,7 +19406,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsflags	ignore
 	offset		?
 
 ###############################################################################
@@ -19741,7 +19434,6 @@
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.2
-	glsflags	ignore
 	offset		?
 
 DrawElementArrayATI(mode, count)
@@ -19752,7 +19444,6 @@
 	dlflags		handcode
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.2
-	glsopcode	?
 	offset		?
 
 DrawRangeElementArrayATI(mode, start, end, count)
@@ -19765,7 +19456,6 @@
 	dlflags		handcode
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.2
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -19786,7 +19476,6 @@
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
 	glxropcode	?
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -19834,7 +19523,6 @@
 	category	NV_occlusion_query
 	version		1.2
 	extension	soft WINSOFT NV20
-	glsflags	ignore
 	glxflags	ignore
 
 DeleteOcclusionQueriesNV(n, ids)
@@ -19845,7 +19533,6 @@
 	category	NV_occlusion_query
 	version		1.2
 	extension	soft WINSOFT NV20
-	glsflags	ignore
 	glxflags	ignore
 
 IsOcclusionQueryNV(id)
@@ -19855,7 +19542,6 @@
 	category	NV_occlusion_query
 	version		1.2
 	extension	soft WINSOFT NV20
-	glsflags	ignore
 	glxflags	ignore
 
 BeginOcclusionQueryNV(id)
@@ -19864,7 +19550,6 @@
 	category	NV_occlusion_query
 	version		1.2
 	extension	soft WINSOFT NV20
-	glsflags	ignore
 	glxflags	ignore
 
 EndOcclusionQueryNV()
@@ -19872,7 +19557,6 @@
 	category	NV_occlusion_query
 	version		1.2
 	extension	soft WINSOFT NV20
-	glsflags	ignore
 	glxflags	ignore
 
 GetOcclusionQueryivNV(id, pname, params)
@@ -19884,7 +19568,6 @@
 	category	NV_occlusion_query
 	version		1.2
 	extension	soft WINSOFT NV20
-	glsflags	ignore
 	glxflags	ignore
 
 GetOcclusionQueryuivNV(id, pname, params)
@@ -19896,7 +19579,6 @@
 	category	NV_occlusion_query
 	version		1.2
 	extension	soft WINSOFT NV20
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -19915,7 +19597,6 @@
 	extension	soft WINSOFT NV20
 	glxropcode	4221
 	alias		PointParameteri
-	glsalias	PointParameteri
 
 PointParameterivNV(pname, params)
 	return		void
@@ -19926,7 +19607,6 @@
 	extension	soft WINSOFT NV20
 	glxropcode	4222
 	alias		PointParameteriv
-	glsalias	PointParameteriv
 
 ###############################################################################
 #
@@ -19978,7 +19658,6 @@
 	category	EXT_stencil_two_side
 	version		1.3
 	glxropcode	4220
-	glsopcode	?
 	offset		646
 
 ###############################################################################
@@ -20020,7 +19699,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DrawElementArrayAPPLE(mode, first, count)
@@ -20033,7 +19711,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DrawRangeElementArrayAPPLE(mode, start, end, first, count)
@@ -20048,7 +19725,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiDrawElementArrayAPPLE(mode, first, count, primcount)
@@ -20062,7 +19738,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiDrawRangeElementArrayAPPLE(mode, start, end, first, count, primcount)
@@ -20078,7 +19753,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -20100,7 +19774,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 DeleteFencesAPPLE(n, fences)
@@ -20112,7 +19785,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 SetFenceAPPLE(fence)
@@ -20123,7 +19795,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 IsFenceAPPLE(fence)
@@ -20134,7 +19805,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TestFenceAPPLE(fence)
@@ -20145,7 +19815,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FinishFenceAPPLE(fence)
@@ -20156,7 +19825,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TestObjectAPPLE(object, name)
@@ -20168,7 +19836,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FinishObjectAPPLE(object, name)
@@ -20180,7 +19847,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -20199,7 +19865,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		BindVertexArray
-	glsalias	BindVertexArray
 
 DeleteVertexArraysAPPLE(n, arrays)
 	return		void
@@ -20211,7 +19876,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		DeleteVertexArrays
-	glsalias	DeleteVertexArrays
 
 GenVertexArraysAPPLE(n, arrays)
 	return		void
@@ -20223,7 +19887,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		GenVertexArray
-	glsalias	GenVertexArray
 
 IsVertexArrayAPPLE(array)
 	return		Boolean
@@ -20234,7 +19897,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		IsVertexArray
-	glsalias	IsVertexArray
 
 ###############################################################################
 #
@@ -20255,7 +19917,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FlushVertexArrayRangeAPPLE(length, pointer)
@@ -20267,7 +19928,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexArrayParameteriAPPLE(pname, param)
@@ -20279,7 +19939,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -20318,7 +19977,6 @@
 	extension
 	glxropcode	233
 	alias		DrawBuffers
-	glsalias	DrawBuffers
 
 ###############################################################################
 #
@@ -20388,7 +20046,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		682
 
 ProgramNamedParameter4dNV(id, len, name, x, y, z, w)
@@ -20405,7 +20062,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		683
 
 ProgramNamedParameter4fvNV(id, len, name, v)
@@ -20419,7 +20075,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		684
 
 ProgramNamedParameter4dvNV(id, len, name, v)
@@ -20433,7 +20088,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		685
 
 GetProgramNamedParameterfvNV(id, len, name, params)
@@ -20448,8 +20102,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		686
 
 GetProgramNamedParameterdvNV(id, len, name, params)
@@ -20464,8 +20116,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		687
 
 ###############################################################################
@@ -20486,7 +20136,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Vertex2hvNV(v)
@@ -20497,7 +20146,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Vertex3hNV(x, y, z)
@@ -20510,7 +20158,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Vertex3hvNV(v)
@@ -20521,7 +20168,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Vertex4hNV(x, y, z, w)
@@ -20535,7 +20181,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Vertex4hvNV(v)
@@ -20546,7 +20191,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Normal3hNV(nx, ny, nz)
@@ -20559,7 +20203,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Normal3hvNV(v)
@@ -20570,7 +20213,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Color3hNV(red, green, blue)
@@ -20583,7 +20225,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Color3hvNV(v)
@@ -20594,7 +20235,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Color4hNV(red, green, blue, alpha)
@@ -20608,7 +20248,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 Color4hvNV(v)
@@ -20619,7 +20258,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TexCoord1hNV(s)
@@ -20630,7 +20268,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TexCoord1hvNV(v)
@@ -20641,7 +20278,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TexCoord2hNV(s, t)
@@ -20653,7 +20289,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TexCoord2hvNV(v)
@@ -20664,7 +20299,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TexCoord3hNV(s, t, r)
@@ -20677,7 +20311,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TexCoord3hvNV(v)
@@ -20688,7 +20321,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TexCoord4hNV(s, t, r, q)
@@ -20702,7 +20334,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 TexCoord4hvNV(v)
@@ -20713,7 +20344,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiTexCoord1hNV(target, s)
@@ -20725,7 +20355,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiTexCoord1hvNV(target, v)
@@ -20737,7 +20366,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiTexCoord2hNV(target, s, t)
@@ -20750,7 +20378,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiTexCoord2hvNV(target, v)
@@ -20762,7 +20389,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiTexCoord3hNV(target, s, t, r)
@@ -20776,7 +20402,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiTexCoord3hvNV(target, v)
@@ -20788,7 +20413,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiTexCoord4hNV(target, s, t, r, q)
@@ -20803,7 +20427,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 MultiTexCoord4hvNV(target, v)
@@ -20815,7 +20438,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FogCoordhNV(fog)
@@ -20826,7 +20448,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FogCoordhvNV(fog)
@@ -20837,7 +20458,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 SecondaryColor3hNV(red, green, blue)
@@ -20850,7 +20470,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 SecondaryColor3hvNV(v)
@@ -20861,7 +20480,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexWeighthNV(weight)
@@ -20872,7 +20490,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexWeighthvNV(weight)
@@ -20883,7 +20500,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttrib1hNV(index, x)
@@ -20895,7 +20511,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttrib1hvNV(index, v)
@@ -20907,7 +20522,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttrib2hNV(index, x, y)
@@ -20920,7 +20534,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttrib2hvNV(index, v)
@@ -20932,7 +20545,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttrib3hNV(index, x, y, z)
@@ -20946,7 +20558,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttrib3hvNV(index, v)
@@ -20958,7 +20569,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttrib4hNV(index, x, y, z, w)
@@ -20973,7 +20583,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttrib4hvNV(index, v)
@@ -20985,7 +20594,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttribs1hvNV(index, n, v)
@@ -20998,7 +20606,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttribs2hvNV(index, n, v)
@@ -21011,7 +20618,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttribs3hvNV(index, n, v)
@@ -21024,7 +20630,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 VertexAttribs4hvNV(index, n, v)
@@ -21037,7 +20642,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -21059,7 +20663,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FlushPixelDataRangeNV(target)
@@ -21070,7 +20673,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -21089,7 +20691,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 PrimitiveRestartIndexNV(index)
@@ -21100,7 +20701,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 
@@ -21141,7 +20741,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 UnmapObjectBufferATI(buffer)
@@ -21152,7 +20751,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -21176,7 +20774,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		StencilOpSeparate
-	glsalias	StencilOpSeparate
 
 StencilFuncSeparateATI(frontfunc, backfunc, ref, mask)
 	return		void
@@ -21190,7 +20787,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		StencilFuncSeparate
-	glsalias	StencilFuncSeparate
 
 ###############################################################################
 #
@@ -21215,7 +20811,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 GetVertexAttribArrayObjectfvATI(index, pname, params)
@@ -21229,8 +20824,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetVertexAttribArrayObjectivATI(index, pname, params)
@@ -21244,8 +20837,6 @@
 	extension
 	glxsingle	?
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -21342,7 +20933,6 @@
 	version		1.2
 	extension
 	glxropcode	4229
-	glsopcode	?
 	offset		699
 
 ###############################################################################
@@ -21371,7 +20961,6 @@
 	extension
 	glxropcode	4228
 	alias		BlendEquationSeparate
-	glsalias	BlendEquationSeparate
 
 ###############################################################################
 #
@@ -21477,7 +21066,6 @@
 	glxvendorpriv	1422
 	glxflags	ignore
 	alias		IsRenderbuffer
-	glsalias	IsRenderbuffer
 
 BindRenderbufferEXT(target, renderbuffer)
 	return		void
@@ -21489,7 +21077,6 @@
 	glxropcode	4316
 	glxflags	ignore
 	alias		BindRenderbuffer
-	glsalias	BindRenderbuffer
 
 DeleteRenderbuffersEXT(n, renderbuffers)
 	return		void
@@ -21501,7 +21088,6 @@
 	glxropcode	4317
 	glxflags	ignore
 	alias		DeleteRenderbuffers
-	glsalias	DeleteRenderbuffers
 
 GenRenderbuffersEXT(n, renderbuffers)
 	return		void
@@ -21513,7 +21099,6 @@
 	glxvendorpriv	1423
 	glxflags	ignore
 	alias		GenRenderbuffers
-	glsalias	GenRenderbuffers
 
 RenderbufferStorageEXT(target, internalformat, width, height)
 	return		void
@@ -21527,7 +21112,6 @@
 	glxropcode	4318
 	glxflags	ignore
 	alias		RenderbufferStorage
-	glsalias	RenderbufferStorage
 
 GetRenderbufferParameterivEXT(target, pname, params)
 	return		void
@@ -21540,9 +21124,7 @@
 	extension
 	glxvendorpriv	1424
 	glxflags	ignore
-	glsflags	get
 	alias		GetRenderbufferParameteriv
-	glsalias	GetRenderbufferParameteriv
 
 IsFramebufferEXT(framebuffer)
 	return		Boolean
@@ -21553,7 +21135,6 @@
 	glxvendorpriv	1425
 	glxflags	ignore
 	alias		IsFramebuffer
-	glsalias	IsFramebuffer
 
 BindFramebufferEXT(target, framebuffer)
 	return		void
@@ -21565,7 +21146,6 @@
 	glxropcode	4319
 	glxflags	ignore
 	alias		BindFramebuffer
-	glsalias	BindFramebuffer
 
 DeleteFramebuffersEXT(n, framebuffers)
 	return		void
@@ -21577,7 +21157,6 @@
 	glxropcode	4320
 	glxflags	ignore
 	alias		DeleteFramebuffers
-	glsalias	DeleteFramebuffers
 
 GenFramebuffersEXT(n, framebuffers)
 	return		void
@@ -21589,7 +21168,6 @@
 	glxvendorpriv	1426
 	glxflags	ignore
 	alias		GenFramebuffers
-	glsalias	GenFramebuffers
 
 CheckFramebufferStatusEXT(target)
 	return		GLenum
@@ -21600,7 +21178,6 @@
 	glxvendorpriv	1427
 	glxflags	ignore
 	alias		CheckFramebufferStatus
-	glsalias	CheckFramebufferStatus
 
 FramebufferTexture1DEXT(target, attachment, textarget, texture, level)
 	return		void
@@ -21615,7 +21192,6 @@
 	glxropcode	4321
 	glxflags	ignore
 	alias		FramebufferTexture1D
-	glsalias	FramebufferTexture1D
 
 FramebufferTexture2DEXT(target, attachment, textarget, texture, level)
 	return		void
@@ -21630,7 +21206,6 @@
 	glxropcode	4322
 	glxflags	ignore
 	alias		FramebufferTexture2D
-	glsalias	FramebufferTexture2D
 
 FramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset)
 	return		void
@@ -21646,7 +21221,6 @@
 	glxropcode	4323
 	glxflags	ignore
 	alias		FramebufferTexture3D
-	glsalias	FramebufferTexture3D
 
 FramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer)
 	return		void
@@ -21660,7 +21234,6 @@
 	glxropcode	4324
 	glxflags	ignore
 	alias		FramebufferRenderbuffer
-	glsalias	FramebufferRenderbuffer
 
 GetFramebufferAttachmentParameterivEXT(target, attachment, pname, params)
 	return		void
@@ -21674,9 +21247,7 @@
 	extension
 	glxvendorpriv	1428
 	glxflags	ignore
-	glsflags	get
 	alias		GetFramebufferAttachmentParameteriv
-	glsalias	GetFramebufferAttachmentParameteriv
 
 GenerateMipmapEXT(target)
 	return		void
@@ -21687,7 +21258,6 @@
 	glxropcode	4325
 	glxflags	ignore
 	alias		GenerateMipmap
-	glsalias	GenerateMipmap
 
 
 ###############################################################################
@@ -21704,7 +21274,6 @@
 	category	GREMEDY_string_marker
 	version		1.0
 	extension
-	glsflags	ignore
 	glxflags	ignore
 	offset		?
 
@@ -21740,7 +21309,6 @@
 	extension
 	glxropcode	4223
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -21776,7 +21344,6 @@
 	version		1.5
 	glxropcode	4330
 	alias		BlitFramebuffer
-	glsalias	BlitFramebuffer
 
 ###############################################################################
 #
@@ -21796,7 +21363,6 @@
 	version		1.5
 	glxropcode	4331
 	alias		RenderbufferStorageMultisample
-	glsalias	RenderbufferStorageMultisample
 
 ###############################################################################
 #
@@ -21825,8 +21391,6 @@
 	version		1.5
 	glxvendorpriv	1328
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 GetQueryObjectui64vEXT(id, pname, params)
@@ -21839,8 +21403,6 @@
 	version		1.5
 	glxvendorpriv	1329
 	glxflags	ignore
-	glsflags	get
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -21859,7 +21421,6 @@
 	category	EXT_gpu_program_parameters
 	version		1.2
 	glxropcode	4281
-	glsopcode	?
 	offset		?
 
 ProgramLocalParameters4fvEXT(target, index, count, params)
@@ -21871,7 +21432,6 @@
 	category	EXT_gpu_program_parameters
 	version		1.2
 	glxropcode	4282
-	glsopcode	?
 	offset		?
 
 ###############################################################################
@@ -21891,7 +21451,6 @@
 	extension
 	glxropcode	?
 	glxflags	ignore
-	glsopcode	?
 	offset		?
 
 FlushMappedBufferRangeAPPLE(target, offset, size)
@@ -21905,7 +21464,6 @@
 	glxropcode	?
 	glxflags	ignore
 	alias		FlushMappedBufferRange
-	glsalias	FlushMappedBufferRange
 
 ###############################################################################
 #
@@ -21928,7 +21486,6 @@
 	glxvectorequiv	ProgramLocalParameterI4ivNV
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramLocalParameterI4ivNV(target, index, params)
@@ -21940,7 +21497,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramLocalParametersI4ivNV(target, index, count, params)
@@ -21953,7 +21509,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramLocalParameterI4uiNV(target, index, x, y, z, w)
@@ -21970,7 +21525,6 @@
 	glxvectorequiv	ProgramLocalParameterI4uivNV
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramLocalParameterI4uivNV(target, index, params)
@@ -21982,7 +21536,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramLocalParametersI4uivNV(target, index, count, params)
@@ -21995,7 +21548,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramEnvParameterI4iNV(target, index, x, y, z, w)
@@ -22012,7 +21564,6 @@
 	glxvectorequiv	ProgramEnvParameterI4ivNV
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramEnvParameterI4ivNV(target, index, params)
@@ -22024,7 +21575,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramEnvParametersI4ivNV(target, index, count, params)
@@ -22037,7 +21587,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramEnvParameterI4uiNV(target, index, x, y, z, w)
@@ -22054,7 +21603,6 @@
 	glxvectorequiv	ProgramEnvParameterI4uivNV
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramEnvParameterI4uivNV(target, index, params)
@@ -22066,7 +21614,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramEnvParametersI4uivNV(target, index, count, params)
@@ -22079,7 +21626,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetProgramLocalParameterIivNV(target, index, params)
@@ -22092,7 +21638,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetProgramLocalParameterIuivNV(target, index, params)
@@ -22105,7 +21650,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetProgramEnvParameterIivNV(target, index, params)
@@ -22118,7 +21662,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetProgramEnvParameterIuivNV(target, index, params)
@@ -22131,7 +21674,6 @@
 	version		1.3
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -22149,7 +21691,6 @@
 	version		2.0
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 FramebufferTextureEXT(target, attachment, texture, level)
@@ -22165,7 +21706,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		FramebufferTextureARB
-	glsalias	FramebufferTextureARB
 
 FramebufferTextureLayerEXT(target, attachment, texture, level, layer)
 	return		void
@@ -22181,7 +21721,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		FramebufferTextureLayer
-	glsalias	FramebufferTextureLayer
 
 FramebufferTextureFaceEXT(target, attachment, texture, level, face)
 	return		void
@@ -22197,7 +21736,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		FramebufferTextureFaceARB
-	glsalias	FramebufferTextureFaceARB
 
 ###############################################################################
 #
@@ -22217,7 +21755,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		ProgramParameteriARB
-	glsalias	ProgramParameteriARB
 
 ###############################################################################
 #
@@ -22238,7 +21775,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI1i
-	glsalias	VertexAttribI1i
 
 VertexAttribI2iEXT(index, x, y)
 	return		void
@@ -22253,7 +21789,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI2i
-	glsalias	VertexAttribI2i
 
 VertexAttribI3iEXT(index, x, y, z)
 	return		void
@@ -22269,7 +21804,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI3i
-	glsalias	VertexAttribI3i
 
 VertexAttribI4iEXT(index, x, y, z, w)
 	return		void
@@ -22286,7 +21820,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI4i
-	glsalias	VertexAttribI4i
 
 VertexAttribI1uiEXT(index, x)
 	return		void
@@ -22300,7 +21833,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI1ui
-	glsalias	VertexAttribI1ui
 
 VertexAttribI2uiEXT(index, x, y)
 	return		void
@@ -22315,7 +21847,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI2ui
-	glsalias	VertexAttribI2ui
 
 VertexAttribI3uiEXT(index, x, y, z)
 	return		void
@@ -22331,7 +21862,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI3ui
-	glsalias	VertexAttribI3ui
 
 VertexAttribI4uiEXT(index, x, y, z, w)
 	return		void
@@ -22348,7 +21878,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI4ui
-	glsalias	VertexAttribI4ui
 
 VertexAttribI1ivEXT(index, v)
 	return		void
@@ -22360,7 +21889,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI1iv
-	glsalias	VertexAttribI1iv
 
 VertexAttribI2ivEXT(index, v)
 	return		void
@@ -22372,7 +21900,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI2iv
-	glsalias	VertexAttribI2iv
 
 VertexAttribI3ivEXT(index, v)
 	return		void
@@ -22384,7 +21911,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI3iv
-	glsalias	VertexAttribI3iv
 
 VertexAttribI4ivEXT(index, v)
 	return		void
@@ -22396,7 +21922,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI4iv
-	glsalias	VertexAttribI4iv
 
 VertexAttribI1uivEXT(index, v)
 	return		void
@@ -22408,7 +21933,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI1uiv
-	glsalias	VertexAttribI1uiv
 
 VertexAttribI2uivEXT(index, v)
 	return		void
@@ -22420,7 +21944,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI2uiv
-	glsalias	VertexAttribI2uiv
 
 VertexAttribI3uivEXT(index, v)
 	return		void
@@ -22432,7 +21955,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI3uiv
-	glsalias	VertexAttribI3uiv
 
 VertexAttribI4uivEXT(index, v)
 	return		void
@@ -22444,7 +21966,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI4uiv
-	glsalias	VertexAttribI4uiv
 
 VertexAttribI4bvEXT(index, v)
 	return		void
@@ -22456,7 +21977,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI4bv
-	glsalias	VertexAttribI4bv
 
 VertexAttribI4svEXT(index, v)
 	return		void
@@ -22468,7 +21988,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI4sv
-	glsalias	VertexAttribI4sv
 
 VertexAttribI4ubvEXT(index, v)
 	return		void
@@ -22480,7 +21999,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI4ubv
-	glsalias	VertexAttribI4ubv
 
 VertexAttribI4usvEXT(index, v)
 	return		void
@@ -22492,7 +22010,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribI4usv
-	glsalias	VertexAttribI4usv
 
 VertexAttribIPointerEXT(index, size, type, stride, pointer)
 	return		void
@@ -22507,7 +22024,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		VertexAttribIPointer
-	glsalias	VertexAttribIPointer
 
 GetVertexAttribIivEXT(index, pname, params)
 	return		void
@@ -22520,7 +22036,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		GetVertexAttribIiv
-	glsalias	GetVertexAttribIiv
 
 GetVertexAttribIuivEXT(index, pname, params)
 	return		void
@@ -22533,7 +22048,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		GetVertexAttribIuiv
-	glsalias	GetVertexAttribIuiv
 
 ###############################################################################
 #
@@ -22554,7 +22068,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		GetUniformuiv
-	glsalias	GetUniformuiv
 
 BindFragDataLocationEXT(program, color, name)
 	return		void
@@ -22568,7 +22081,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		BindFragDataLocation
-	glsalias	BindFragDataLocation
 
 GetFragDataLocationEXT(program, name)
 	return		Int32
@@ -22581,7 +22093,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		GetFragDataLocation
-	glsalias	GetFragDataLocation
 
 Uniform1uiEXT(location, v0)
 	return		void
@@ -22593,7 +22104,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		Uniform1ui
-	glsalias	Uniform1ui
 
 Uniform2uiEXT(location, v0, v1)
 	return		void
@@ -22606,7 +22116,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		Uniform2ui
-	glsalias	Uniform2ui
 
 Uniform3uiEXT(location, v0, v1, v2)
 	return		void
@@ -22620,7 +22129,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		Uniform3ui
-	glsalias	Uniform3ui
 
 Uniform4uiEXT(location, v0, v1, v2, v3)
 	return		void
@@ -22635,7 +22143,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		Uniform4ui
-	glsalias	Uniform4ui
 
 Uniform1uivEXT(location, count, value)
 	return		void
@@ -22648,7 +22155,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		Uniform1uiv
-	glsalias	Uniform1uiv
 
 Uniform2uivEXT(location, count, value)
 	return		void
@@ -22661,7 +22167,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		Uniform2uiv
-	glsalias	Uniform2uiv
 
 Uniform3uivEXT(location, count, value)
 	return		void
@@ -22674,7 +22179,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		Uniform3uiv
-	glsalias	Uniform3uiv
 
 Uniform4uivEXT(location, count, value)
 	return		void
@@ -22687,7 +22191,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		Uniform4uiv
-	glsalias	Uniform4uiv
 
 ###############################################################################
 #
@@ -22710,7 +22213,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		DrawArraysInstancedARB
-	glsalias	DrawArraysInstancedARB
 
 DrawElementsInstancedEXT(mode, count, type, indices, primcount)
 	return		void
@@ -22727,7 +22229,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		DrawElementsInstancedARB
-	glsalias	DrawElementsInstancedARB
 
 ###############################################################################
 #
@@ -22767,7 +22268,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		TexBufferARB
-	glsalias	TexBufferARB
 
 ###############################################################################
 #
@@ -22814,7 +22314,6 @@
 	extension	soft WINSOFT NV50
 	version		2.0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ClearDepthdNV(depth)
@@ -22824,7 +22323,6 @@
 	extension	soft WINSOFT NV50
 	version		2.0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 DepthBoundsdNV(zmin, zmax)
@@ -22835,7 +22333,6 @@
 	extension	soft WINSOFT NV50
 	version		2.0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -22868,7 +22365,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -22909,7 +22405,6 @@
 	version		1.2
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramBufferParametersIivNV(target, buffer, index, count, params)
@@ -22923,7 +22418,6 @@
 	version		1.2
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ProgramBufferParametersIuivNV(target, buffer, index, count, params)
@@ -22937,7 +22431,6 @@
 	version		1.2
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -22960,7 +22453,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		ColorMaski
-	glsalias	ColorMaski
 
 GetBooleanIndexedvEXT(target, index, data)
 	return		void
@@ -22974,7 +22466,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		GetBooleani_v
-	glsalias	GetBooleani_v
 
 GetIntegerIndexedvEXT(target, index, data)
 	return		void
@@ -22988,7 +22479,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		GetIntegeri_v
-	glsalias	GetIntegeri_v
 
 EnableIndexedEXT(target, index)
 	return		void
@@ -23000,7 +22490,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		Enablei
-	glsalias	Enablei
 
 DisableIndexedEXT(target, index)
 	return		void
@@ -23012,7 +22501,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		Disablei
-	glsalias	Disablei
 
 IsEnabledIndexedEXT(target, index)
 	return		Boolean
@@ -23025,7 +22513,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		IsEnabledi
-	glsalias	IsEnabledi
 
 ###############################################################################
 #
@@ -23044,7 +22531,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		BeginTransformFeedback
-	glsalias	BeginTransformFeedback
 
 EndTransformFeedbackNV()
 	return		void
@@ -23055,7 +22541,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		EndTransformFeedback
-	glsalias	EndTransformFeedback
 
 TransformFeedbackAttribsNV(count, attribs, bufferMode)
 	return		void
@@ -23067,7 +22552,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 BindBufferRangeNV(target, index, buffer, offset, size)
@@ -23084,7 +22568,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		BindBufferRange
-	glsalias	BindBufferRange
 
 BindBufferOffsetNV(target, index, buffer, offset)
 	return		void
@@ -23099,7 +22582,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		BindBufferOffsetEXT
-	glsalias	BindBufferOffsetEXT
 
 BindBufferBaseNV(target, index, buffer)
 	return		void
@@ -23113,13 +22595,12 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		BindBufferBase
-	glsalias	BindBufferBase
 
-TransformFeedbackVaryingsNV(program, count, locations, bufferMode)
+TransformFeedbackVaryingsNV(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	NV_transform_feedback
 	version		1.5
@@ -23128,7 +22609,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		TransformFeedbackVaryings
-	glsalias	TransformFeedbackVaryings
 
 ActiveVaryingNV(program, name)
 	return		void
@@ -23139,7 +22619,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 GetVaryingLocationNV(program, name)
@@ -23150,7 +22629,6 @@
 	dlflags		notlistable
 	version		1.5
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 
@@ -23168,7 +22646,6 @@
 	version		1.5
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetTransformFeedbackVaryingNV(program, index, location)
@@ -23183,7 +22660,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		GetTransformFeedbackVarying
-	glsalias	GetTransformFeedbackVarying
 
 ###############################################################################
 #
@@ -23202,7 +22678,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 GetUniformBufferSizeEXT(program, location)
 	return		Int32
@@ -23213,7 +22688,6 @@
 	version		2.0
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GetUniformOffsetEXT(program, location)
@@ -23225,7 +22699,6 @@
 	version		2.0
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -23246,7 +22719,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		TexParameterIiv
-	glsalias	TexParameterIiv
 
 TexParameterIuivEXT(target, pname, params)
 	return		void
@@ -23259,7 +22731,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		TexParameterIuiv
-	glsalias	TexParameterIuiv
 
 GetTexParameterIivEXT(target, pname, params)
 	return		void
@@ -23274,7 +22745,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		GetTexParameterIiv
-	glsalias	GetTexParameterIiv
 
 GetTexParameterIuivEXT(target, pname, params)
 	return		void
@@ -23289,7 +22759,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		GetTexParameterIuiv
-	glsalias	GetTexParameterIuiv
 
 ClearColorIiEXT(red, green, blue, alpha)
 	return		void
@@ -23301,7 +22770,6 @@
 	version		2.0
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ClearColorIuiEXT(red, green, blue, alpha)
@@ -23314,7 +22782,6 @@
 	version		2.0
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -23335,7 +22802,6 @@
 	category	GREMEDY_frame_terminator
 	version		1.0
 	extension
-	glsflags	ignore
 	glxflags	ignore
 	offset		?
 
@@ -23354,16 +22820,13 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		BeginConditionalRender
-	glsalias	BeginConditionalRender
 
 EndConditionalRenderNV()
 	return		void
 	category	NV_conditional_render
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	alias		EndConditionalRender
-	glsalias	EndConditionalRender
 
 ###############################################################################
 #
@@ -23373,8 +22836,6 @@
 ###############################################################################
 
 # TBD
-newcategory: NV_present_video
-
 #    void PresentFrameKeyedNV(uint video_slot, uint64EXT minPresentTime,
 #			      uint beginPresentTimeId, uint
 #			      presentDurationId, enum type, enum target0,
@@ -23394,6 +22855,100 @@
 #    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
+	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
+	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
+	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
+	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
+	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
+	offset		?
+
 ###############################################################################
 #
 # Extension #348 - GLX_NV_video_out
@@ -23422,7 +22977,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		BeginTransformFeedback
-	glsalias	BeginTransformFeedback
 
 EndTransformFeedbackEXT()
 	return		void
@@ -23433,7 +22987,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		EndTransformFeedback
-	glsalias	EndTransformFeedback
 
 BindBufferRangeEXT(target, index, buffer, offset, size)
 	return		void
@@ -23449,7 +23002,6 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		BindBufferRange
-	glsalias	BindBufferRange
 
 # Not promoted to the OpenGL 3.0 core
 BindBufferOffsetEXT(target, index, buffer, offset)
@@ -23463,7 +23015,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 BindBufferBaseEXT(target, index, buffer)
@@ -23478,13 +23029,12 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	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
@@ -23493,14 +23043,16 @@
 	glfflags	ignore
 	extension	soft WINSOFT
 	alias		TransformFeedbackVaryings
-	glsalias	TransformFeedbackVaryings
 
-
-GetTransformFeedbackVaryingEXT(program, index, location)
+GetTransformFeedbackVaryingEXT(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	EXT_transform_feedback
 	dlflags		notlistable
 	version		2.0
@@ -23508,7 +23060,6 @@
 	glfflags	ignore
 	glxflags	ignore
 	alias		GetTransformFeedbackVarying
-	glsalias	GetTransformFeedbackVarying
 
 ###############################################################################
 #
@@ -23526,7 +23077,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glxflags	ignore ### client-handcode client-intercept server-handcode
-	glsflags	client-state
 
 PushClientAttribDefaultEXT(mask)
 	return		void
@@ -23535,7 +23085,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glxflags	ignore ### client-handcode client-intercept server-handcode
-	glsflags	client-state
 
 # New 1.0 matrix commands
 
@@ -23547,7 +23096,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixLoaddEXT(mode, m)
 	return		void
@@ -23557,7 +23105,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixMultfEXT(mode, m)
 	return		void
@@ -23567,7 +23114,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixMultdEXT(mode, m)
 	return		void
@@ -23577,7 +23123,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixLoadIdentityEXT(mode)
 	return		void
@@ -23586,7 +23131,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixRotatefEXT(mode, angle, x, y, z)
 	return		void
@@ -23599,7 +23143,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixRotatedEXT(mode, angle, x, y, z)
 	return		void
@@ -23612,7 +23155,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixScalefEXT(mode, x, y, z)
 	return		void
@@ -23624,7 +23166,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixScaledEXT(mode, x, y, z)
 	return		void
@@ -23636,7 +23177,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixTranslatefEXT(mode, x, y, z)
 	return		void
@@ -23648,7 +23188,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixTranslatedEXT(mode, x, y, z)
 	return		void
@@ -23660,7 +23199,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixFrustumEXT(mode, left, right, bottom, top, zNear, zFar)
 	return		void
@@ -23675,7 +23213,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixOrthoEXT(mode, left, right, bottom, top, zNear, zFar)
 	return		void
@@ -23690,7 +23227,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixPopEXT(mode)
 	return		void
@@ -23699,7 +23235,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixPushEXT(mode)
 	return		void
@@ -23708,7 +23243,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 # New 1.3 matrix transpose commands
 
@@ -23720,7 +23254,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixLoadTransposedEXT(mode, m)
 	return		void
@@ -23730,7 +23263,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixMultTransposefEXT(mode, m)
 	return		void
@@ -23740,7 +23272,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MatrixMultTransposedEXT(mode, m)
 	return		void
@@ -23750,7 +23281,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 # New 1.1 texture object commands
 
@@ -23764,7 +23294,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	vectorequiv	TextureParameterfvEXT
 
 TextureParameterfvEXT(texture, target, pname, params)
@@ -23777,7 +23306,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 TextureParameteriEXT(texture, target, pname, param)
 	return		void
@@ -23789,7 +23317,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	vectorequiv	TextureParameterivEXT
 
 TextureParameterivEXT(texture, target, pname, params)
@@ -23802,7 +23329,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 TextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels)
 	return		void
@@ -23820,7 +23346,6 @@
 	glxflags	ignore ### client-handcode server-handcode
 	extension	soft WINSOFT
 	glfflags	capture-handcode decode-handcode pixel-unpack
-	glsflags	pixel-null pixel-unpack
 
 TextureImage2DEXT(texture, target, level, internalformat, width, height, border, format, type, pixels)
 	return		void
@@ -23839,7 +23364,6 @@
 	glxflags	ignore ### client-handcode server-handcode
 	extension	soft WINSOFT
 	glfflags	capture-handcode decode-handcode pixel-unpack
-	glsflags	pixel-null pixel-unpack
 
 TextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels)
 	return		void
@@ -23857,7 +23381,6 @@
 	glxflags	ignore
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	pixel-unpack
 
 TextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels)
 	return		void
@@ -23876,7 +23399,6 @@
 	glxflags	ignore ### EXT client-handcode server-handcode
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	pixel-unpack
 
 CopyTextureImage1DEXT(texture, target, level, internalformat, x, y, width, border)
 	return		void
@@ -23950,7 +23472,6 @@
 	glxflags	ignore ### client-handcode server-handcode
 	extension	soft WINSOFT
 	glfflags	capture-execute capture-handcode decode-handcode pixel-pack
-	glsflags	get pixel-pack
 
 GetTextureParameterfvEXT(texture, target, pname, params)
 	return		void
@@ -23963,7 +23484,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetTextureParameterivEXT(texture, target, pname, params)
 	return		void
@@ -23976,7 +23496,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetTextureLevelParameterfvEXT(texture, target, level, pname, params)
 	return		void
@@ -23990,7 +23509,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetTextureLevelParameterivEXT(texture, target, level, pname, params)
 	return		void
@@ -24004,7 +23522,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 # New 1.2 3D texture object commands
 
@@ -24026,7 +23543,6 @@
 	glxflags	ignore ### client-handcode server-handcode EXT
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 
 TextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
 	return		void
@@ -24047,7 +23563,6 @@
 	glxflags	ignore ### client-handcode server-handcode EXT
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 
 CopyTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, x, y, width, height)
 	return		void
@@ -24065,7 +23580,6 @@
 	glxflags	ignore ### EXT
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 
 # New 1.1 multitexture commands
 
@@ -24079,7 +23593,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	vectorequiv	MultiTexParameterfvEXT
 
 MultiTexParameterfvEXT(texunit, target, pname, params)
@@ -24092,7 +23605,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MultiTexParameteriEXT(texunit, target, pname, param)
 	return		void
@@ -24104,7 +23616,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	vectorequiv	MultiTexParameterivEXT
 
 MultiTexParameterivEXT(texunit, target, pname, params)
@@ -24117,7 +23628,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels)
 	return		void
@@ -24135,7 +23645,6 @@
 	glxflags	ignore ### client-handcode server-handcode
 	extension	soft WINSOFT
 	glfflags	capture-handcode decode-handcode pixel-unpack
-	glsflags	pixel-null pixel-unpack
 
 MultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, format, type, pixels)
 	return		void
@@ -24154,7 +23663,6 @@
 	glxflags	ignore ### client-handcode server-handcode
 	extension	soft WINSOFT
 	glfflags	capture-handcode decode-handcode pixel-unpack
-	glsflags	pixel-null pixel-unpack
 
 MultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels)
 	return		void
@@ -24171,7 +23679,6 @@
 	glxflags	ignore ### EXT client-handcode server-handcode
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	pixel-unpack
 
 MultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels)
 	return		void
@@ -24190,7 +23697,6 @@
 	glxflags	ignore ### EXT client-handcode server-handcode
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	pixel-unpack
 
 CopyMultiTexImage1DEXT(texunit, target, level, internalformat, x, y, width, border)
 	return		void
@@ -24264,7 +23770,6 @@
 	glxflags	ignore ### client-handcode server-handcode
 	extension	soft WINSOFT
 	glfflags	capture-execute capture-handcode decode-handcode pixel-pack
-	glsflags	get pixel-pack
 
 GetMultiTexParameterfvEXT(texunit, target, pname, params)
 	return		void
@@ -24277,7 +23782,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetMultiTexParameterivEXT(texunit, target, pname, params)
 	return		void
@@ -24290,7 +23794,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetMultiTexLevelParameterfvEXT(texunit, target, level, pname, params)
 	return		void
@@ -24304,7 +23807,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetMultiTexLevelParameterivEXT(texunit, target, level, pname, params)
 	return		void
@@ -24318,7 +23820,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 # New 1.2 3D multitexture commands
 
@@ -24340,7 +23841,6 @@
 	glxflags	ignore ### client-handcode server-handcode EXT
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 
 MultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
 	return		void
@@ -24361,7 +23861,6 @@
 	glxflags	ignore ### client-handcode server-handcode EXT
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 
 CopyMultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, x, y, width, height)
 	return		void
@@ -24379,7 +23878,6 @@
 	glxflags	ignore ### EXT
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 
 # New 1.2.1 multitexture texture commands
 
@@ -24400,7 +23898,6 @@
 	dlflags		notlistable
 	glxflags	ignore ### client-handcode client-intercept server-handcode
 	extension	soft WINSOFT
-	glsflags	client-state
 
 DisableClientStateIndexedEXT(array, index)
 	return		void
@@ -24410,7 +23907,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glxflags	ignore ### client-handcode client-intercept server-handcode
-	glsflags	client-state
 
 MultiTexCoordPointerEXT(texunit, size, type, stride, pointer)
 	return		void
@@ -24424,7 +23920,6 @@
 	glxflags	ignore ### client-handcode client-intercept server-handcode
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	client-state
 
 MultiTexEnvfEXT(texunit, target, pname, param)
 	return		void
@@ -24437,7 +23932,6 @@
 	vectorequiv	MultiTexEnvfvEXT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 MultiTexEnvfvEXT(texunit, target, pname, params)
 	return		void
@@ -24449,7 +23943,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 MultiTexEnviEXT(texunit, target, pname, param)
 	return		void
@@ -24462,7 +23955,6 @@
 	vectorequiv	MultiTexEnvivEXT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 MultiTexEnvivEXT(texunit, target, pname, params)
 	return		void
@@ -24474,7 +23966,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 MultiTexGendEXT(texunit, coord, pname, param)
 	return		void
@@ -24487,7 +23978,6 @@
 	vectorequiv	MultiTexGendvEXT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 MultiTexGendvEXT(texunit, coord, pname, params)
 	return		void
@@ -24499,7 +23989,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 MultiTexGenfEXT(texunit, coord, pname, param)
 	return		void
@@ -24512,7 +24001,6 @@
 	vectorequiv	MultiTexGenfvEXT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 MultiTexGenfvEXT(texunit, coord, pname, params)
 	return		void
@@ -24524,7 +24012,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 MultiTexGeniEXT(texunit, coord, pname, param)
 	return		void
@@ -24537,7 +24024,6 @@
 	vectorequiv	MultiTexGenivEXT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 MultiTexGenivEXT(texunit, coord, pname, params)
 	return		void
@@ -24549,7 +24035,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	gl-enum
-	glsflags	gl-enum
 
 # New 1.2.1 multitexture texture queries
 
@@ -24564,7 +24049,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetMultiTexEnvivEXT(texunit, target, pname, params)
 	return		void
@@ -24577,7 +24061,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetMultiTexGendvEXT(texunit, coord, pname, params)
 	return		void
@@ -24590,7 +24073,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetMultiTexGenfvEXT(texunit, coord, pname, params)
 	return		void
@@ -24603,7 +24085,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 GetMultiTexGenivEXT(texunit, coord, pname, params)
 	return		void
@@ -24616,7 +24097,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 # From EXT_draw_buffers2
 # EnableIndexedEXT
@@ -24632,7 +24112,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 GetDoubleIndexedvEXT(target, index, data)
@@ -24644,7 +24123,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 GetPointerIndexedvEXT(target, index, data)
@@ -24656,7 +24134,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 # New compressed texture commands
@@ -24677,7 +24154,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedTextureImage2DEXT(texture, target, level, internalformat, width, height, border, imageSize, bits)
@@ -24695,7 +24171,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedTextureImage1DEXT(texture, target, level, internalformat, width, border, imageSize, bits)
@@ -24712,7 +24187,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits)
@@ -24733,7 +24207,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, imageSize, bits)
@@ -24752,7 +24225,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedTextureSubImage1DEXT(texture, target, level, xoffset, width, format, imageSize, bits)
@@ -24769,7 +24241,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 # New compressed texture query
@@ -24783,7 +24254,6 @@
 	category	EXT_direct_state_access
 	dlflags		notlistable
 	glxflags	ignore ### server-handcode
-	glsflags	ignore
 	extension	soft WINSOFT
 
 # New compressed multitexture commands
@@ -24804,7 +24274,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, imageSize, bits)
@@ -24822,7 +24291,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, imageSize, bits)
@@ -24839,7 +24307,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedMultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits)
@@ -24860,7 +24327,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, imageSize, bits)
@@ -24879,7 +24345,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 CompressedMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, imageSize, bits)
@@ -24896,7 +24361,6 @@
 	dlflags		handcode
 	glxflags	ignore ### client-handcode server-handcode
 	glfflags	ignore
-	glsflags	ignore
 	extension	soft WINSOFT
 
 # New compressed multitexture query
@@ -24910,7 +24374,6 @@
 	category	EXT_direct_state_access
 	dlflags		notlistable
 	glxflags	ignore ### server-handcode
-	glsflags	ignore
 	extension	soft WINSOFT
 
 # New ARB assembly program named commands
@@ -24926,7 +24389,6 @@
 	subcategory	ARB_vertex_program
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore ### client-handcode server-handcode EXT
 	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
 
@@ -24945,7 +24407,6 @@
 	glxvectorequiv	NamedProgramLocalParameter4dvEXT
 	extension	soft WINSOFT NV10
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore ### EXT
 	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
 
@@ -24959,7 +24420,6 @@
 	subcategory	ARB_vertex_program
 	extension	soft WINSOFT NV10
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore ### EXT
 	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
 
@@ -24978,7 +24438,6 @@
 	glxvectorequiv	NamedProgramLocalParameter4fvEXT
 	extension	soft WINSOFT NV10
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore ### EXT
 	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
 
@@ -24992,7 +24451,6 @@
 	subcategory	ARB_vertex_program
 	extension	soft WINSOFT NV10
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore ### EXT
 	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
 
@@ -25009,7 +24467,6 @@
 	subcategory	ARB_vertex_program
 	extension	soft WINSOFT NV10
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore ### client-handcode server-handcode EXT
 	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
 
@@ -25024,7 +24481,6 @@
 	subcategory	ARB_vertex_program
 	extension	soft WINSOFT NV10
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore ### client-handcode server-handcode EXT
 	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
 
@@ -25039,7 +24495,6 @@
 	subcategory	ARB_vertex_program
 	extension	soft WINSOFT NV10
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore ### client-handcode server-handcode EXT
 	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
 
@@ -25054,7 +24509,6 @@
 	subcategory	ARB_vertex_program
 	extension	soft WINSOFT NV10
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore ### client-handcode server-handcode EXT
 	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
 
@@ -25071,7 +24525,6 @@
 	subcategory	EXT_gpu_program_parameters
 	extension	soft WINSOFT NV10
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_gpu_program_parameters
 
@@ -25092,7 +24545,6 @@
 	glxvectorequiv	NamedProgramLocalParameterI4ivEXT
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -25106,7 +24558,6 @@
 	subcategory	NV_gpu_program4
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -25121,7 +24572,6 @@
 	subcategory	NV_gpu_program4
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -25140,7 +24590,6 @@
 	glxvectorequiv	NamedProgramLocalParameterI4uivEXT
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -25154,7 +24603,6 @@
 	subcategory	NV_gpu_program4
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -25169,7 +24617,6 @@
 	subcategory	NV_gpu_program4
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -25184,7 +24631,6 @@
 	subcategory	NV_gpu_program4
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -25199,7 +24645,6 @@
 	subcategory	NV_gpu_program4
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -25216,7 +24661,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	glextmask	GL_MASK_EXT_texture_integer
 
 TextureParameterIuivEXT(texture, target, pname, params)
@@ -25230,7 +24674,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	glextmask	GL_MASK_EXT_texture_integer
 
 # New EXT_texture_integer texture object queries
@@ -25247,7 +24690,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 	glextmask	GL_MASK_EXT_texture_integer
 
 GetTextureParameterIuivEXT(texture, target, pname, params)
@@ -25262,7 +24704,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 	glextmask	GL_MASK_EXT_texture_integer
 
 # New EXT_texture_integer multitexture commands
@@ -25278,7 +24719,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	glextmask	GL_MASK_EXT_texture_integer
 
 MultiTexParameterIuivEXT(texunit, target, pname, params)
@@ -25292,7 +24732,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 	glextmask	GL_MASK_EXT_texture_integer
 
 # New EXT_texture_integer multitexture queries
@@ -25308,7 +24747,6 @@
 	dlflags		notlistable
 	extension	soft WINSOFT
 	glfflags	capture-execute gl-enum
-	glsflags	get
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_texture_integer
 
@@ -25323,7 +24761,6 @@
 	dlflags		notlistable
 	extension	soft WINSOFT
 	glfflags	capture-execute gl-enum
-	glsflags	get
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_texture_integer
 
@@ -25337,7 +24774,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25351,7 +24787,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25366,7 +24801,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25382,7 +24816,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25395,7 +24828,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25409,7 +24841,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25424,7 +24855,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25440,7 +24870,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25454,7 +24883,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25468,7 +24896,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25482,7 +24909,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25496,7 +24922,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25510,7 +24935,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25524,7 +24948,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25538,7 +24961,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25552,7 +24974,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25567,7 +24988,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25582,7 +25002,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25597,7 +25016,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_0
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25614,7 +25032,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_1
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25629,7 +25046,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_1
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25644,7 +25060,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_1
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25659,7 +25074,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_1
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25674,7 +25088,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_1
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25689,7 +25102,6 @@
 	category	EXT_direct_state_access
 	subcategory	VERSION_2_1
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25704,7 +25116,6 @@
 	category	EXT_direct_state_access
 	subcategory	EXT_gpu_shader4
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25718,7 +25129,6 @@
 	category	EXT_direct_state_access
 	subcategory	EXT_gpu_shader4
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25733,7 +25143,6 @@
 	category	EXT_direct_state_access
 	subcategory	EXT_gpu_shader4
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25749,7 +25158,6 @@
 	category	EXT_direct_state_access
 	subcategory	EXT_gpu_shader4
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25763,7 +25171,6 @@
 	category	EXT_direct_state_access
 	subcategory	EXT_gpu_shader4
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25777,7 +25184,6 @@
 	category	EXT_direct_state_access
 	subcategory	EXT_gpu_shader4
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25791,7 +25197,6 @@
 	category	EXT_direct_state_access
 	subcategory	EXT_gpu_shader4
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25805,7 +25210,6 @@
 	category	EXT_direct_state_access
 	subcategory	EXT_gpu_shader4
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	extension	soft WINSOFT
 	glextmask	GL_MASK_OpenGL_2_0
@@ -25823,7 +25227,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 NamedBufferSubDataEXT(buffer, offset, size, data)
 	return		void
@@ -25836,7 +25239,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 MapNamedBufferEXT(buffer, access)
 	return		VoidPointer
@@ -25847,7 +25249,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 UnmapNamedBufferEXT(buffer)
 	return		Boolean
@@ -25857,7 +25258,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 # New named buffer queries
 
@@ -25871,7 +25271,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 GetNamedBufferPointervEXT(buffer, pname, params)
 	return		void
@@ -25883,7 +25282,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 GetNamedBufferSubDataEXT(buffer, offset, size, data)
 	return		void
@@ -25896,7 +25294,6 @@
 	dlflags		notlistable
 	glxflags	ignore
 	glfflags	ignore
-	glsflags	ignore
 
 # New named texture buffer texture object command
 
@@ -25910,7 +25307,6 @@
 	subcategory	EXT_texture_buffer_object
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_texture_buffer_object
 	dlflags		notlistable
@@ -25927,7 +25323,6 @@
 	subcategory	EXT_texture_buffer_object
 	extension	soft WINSOFT NV50
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_texture_buffer_object
 	dlflags		notlistable
@@ -25945,7 +25340,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -25959,7 +25353,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -25972,7 +25365,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -25988,7 +25380,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26004,7 +25395,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26021,7 +25411,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26036,7 +25425,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26051,7 +25439,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26064,7 +25451,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26077,7 +25463,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26089,7 +25474,6 @@
 	subcategory	EXT_framebuffer_object
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26102,7 +25486,6 @@
 	subcategory	EXT_framebuffer_object
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26114,7 +25497,6 @@
 	subcategory	EXT_framebuffer_object
 	extension	soft WINSOFT
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_object
 
@@ -26129,7 +25511,6 @@
 	extension	soft WINSOFT
 	glxflags	ignore
 	glfflags	capture-execute gl-enum
-	glsflags	get
 
 # New named framebuffer multisample object commands
 
@@ -26145,7 +25526,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_EXT_framebuffer_multisample
 
@@ -26164,7 +25544,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_framebuffer_multisample_coverage
 
@@ -26181,7 +25560,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -26197,7 +25575,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -26213,7 +25590,6 @@
 	extension	soft WINSOFT
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_gpu_program4
 
@@ -26229,7 +25605,6 @@
 	extension	soft WINSOFT NV50
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_explicit_multisample
 
@@ -26243,7 +25618,6 @@
 	extension	soft WINSOFT NV50
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 	glextmask	GL_MASK_NV_explicit_multisample
 
@@ -26290,7 +25664,6 @@
 	category	NV_explicit_multisample
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 SampleMaskIndexedNV(index, mask)
@@ -26299,7 +25672,6 @@
 	param		mask		SampleMaskNV in value
 	category	NV_explicit_multisample
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 TexRenderbufferNV(target, renderbuffer)
@@ -26309,7 +25681,6 @@
 	category	NV_explicit_multisample
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ###############################################################################
@@ -26325,7 +25696,6 @@
 	param		id		UInt32 in value
 	category	NV_transform_feedback2
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 DeleteTransformFeedbacksNV(n, ids)
@@ -26335,7 +25705,6 @@
 	category	NV_transform_feedback2
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 GenTransformFeedbacksNV(n, ids)
@@ -26345,7 +25714,6 @@
 	category	NV_transform_feedback2
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 IsTransformFeedbackNV(id)
@@ -26354,21 +25722,18 @@
 	category	NV_transform_feedback2
 	dlflags		notlistable
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 PauseTransformFeedbackNV()
 	return		void
 	category	NV_transform_feedback2
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 ResumeTransformFeedbackNV()
 	return		void
 	category	NV_transform_feedback2
 	glfflags	ignore
-	glsflags	ignore
 	glxflags	ignore
 
 DrawTransformFeedbackNV(mode, id)
@@ -26377,5 +25742,1103 @@
 	param		id		UInt32 in value
 	category	NV_transform_feedback2
 	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	offset		?
+
+BeginPerfMonitorAMD(monitor)
+	return		void
+	param		monitor		UInt32 in value
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndPerfMonitorAMD(monitor)
+	return		void
+	param		monitor		UInt32 in value
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	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
+	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
+	offset		?
+
+TessellationModeAMD(mode)
+	return		void
+	param		mode		GLenum in value
+	category	AMD_vertex_shader_tesselator
+	version		2.0
+	glxsingle	?
+	glxflags	ignore
+	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
+	offset		?
+
+###############################################################################
+#
+# Extension #365
+# EXT_texture_snorm commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_snorm
+
+###############################################################################
+#
+# Extension #366
+# AMD_draw_buffers_blend commands
+#
+###############################################################################
+
+# void BlendFuncIndexedAMD(uint buf, enum src, enum dst)
+# void BlendFuncSeparateIndexedAMD(uint buf, enum srcRGB, enum dstRGB, enum srcAlpha, enum dstAlpha)
+# void BlendEquationIndexedAMD(uint buf, enum mode)
+# void BlendEquationSeparateIndexedAMD(uint buf, enum modeRGB, enum modeAlpha)
+
+BlendFuncIndexedAMD(buf, src, dst)
+	return		void
+	param		buf		UInt32 in value
+	param		src		GLenum in value
+	param		dst		GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendFuncSeparateIndexedAMD(buf, srcRGB, dstRGB, srcAlpha, dstAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		srcRGB		GLenum in value
+	param		dstRGB		GLenum in value
+	param		srcAlpha	GLenum in value
+	param		dstAlpha	GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendEquationIndexedAMD(buf, mode)
+	return		void
+	param		buf		UInt32 in value
+	param		mode		GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendEquationSeparateIndexedAMD(buf, modeRGB, modeAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		modeRGB		GLenum in value
+	param		modeAlpha	GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #367
+# APPLE_texture_range commands
+#
+###############################################################################
+
+TextureRangeAPPLE(target, length, pointer)
+	return		void
+	param		target		GLenum in value
+	param		length		SizeI in value
+	param		pointer		Void in array [length]
+	category	APPLE_texture_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetTexParameterPointervAPPLE(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		VoidPointer out array [1]
+	category	APPLE_texture_range
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #368
+# APPLE_float_pixels commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_float_pixels
+
+###############################################################################
+#
+# Extension #369
+# APPLE_vertex_program_evaluators commands
+#
+###############################################################################
+
+EnableVertexAttribAPPLE(index, pname)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DisableVertexAttribAPPLE(index, pname)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsVertexAttribEnabledAPPLE(index, pname)
+	return		Boolean
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib1dAPPLE(index, size, u1, u2, stride, order, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(size/stride/order)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib1fAPPLE(index, size, u1, u2, stride, order, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(size/stride/order)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib2dAPPLE(index, size, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordD in value
+	param		v2		CoordD in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(size/ustride/uorder/vstride/vorder)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib2fAPPLE(index, size, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordF in value
+	param		v2		CoordF in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(size/ustride/uorder/vstride/vorder)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #370
+# APPLE_aux_depth_stencil commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_aux_depth_stencil
+
+###############################################################################
+#
+# Extension #371
+# APPLE_object_purgeable commands
+#
+###############################################################################
+
+ObjectPurgeableAPPLE(objectType, name, option)
+	return		GLenum
+	param		objectType	GLenum in value
+	param		name		UInt32 in value
+	param		option		GLenum in value
+	category	APPLE_object_purgeable
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ObjectUnpurgeableAPPLE(objectType, name, option)
+	return		GLenum
+	param		objectType	GLenum in value
+	param		name		UInt32 in value
+	param		option		GLenum in value
+	category	APPLE_object_purgeable
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetObjectParameterivAPPLE(objectType, name, pname, params)
+	return		void
+	param		objectType	GLenum in value
+	param		name		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	APPLE_object_purgeable
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #372
+# APPLE_row_bytes commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_row_bytes
+
+###############################################################################
+#
+# Extension #373
+# APPLE_rgb_422 commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_rgb_422
+
+###############################################################################
+#
+# Extension #374
+# NV_video_capture commands
+#
+###############################################################################
+
+BeginVideoCaptureNV(video_capture_slot)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindVideoCaptureStreamBufferNV(video_capture_slot, stream, frame_region, offset)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		frame_region	GLenum in value
+	param		offset		BufferOffsetARB in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindVideoCaptureStreamTextureNV(video_capture_slot, stream, frame_region, target, texture)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		frame_region	GLenum in value
+	param		target		GLenum in value
+	param		texture		UInt32 in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndVideoCaptureNV(video_capture_slot)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureivNV(video_capture_slot, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureStreamivNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureStreamfvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureStreamdvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureNV(video_capture_slot, sequence_num, capture_time)
+	return		GLenum
+	param		video_capture_slot	UInt32 in value
+	param		sequence_num	UInt32 out reference
+	param		capture_time	UInt64EXT out reference
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureStreamParameterivNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureStreamParameterfvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float32 in array [COMPSIZE(pname)]
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureStreamParameterdvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 in array [COMPSIZE(pname)]
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #375 - GLX_EXT_swap_control
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #376 - also GLX_NV_copy_image, WGL_NV_copy_image
+# NV_copy_image commands
+#
+###############################################################################
+
+CopyImageSubDataNV(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, width, height, depth)
+	return		void
+	param		srcName		UInt32 in value
+	param		srcTarget	GLenum in value
+	param		srcLevel	Int32 in value
+	param		srcX		Int32 in value
+	param		srcY		Int32 in value
+	param		srcZ		Int32 in value
+	param		dstName		UInt32 in value
+	param		dstTarget	GLenum in value
+	param		dstLevel	Int32 in value
+	param		dstX		Int32 in value
+	param		dstY		Int32 in value
+	param		dstZ		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	NV_copy_image
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #377
+# EXT_separate_shader_objects commands
+#
+###############################################################################
+
+UseShaderProgramEXT(type, program)
+	return		void
+	param		type		GLenum in value
+	param		program		UInt32 in value
+	category	EXT_separate_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ActiveProgramEXT(program)
+	return		void
+	param		program		UInt32 in value
+	category	EXT_separate_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CreateShaderProgramEXT(type, string)
+	return		UInt32
+	param		type		GLenum in value
+	param		string		Char in array []
+	category	EXT_separate_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #378
+# NV_parameter_buffer_object2 commands
+#
+###############################################################################
+
+newcategory: NV_parameter_buffer_object2
+
+###############################################################################
+#
+# Extension #379
+# NV_shader_buffer_load commands
+#
+###############################################################################
+
+MakeBufferResidentNV(target, access)
+	return		void
+	param		target		GLenum in value
+	param		access		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeBufferNonResidentNV(target)
+	return		void
+	param		target		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsBufferResidentNV(target)
+	return		Boolean
+	param		target		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NamedMakeBufferResidentNV(buffer, access)
+	return		void
+	param		buffer		UInt32 in value
+	param		access		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NamedMakeBufferNonResidentNV(buffer)
+	return		void
+	param		buffer		UInt32 in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsNamedBufferResidentNV(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetBufferParameterui64vNV(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetNamedBufferParameterui64vNV(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetIntegerui64vNV(value, result)
+	return		void
+	param		value		GLenum in value
+	param		result		UInt64EXT out array [COMPSIZE(value)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+Uniformui64NV(location, value)
+	return		void
+	param		location	Int32 in value
+	param		value		UInt64EXT in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniformui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetUniformui64vNV(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		UInt64EXT out array [COMPSIZE(program/location)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformui64NV(program, location, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		value		UInt64EXT in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #380
+# NV_vertex_buffer_unified_memory commands
+#
+###############################################################################
+
+BufferAddressRangeNV(pname, index, address, length)
+	return		void
+	param		pname		GLenum in value
+	param		index		UInt32 in value
+	param		address		UInt64EXT in value
+	param		length		BufferSize in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalFormatNV(type, stride)
+	return		void
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IndexFormatNV(type, stride)
+	return		void
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EdgeFlagFormatNV(stride)
+	return		void
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColorFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FogCoordFormatNV(type, stride)
+	return		void
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribFormatNV(index, size, type, normalized, stride)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribIFormatNV(index, size, type, stride)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetIntegerui64i_vNV(value, index, result)
+	return		void
+	param		value		GLenum in value
+	param		index		UInt32 in value
+	param		result		UInt64EXT out array [COMPSIZE(value)]
+	category	NV_vertex_buffer_unified_memory
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #381
+# NV_texture_barrier commands
+#
+###############################################################################
+
+TextureBarrierNV()
+	return		void
+	category	NV_texture_barrier
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+

Modified: AppleSGLX/trunk/specs/glxenum.spec
===================================================================
--- AppleSGLX/trunk/specs/glxenum.spec	2010-01-10 03:11:22 UTC (rev 404)
+++ AppleSGLX/trunk/specs/glxenum.spec	2010-01-13 05:04:59 UTC (rev 405)
@@ -84,6 +84,7 @@
 GLXEventMask enum:
 	PBUFFER_CLOBBER_MASK				= 0x08000000	# SelectEvent mask
 	BUFFER_CLOBBER_MASK_SGIX			= 0x08000000	# SelectEventSGIX mask
+#	INTEL_future_use				= 0x04000000	# SelectEvent mask (for GLX_INTEL_swap_event)
 
 GLXPbufferClobberMask enum:
 	FRONT_LEFT_BUFFER_BIT				= 0x00000001	# PbufferClobberEvent mask
@@ -122,6 +123,16 @@
 	TEXTURE_2D_BIT_EXT				= 0x00000002
 	TEXTURE_RECTANGLE_BIT_EXT			= 0x00000004
 
+# CONTEXT_FLAGS_ARB bits
+GLXContextFlags enum:
+	CONTEXT_DEBUG_BIT_ARB				= 0x00000001	# ARB_create_context
+	CONTEXT_FORWARD_COMPATIBLE_BIT_ARB		= 0x00000002	# ARB_create_context
+
+# CONTEXT_PROFILE_MASK_ARB bits
+GLXContextProfileMask enum:
+	CONTEXT_CORE_PROFILE_BIT_ARB			= 0x00000001	# ARB_create_context_profile
+	CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB		= 0x00000002	# ARB_create_context_profile
+
 GLXAttribute enum:
 	USE_GL						= 1		# Visual attributes
 	BUFFER_SIZE					= 2		#   "
@@ -241,13 +252,11 @@
 
 # ARB: 0x2070-0x209F (shared with WGL)
 
-# Also includes a bitmask
+# Also includes a bitmask - see ContextFlags above
 # ARB_create_context enum:
-	GLX_CONTEXT_DEBUG_BIT_ARB			= 0x00000001
-	GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB		= 0x00000002
-	GLX_CONTEXT_MAJOR_VERSION_ARB			= 0x2091
-	GLX_CONTEXT_MINOR_VERSION_ARB			= 0x2092
-	GLX_CONTEXT_FLAGS_ARB				= 0x2094
+	CONTEXT_MAJOR_VERSION_ARB			= 0x2091
+	CONTEXT_MINOR_VERSION_ARB			= 0x2092
+	CONTEXT_FLAGS_ARB				= 0x2094
 
 ###############################################################################
 
@@ -268,18 +277,21 @@
 # NV_future_use: 0x20BA-0x20C2
 
 # NV_video_out enum:
-	GLX_VIDEO_OUT_COLOR_NV				= 0x20C3
-	GLX_VIDEO_OUT_ALPHA_NV				= 0x20C4
-	GLX_VIDEO_OUT_DEPTH_NV				= 0x20C5
-	GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV		= 0x20C6
-	GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV		= 0x20C7
-	GLX_VIDEO_OUT_FRAME_NV				= 0x20C8
-	GLX_VIDEO_OUT_FIELD_1_NV			= 0x20C9
-	GLX_VIDEO_OUT_FIELD_2_NV			= 0x20CA
-	GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV		= 0x20CB
-	GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV		= 0x20CC
+	VIDEO_OUT_COLOR_NV				= 0x20C3
+	VIDEO_OUT_ALPHA_NV				= 0x20C4
+	VIDEO_OUT_DEPTH_NV				= 0x20C5
+	VIDEO_OUT_COLOR_AND_ALPHA_NV			= 0x20C6
+	VIDEO_OUT_COLOR_AND_DEPTH_NV			= 0x20C7
+	VIDEO_OUT_FRAME_NV				= 0x20C8
+	VIDEO_OUT_FIELD_1_NV				= 0x20C9
+	VIDEO_OUT_FIELD_2_NV				= 0x20CA
+	VIDEO_OUT_STACKED_FIELDS_1_2_NV			= 0x20CB
+	VIDEO_OUT_STACKED_FIELDS_2_1_NV			= 0x20CC
 
-# NV_future_use: 0x20CD-0x20CF
+# NV_video_capture enum:
+	DEVICE_ID_NV					= 0x20CD
+	UNIQUE_ID_NV					= 0x20CE
+	NUM_VIDEO_CAPTURE_SLOTS_NV			= 0x20CF
 
 # EXT_texture_from_pixmap enum:
 	BIND_TO_TEXTURE_RGB_EXT				= 0x20D0
@@ -315,11 +327,15 @@
 
 # NV_future_use: 0x20EC-0x20EF
 
-# NV_present_video enum:
-	GLX_NUM_VIDEO_SLOTS_NV				= 0x20F0
+NV_present_video enum:
+	NUM_VIDEO_SLOTS_NV				= 0x20F0
 
-# NV_future_use: 0x20F1-0x219F
+EXT_swap_control enum:
+	SWAP_INTERVAL_EXT				= 0x20F1
+	MAX_SWAP_INTERVAL_EXT				= 0x20F2
 
+# NV_future_use: 0x20F3-0x219F
+
 ###############################################################################
 
 # MESA (not in a reserved block)
@@ -362,17 +378,35 @@
 
 # NVIDIA: 0x8070 - 0x816F
 
+NVIDIA_future_use: 0x8070-0x816F
+
 ###############################################################################
 
 # SUN: 0x8170 - 0x817F
 
+SUN_future_use: 0x8170-0x817F
+
 ###############################################################################
+
+# INTEL: 0x8180 - 0x818F
+
+# INTEL_swap_event: 0x8180-??? (in process, see Khronos bug 5752)
+
+INTEL_future_use: 0x8180-0x818F
+
+###############################################################################
 ### Please remember that new GLX enum 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: 0x8180-0xFFFF
+# Any_vendor_future_use: 0x8180-0x9125
+
+# Also includes a bitmask - see ContextProfileMask above
+# ARB_create_context_profile enum: (equivalent to corresponding GL token)
+	CONTEXT_PROFILE_MASK_ARB			= 0x9126
+
+# Any_vendor_future_use: 0x9127-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

Modified: AppleSGLX/trunk/specs/glxenumext.spec
===================================================================
--- AppleSGLX/trunk/specs/glxenumext.spec	2010-01-10 03:11:22 UTC (rev 404)
+++ AppleSGLX/trunk/specs/glxenumext.spec	2010-01-13 05:04:59 UTC (rev 405)
@@ -22,9 +22,9 @@
 
 passthru:
 passthru: /* Header file version number, required by OpenGL ABI for Linux */
-passthru: /* glxext.h last updated 2008/10/22 */
+passthru: /* glxext.h last updated 2009/10/08 */
 passthru: /* Current version at http://www.opengl.org/registry/ */
-passthru: #define GLX_GLXEXT_VERSION 21
+passthru: #define GLX_GLXEXT_VERSION 25
 
 ###############################################################################
 #
@@ -137,6 +137,15 @@
 	CONTEXT_FLAGS_ARB				= 0x2094
 
 ###############################################################################
+
+# ARB Extension #75
+ARB_create_context_profile enum:
+	CONTEXT_CORE_PROFILE_BIT_ARB			= 0x00000001
+	CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB		= 0x00000002
+	CONTEXT_PROFILE_MASK_ARB			= 0x9126
+
+
+###############################################################################
 #
 # non-ARB GLX extensions, in registry order
 #
@@ -473,3 +482,22 @@
 NV_swap_group enum:
 
 ###############################################################################
+
+# Extension #374
+NV_video_capture enum:
+	DEVICE_ID_NV					= 0x20CD
+	UNIQUE_ID_NV					= 0x20CE
+	NUM_VIDEO_CAPTURE_SLOTS_NV			= 0x20CF
+
+###############################################################################
+
+# Extension #375
+EXT_swap_control enum:
+	SWAP_INTERVAL_EXT				= 0x20F1
+	MAX_SWAP_INTERVAL_EXT				= 0x20F2
+
+###############################################################################
+
+# No new tokens
+# Extension #376
+NV_copy_image enum:

Modified: AppleSGLX/trunk/specs/glxext.spec
===================================================================
--- AppleSGLX/trunk/specs/glxext.spec	2010-01-10 03:11:22 UTC (rev 404)
+++ AppleSGLX/trunk/specs/glxext.spec	2010-01-13 05:04:59 UTC (rev 405)
@@ -11,7 +11,7 @@
 glxflags:	client-handcode client-intercept server-handcode
 glxvendorglx:	*
 vectorequiv:	*
-category:	VERSION_1_3 VERSION_1_4 ARB_get_proc_address ARB_multisample ARB_fbconfig_float EXT_import_context SGIX_dmbuffer SGIX_fbconfig SGIX_pbuffer SGIX_swap_barrier SGIX_swap_group SGIX_video_resize SGIX_video_source SGI_cushion SGI_make_current_read SGI_swap_control SGI_video_sync SUN_get_transparent_index MESA_agp_offset MESA_copy_sub_buffer MESA_pixmap_colormap MESA_release_buffers MESA_set_3dfx_mode SGIX_visual_select_group OML_sync_control SGIX_hyperpipe EXT_texture_from_pixmap NV_swap_group NV_video_out NV_present_video ARB_create_context
+category:	VERSION_1_3 VERSION_1_4 ARB_get_proc_address ARB_multisample ARB_fbconfig_float EXT_import_context SGIX_dmbuffer SGIX_fbconfig SGIX_pbuffer SGIX_swap_barrier SGIX_swap_group SGIX_video_resize SGIX_video_source SGI_cushion SGI_make_current_read SGI_swap_control SGI_video_sync SUN_get_transparent_index MESA_agp_offset MESA_copy_sub_buffer MESA_pixmap_colormap MESA_release_buffers MESA_set_3dfx_mode SGIX_visual_select_group OML_sync_control SGIX_hyperpipe EXT_texture_from_pixmap NV_swap_group NV_video_output NV_present_video ARB_create_context NV_video_capture NV_copy_image EXT_swap_control
 glxopcode:	*
 
 #
@@ -51,6 +51,14 @@
 passthru: } GLXBufferClobberEventSGIX;
 passthru: #endif
 passthru:
+passthru: #ifndef GLX_NV_video_output
+passthru: typedef unsigned int GLXVideoDeviceNV;
+passthru: #endif
+passthru:
+passthru: #ifndef GLX_NV_video_capture
+passthru: typedef XID GLXVideoCaptureDeviceNV;
+passthru: #endif
+passthru:
 passthru: #ifndef GLEXT_64_TYPES_DEFINED
 passthru: /* This code block is duplicated in glext.h, so must be protected */
 passthru: #define GLEXT_64_TYPES_DEFINED
@@ -191,7 +199,7 @@
 	param		dpy		Display out reference
 	param		draw		GLXDrawable in value
 	param		attribute	int in value
-	param		value		Uint out reference
+	param		value		uint out reference
 	category	VERSION_1_3
 	glxflags	client-handcode client-intercept server-handcode
 
@@ -319,7 +327,17 @@
 	glxflags	client-handcode client-intercept server-handcode
 	glxopcode	34
 
+###############################################################################
+#
+# ARB Extension #75
+# ARB_create_context_profile commands
+#
+###############################################################################
 
+# (none)
+newcategory: ARB_create_context_profile
+
+
 ###############################################################################
 #
 # Extension #25
@@ -363,7 +381,7 @@
 
 GetVideoSyncSGI(count)
 	return		int
-	param		count		Uint out reference
+	param		count		uint out reference
 	category	SGI_video_sync
 	glxflags	client-handcode client-intercept server-handcode
 
@@ -371,7 +389,7 @@
 	return		int
 	param		divisor		int in value
 	param		remainder	int in value
-	param		count		Uint out reference
+	param		count		uint out reference
 	category	SGI_video_sync
 	glxflags	client-handcode client-intercept server-handcode
 
@@ -559,8 +577,8 @@
 	return		GLXPbufferSGIX
 	param		dpy		Display out reference
 	param		config		GLXFBConfigSGIX in value
-	param		width		Uint in value
-	param		height		Uint in value
+	param		width		uint in value
+	param		height		uint in value
 	param		attrib_list	int out reference
 	category	SGIX_pbuffer
 	glxflags	client-handcode server-handcode
@@ -579,7 +597,7 @@
 	param		dpy		Display out reference
 	param		pbuf		GLXPbufferSGIX in value
 	param		attribute	int in value
-	param		value		Uint out reference
+	param		value		uint out reference
 	category	SGIX_pbuffer
 
 SelectEventSGIX(dpy, drawable, mask)
@@ -1074,56 +1092,227 @@
 #
 ###############################################################################
 
-# TBD
-newcategory: NV_present_video
-#   unsigned int *glXEnumerateVideoDevicesNV(Display *dpy, int screen,
-#					     int *nelements);
-#   int glXBindVideoDeviceNV(Display *dpy, unsigned int video_slot,
-#			     unsigned int video_device,
-#			     const int *attrib_list);
+EnumerateVideoDevicesNV(dpy, screen, nelements)
+	return		uintPointer
+	param		dpy		Display out reference
+	param		screen		int in value
+	param		nelements	int out reference
+	category	NV_present_video
+	glxflags	client-handcode server-handcode
 
+BindVideoDeviceNV(dpy, video_slot, video_device, attrib_list)
+	return		int
+	param		dpy		Display out reference
+	param		video_slot	uint in value
+	param		video_device	uint in value
+	param		attrib_list	int in reference
+	category	NV_present_video
+	glxflags	client-handcode server-handcode
+
 ###############################################################################
 #
 # Extension #348
-# NV_video_out commands
+# NV_video_output commands
 #
 ###############################################################################
 
-# TBD
-newcategory: NV_video_out
-#   int glXGetVideoDeviceNV(Display *dpy, int screen, int numVideoDevices,
-#			    GLXVideoDeviceNV *pVideoDevice);
+GetVideoDeviceNV(dpy, screen, numVideoDevices, pVideoDevice)
+	return		int
+	param		dpy		Display out reference
+	param		screen		int in value
+	param		numVideoDevices int in value
+	param		pVideoDevice	GLXVideoDeviceNV out array [COMPSIZE(numVideoDevices)]
+	category	NV_video_output
+	glxflags	client-handcode server-handcode
+
+ReleaseVideoDeviceNV(dpy, screen, VideoDevice)
+	return		int
+	param		dpy		Display out reference
+	param		screen		int in value
+	param		VideoDevice	GLXVideoDeviceNV in value
+	category	NV_video_output
+	glxflags	client-handcode server-handcode
+
+BindVideoImageNV(dpy, VideoDevice, pbuf, iVideoBuffer)
+	return		int
+	param		dpy		Display out reference
+	param		VideoDevice	GLXVideoDeviceNV in value
+	param		pbuf		GLXPbuffer in value
+	param		iVideoBuffer	int in value
+	category	NV_video_output
+	glxflags	client-handcode server-handcode
+
+ReleaseVideoImageNV(dpy, pbuf)
+	return		int
+	param		dpy		Display out reference
+	param		pbuf		GLXPbuffer in value
+	category	NV_video_output
+	glxflags	client-handcode server-handcode
+
+SendPbufferToVideoNV(dpy, pbuf, iBufferType, pulCounterPbuffer, bBlock)
+	return		int
+	param		dpy		Display out reference
+	param		pbuf		GLXPbuffer in value
+	param		iBufferType	int in value
+	param		pulCounterPbuffer ulong out reference
+	param		bBlock		GLboolean in value
+	category	NV_video_output
+	glxflags	client-handcode server-handcode
+
+GetVideoInfoNV(dpy, screen, VideoDevice, pulCounterOutputPbuffer, pulCounterOutputVideo)
+	return		int
+	param		dpy		Display out reference
+	param		screen		int in value
+	param		VideoDevice	GLXVideoDeviceNV in value
+	param		pulCounterOutputPbuffer ulong out reference
+	param		pulCounterOutputVideo	ulong out reference
+	category	NV_video_output
+	glxflags	client-handcode server-handcode
+
+###############################################################################
 #
-#   int glXReleaseVideoDeviceNV(Display *dpy, int screen,
-#				GLXVideoDeviceNV VideoDevice);
+# Extension #350
+# NV_swap_group commands
 #
-#   int glXBindVideoImageNV(Display *dpy, GLXVideoDeviceNV VideoDevice,
-#			    GLXPbuffer pbuf, int iVideoBuffer);
+###############################################################################
+
+JoinSwapGroupNV(dpy, drawable, group)
+	return		Bool
+	param		dpy		Display out reference
+	param		drawable	GLXDrawable in value
+	param		group		GLuint in value
+	category	NV_swap_group
+	glxflags	client-handcode server-handcode
+
+BindSwapBarrierNV(dpy, group, barrier)
+	return		Bool
+	param		dpy		Display out reference
+	param		group		GLuint in value
+	param		barrier		GLuint in value
+	category	NV_swap_group
+	glxflags	client-handcode server-handcode
+
+QuerySwapGroupNV(dpy, drawable, group, barrier)
+	return		Bool
+	param		dpy		Display out reference
+	param		drawable	GLXDrawable in value
+	param		group		GLuint out reference
+	param		barrier		GLuint out reference
+	category	NV_swap_group
+	glxflags	client-handcode server-handcode
+
+QueryMaxSwapGroupsNV(dpy, screen, maxGroups, maxBarriers)
+	return		Bool
+	param		dpy		Display out reference
+	param		screen		int in value
+	param		maxGroups	GLuint out reference
+	param		maxBarriers	GLuint out reference
+	category	NV_swap_group
+	glxflags	client-handcode server-handcode
+
+QueryFrameCountNV(dpy, screen, count)
+	return		Bool
+	param		dpy		Display out reference
+	param		screen		int in value
+	param		count		GLuint out reference
+	category	NV_swap_group
+	glxflags	client-handcode server-handcode
+
+ResetFrameCountNV(dpy, screen)
+	return		Bool
+	param		dpy		Display out reference
+	param		screen		int in value
+	category	NV_swap_group
+	glxflags	client-handcode server-handcode
+
+###############################################################################
 #
-#   int glXReleaseVideoImageNV(Display *dpy, GLXPbuffer pbuf);
+# Extension #374
+# NV_video_capture commands
 #
-#   int glXSendPbufferToVideoNV(Display *dpy, GLXPbuffer pbuf,
-#				int iBufferType,
-#				unsigned long *pulCounterPbuffer,
-#				GLboolean bBlock);
+###############################################################################
+
+BindVideoCaptureDeviceNV(dpy, video_capture_slot, device)
+	return		int
+	param		dpy		Display out reference
+	param		video_capture_slot uint in value
+	param		device		GLXVideoCaptureDeviceNV in value
+	category	NV_video_capture
+	glxflags	client-handcode server-handcode
+
+EnumerateVideoCaptureDevicesNV(dpy, screen, nelements)
+	return		GLXVideoCaptureDeviceNVPointer
+	param		dpy		Display out reference
+	param		screen		int in value
+	param		nelements	int out reference
+	category	NV_video_capture
+	glxflags	client-handcode server-handcode
+
+LockVideoCaptureDeviceNV(dpy, device)
+	return		void
+	param		dpy		Display out reference
+	param		device		GLXVideoCaptureDeviceNV in value
+	category	NV_video_capture
+	glxflags	client-handcode server-handcode
+
+QueryVideoCaptureDeviceNV(dpy, device, attribute, value)
+	return		int
+	param		dpy		Display out reference
+	param		device		GLXVideoCaptureDeviceNV in value
+	param		attribute	int in value
+	param		value		int out array [COMPSIZE(attribute)]
+	category	NV_video_capture
+	glxflags	client-handcode server-handcode
+
+ReleaseVideoCaptureDeviceNV(dpy, device)
+	return		void
+	param		dpy		Display out reference
+	param		device		GLXVideoCaptureDeviceNV in value
+	category	NV_video_capture
+	glxflags	client-handcode server-handcode
+
+###############################################################################
 #
-#   int glXGetVideoInfoNV(Display *dpy, int screen,
-#			  GLXVideoDeviceNV VideoDevice,
-#			  unsigned long *pulCounterOutputPbuffer,
-#			  unsigned long *pulCounterOutputVideo);
+# Extension #375
+# EXT_swap_control commands
+#
+###############################################################################
 
+SwapIntervalEXT(dpy, drawable, interval)
+	return		int
+	param		dpy		Display out reference
+	param		drawable	GLXDrawable in value
+	param		interval	int in value
+	category	EXT_swap_control
+	glxflags	client-handcode server-handcode
+
 ###############################################################################
 #
-# Extension #350
-# NV_swap_group commands
+# Extension #376
+# GLX_NV_copy_image commands
 #
 ###############################################################################
 
-# TBD
-newcategory: NV_swap_group
-#   Bool glXJoinSwapGroupNV(Display *dpy, GLXDrawable drawable, GLuint group);
-#   Bool glXBindSwapBarrierNV(Display *dpy, GLuint group, GLuint barrier);
-#   Bool glXQuerySwapGroupNV(Display *dpy, GLXDrawable drawable, GLuint *group, GLuint *barrier);
-#   Bool glXQueryMaxSwapGroupsNV(Display *dpy, int screen, GLuint *maxGroups, GLuint *maxBarriers);
-#   Bool glXQueryFrameCountNV(Display *dpy, int screen, GLuint *count);
-#   Bool glXResetFrameCountNV(Display *dpy, int screen);
+CopyImageSubDataNV(dpy, srcCtx, srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstCtx, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, width, height, depth)
+	return		void
+	param		dpy		Display out reference
+	param		srcCtx		GLXContext in value
+	param		srcName		GLuint in value
+	param		srcTarget	GLenum in value
+	param		srcLevel	GLint in value
+	param		srcX		GLint in value
+	param		srcY		GLint in value
+	param		srcZ		GLint in value
+	param		dstCtx		GLXContext in value
+	param		dstName		GLuint in value
+	param		dstTarget	GLenum in value
+	param		dstLevel	GLint in value
+	param		dstX		GLint in value
+	param		dstY		GLint in value
+	param		dstZ		GLint in value
+	param		width		GLsizei in value
+	param		height		GLsizei in value
+	param		depth		GLsizei in value
+	category	NV_copy_image
+	glxflags	client-handcode server-handcode
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20100112/08cf0401/attachment-0001.html>


More information about the Xquartz-changes mailing list