Commits

Jason McKesson committed 797e0c3

Updated to the 4.2 spec drop.

  • Participants
  • Parent commits 9902581

Comments (0)

Files changed (7)

 end
 
 function GetIncludePath()
-	return "..\\include\\glloader\\";
+	return "../include/glload/";
 end
 
 function GetSourcePath()
-	return "..\\source\\";
+	return "../source/";
 end
 
 function GetSpecFilePath()
-	return "glspecs\\";
+	return "glspecs/";
 end
 
 function GetDataFilePath()
-	return "data\\";
+	return "data/";
 end
 
 --This returns the starting part of a header's includeguard. Takes the name of the define.

glspecs/enum.spec

 # It is an extremely important file. Do not mess with it unless
 # you know what you're doing and have permission to do so.
 #
-# $Revision: 12183 $ on $Date: 2010-08-06 02:53:05 -0700 (Fri, 06 Aug 2010) $
+# $Revision: 15267 $ on $Date: 2011-08-08 00:37:03 -0700 (Mon, 08 Aug 2011) $
 
 ###############################################################################
 #
 
 ###############################################################################
 
+# MemoryBarrier bits
+
+EXT_shader_image_load_store enum: (additional; see below)
+	VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT		= 0x00000001
+	ELEMENT_ARRAY_BARRIER_BIT_EXT			= 0x00000002
+	UNIFORM_BARRIER_BIT_EXT				= 0x00000004
+	TEXTURE_FETCH_BARRIER_BIT_EXT			= 0x00000008
+	SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT		= 0x00000020
+	COMMAND_BARRIER_BIT_EXT				= 0x00000040
+	PIXEL_BUFFER_BARRIER_BIT_EXT			= 0x00000080
+	TEXTURE_UPDATE_BARRIER_BIT_EXT			= 0x00000100
+	BUFFER_UPDATE_BARRIER_BIT_EXT			= 0x00000200
+	FRAMEBUFFER_BARRIER_BIT_EXT			= 0x00000400
+	TRANSFORM_FEEDBACK_BARRIER_BIT_EXT		= 0x00000800
+	ATOMIC_COUNTER_BARRIER_BIT_EXT			= 0x00001000
+	ALL_BARRIER_BITS_EXT				= 0xFFFFFFFF
+
+ARB_shader_image_load_store enum: (additional; see below)
+	VERTEX_ATTRIB_ARRAY_BARRIER_BIT			= 0x00000001
+	ELEMENT_ARRAY_BARRIER_BIT			= 0x00000002
+	UNIFORM_BARRIER_BIT				= 0x00000004
+	TEXTURE_FETCH_BARRIER_BIT			= 0x00000008
+	SHADER_IMAGE_ACCESS_BARRIER_BIT			= 0x00000020
+	COMMAND_BARRIER_BIT				= 0x00000040
+	PIXEL_BUFFER_BARRIER_BIT			= 0x00000080
+	TEXTURE_UPDATE_BARRIER_BIT			= 0x00000100
+	BUFFER_UPDATE_BARRIER_BIT			= 0x00000200
+	FRAMEBUFFER_BARRIER_BIT				= 0x00000400
+	TRANSFORM_FEEDBACK_BARRIER_BIT			= 0x00000800
+	ATOMIC_COUNTER_BARRIER_BIT			= 0x00001000
+	ALL_BARRIER_BITS				= 0xFFFFFFFF
+
+###############################################################################
+
 Boolean enum:
 	FALSE						= 0
 	TRUE						= 1
 
 	use SGI_texture_color_table TEXTURE_COLOR_TABLE_SGI
 
+# Aliases OpenGL 1.0 core enums above
+QCOM_alpha_test enum: (OpenGL ES only)
+	ALPHA_TEST_QCOM					= 0x0BC0
+	ALPHA_TEST_FUNC_QCOM				= 0x0BC1
+	ALPHA_TEST_REF_QCOM				= 0x0BC2
+
+# These may need EXT suffixes added instead of 'use' directives
+EXT_unpack_subimage enum: (OpenGL ES only)
+	use GetPName UNPACK_ROW_LENGTH
+	use GetPName UNPACK_SKIP_ROWS
+	use GetPName UNPACK_SKIP_PIXELS
+
+NV_read_buffer enum: (OpenGL ES only)
+	READ_BUFFER_NV					= 0x0C02
+
 ###############################################################################
 
 GetTextureParameter enum:
 	DRAW_BUFFER14_ATI				= 0x8833
 	DRAW_BUFFER15_ATI				= 0x8834
 
+NV_draw_buffers enum: (OpenGL ES only)
+	MAX_DRAW_BUFFERS_NV				= 0x8824
+	DRAW_BUFFER0_NV					= 0x8825
+	DRAW_BUFFER1_NV					= 0x8826
+	DRAW_BUFFER2_NV					= 0x8827
+	DRAW_BUFFER3_NV					= 0x8828
+	DRAW_BUFFER4_NV					= 0x8829
+	DRAW_BUFFER5_NV					= 0x882A
+	DRAW_BUFFER6_NV					= 0x882B
+	DRAW_BUFFER7_NV					= 0x882C
+	DRAW_BUFFER8_NV					= 0x882D
+	DRAW_BUFFER9_NV					= 0x882E
+	DRAW_BUFFER10_NV				= 0x882F
+	DRAW_BUFFER11_NV				= 0x8830
+	DRAW_BUFFER12_NV				= 0x8831
+	DRAW_BUFFER13_NV				= 0x8832
+	DRAW_BUFFER14_NV				= 0x8833
+	DRAW_BUFFER15_NV				= 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
+# ATI_future_use: 0x8836-0x883C
 
 VERSION_2_0 enum: (Promoted for OpenGL 2.0)
 	BLEND_EQUATION_ALPHA				= 0x883D    # VERSION_2_0
 OES_blend_equation_separate enum: (OpenGL ES only)
 	BLEND_EQUATION_ALPHA_OES			= 0x883D
 
+# ATI_future_use: 0x883E
+
+AMD_sample_positions enum:
+	SUBSAMPLE_DISTANCE_AMD				= 0x883F
+
 ###############################################################################
 
 # OpenGL ARB: 0x8840-0x884F
 	UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER	= 0x8A46
 	INVALID_INDEX					= 0xFFFFFFFFu
 
-# APPLE_future_use: 0x8A47-0x8A7F
+# APPLE_future_use: 0x8A47
+
+EXT_texture_sRGB_decode enum:
+	TEXTURE_SRGB_DECODE_EXT				= 0x8A48
+	DECODE_EXT					= 0x8A49
+	SKIP_DECODE_EXT					= 0x8A4A
+
+# APPLE_future_use: 0x8A4B-0x8A7F
 
 ###############################################################################
 
 	MAX_TEXTURE_BUFFER_SIZE				= 0x8C2B
 	TEXTURE_BINDING_BUFFER				= 0x8C2C
 	TEXTURE_BUFFER_DATA_STORE_BINDING		= 0x8C2D
-	TEXTURE_BUFFER_FORMAT				= 0x8C2E
 
 ARB_texture_buffer_object enum:
 	TEXTURE_BUFFER_ARB				= 0x8C2A
 # ATI: 0x8C90-0x8C9F (Affie Munshi, OpenGL ES extensions)
 
 # Reassigned to Qualcomm at time of mobile/desktop split (bug 5874)
-# Qualcomm__future_use: 0x8C90-0x8C91
+# Qualcomm_future_use: 0x8C90-0x8C91
 
 AMD_compressed_ATC_texture enum: (OpenGL ES only)
 	ATC_RGB_AMD					= 0x8C92
 	FRAMEBUFFER_BINDING_OES				= 0x8CA6
 	RENDERBUFFER_BINDING_OES			= 0x8CA7
 
+# Aliases EXT_framebuffer_object enums above
+ANGLE_framebuffer_blit enum: (OpenGL ES only; additional; see below)
+	FRAMEBUFFER_BINDING_ANGLE			= 0x8CA6
+	RENDERBUFFER_BINDING_ANGLE			= 0x8CA7
+
 VERSION_3_0 enum:
 	use ARB_framebuffer_object	    READ_FRAMEBUFFER
 	use ARB_framebuffer_object	    DRAW_FRAMEBUFFER
 	DRAW_FRAMEBUFFER				= 0x8CA9    # VERSION_3_0 / ARB_fbo
 	READ_FRAMEBUFFER_BINDING			= 0x8CAA    # VERSION_3_0 / ARB_fbo
 
+# Aliases ARB_framebuffer_object enums above
+ANGLE_framebuffer_blit enum: (OpenGL ES only; additional; see above)
+	READ_FRAMEBUFFER_ANGLE				= 0x8CA8
+	DRAW_FRAMEBUFFER_ANGLE				= 0x8CA9
+
 EXT_framebuffer_blit enum:
 	READ_FRAMEBUFFER_EXT				= 0x8CA8
 	DRAW_FRAMEBUFFER_EXT				= 0x8CA9
 ARB_framebuffer_object enum: (note: no ARB suffixes)
 	RENDERBUFFER_SAMPLES				= 0x8CAB    # VERSION_3_0 / ARB_fbo
 
+# Aliases ARB_framebuffer_object enums above
+ANGLE_framebuffer_multisample enum: (OpenGL ES only)
+	RENDERBUFFER_SAMPLES_ANGLE			= 0x8CAB
+
 EXT_framebuffer_multisample enum:
 	RENDERBUFFER_SAMPLES_EXT			= 0x8CAB
 
 	DEPTH_COMPONENT32F				= 0x8CAC
 	DEPTH32F_STENCIL8				= 0x8CAD
 
-# ARB_future_use: 0x8CAF
+# ARB_future_use: 0x8CAE-0x8CAF
 
 ###############################################################################
 
 	RENDERBUFFER_STENCIL_SIZE			= 0x8D55    # VERSION_3_0 / ARB_fbo
 	RENDERBUFFER_STENCIL_SIZE_EXT			= 0x8D55
 
+# Aliases VERSION_3_0 enums above
+NV_draw_buffers enum: (OpenGL ES only; additional; see above)
+	COLOR_ATTACHMENT0_NV				= 0x8CE0
+	COLOR_ATTACHMENT1_NV				= 0x8CE1
+	COLOR_ATTACHMENT2_NV				= 0x8CE2
+	COLOR_ATTACHMENT3_NV				= 0x8CE3
+	COLOR_ATTACHMENT4_NV				= 0x8CE4
+	COLOR_ATTACHMENT5_NV				= 0x8CE5
+	COLOR_ATTACHMENT6_NV				= 0x8CE6
+	COLOR_ATTACHMENT7_NV				= 0x8CE7
+	COLOR_ATTACHMENT8_NV				= 0x8CE8
+	COLOR_ATTACHMENT9_NV				= 0x8CE9
+	COLOR_ATTACHMENT10_NV				= 0x8CEA
+	COLOR_ATTACHMENT11_NV				= 0x8CEB
+	COLOR_ATTACHMENT12_NV				= 0x8CEC
+	COLOR_ATTACHMENT13_NV				= 0x8CED
+	COLOR_ATTACHMENT14_NV				= 0x8CEE
+	COLOR_ATTACHMENT15_NV				= 0x8CEF
+
+# Aliases VERSION_3_0 enum above
+NV_fbo_color_attachments enum: (OpenGL ES only)
+	MAX_COLOR_ATTACHMENTS_NV			= 0x8CDF
+	use NV_draw_buffers COLOR_ATTACHMENT0
+	use NV_draw_buffers COLOR_ATTACHMENT1
+	use NV_draw_buffers COLOR_ATTACHMENT2
+	use NV_draw_buffers COLOR_ATTACHMENT3
+	use NV_draw_buffers COLOR_ATTACHMENT4
+	use NV_draw_buffers COLOR_ATTACHMENT5
+	use NV_draw_buffers COLOR_ATTACHMENT6
+	use NV_draw_buffers COLOR_ATTACHMENT7
+	use NV_draw_buffers COLOR_ATTACHMENT8
+	use NV_draw_buffers COLOR_ATTACHMENT9
+	use NV_draw_buffers COLOR_ATTACHMENT10
+	use NV_draw_buffers COLOR_ATTACHMENT11
+	use NV_draw_buffers COLOR_ATTACHMENT12
+	use NV_draw_buffers COLOR_ATTACHMENT13
+	use NV_draw_buffers COLOR_ATTACHMENT14
+	use NV_draw_buffers COLOR_ATTACHMENT15
+
 # Aliases EXT_framebuffer_object enum above
 # @@@??? does this appear in OES_texture3D, or OES_framebuffer_object?
 # extension spec & gl2ext.h disagree!
 	FRAMEBUFFER_INCOMPLETE_MULTISAMPLE		= 0x8D56    # VERSION_3_0 / ARB_fbo
 	MAX_SAMPLES					= 0x8D57    # VERSION_3_0 / ARB_fbo
 
+# Aliases ARB_framebuffer_object enums above
+ANGLE_framebuffer_multisample enum: (OpenGL ES only; additional; see above)
+	FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE	= 0x8D56
+	MAX_SAMPLES_ANGLE				= 0x8D57
+
 EXT_framebuffer_multisample enum: (additional; see above)
 	FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT		= 0x8D56
 	MAX_SAMPLES_EXT					= 0x8D57
 	TEXTURE_BINDING_EXTERNAL_OES			= 0x8D67
 	REQUIRED_TEXTURE_IMAGE_UNITS_OES		= 0x8D68
 
-# Khronos_future_use: 0x8D69-0x8D6F
+# VERSION_ES_FUTURE enum: (OpenGL ES future version only)
+#	PRIMITIVE_RESTART_MAX_INDEX			= 0x8D69
+#	ANY_SAMPLES_PASSED_CONSERVATIVE			= 0x8D6A
+#	MAX_ELEMENT_INDEX				= 0x8D6B
+
+# Khronos_future_use: 0x8D6C-0x8D6F
 
 ###############################################################################
 
 	MIN_PROGRAM_TEXTURE_GATHER_OFFSET		= 0x8E5E
 	MAX_PROGRAM_TEXTURE_GATHER_OFFSET		= 0x8E5F
 
+NV_gpu_program5 enum:
+	MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV		= 0x8E5E
+	MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV		= 0x8E5F
+
 # NV_future_use: 0x8E60-0x8E6F
 
 ARB_transform_feedback3 enum:
 	IMAGE_BINDING_LAYER_EXT				= 0x8F3D
 	IMAGE_BINDING_ACCESS_EXT			= 0x8F3E
 
+ARB_shader_image_load_store enum: (additional; see below)
+	MAX_IMAGE_UNITS					= 0x8F38
+	MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS	= 0x8F39
+	IMAGE_BINDING_NAME				= 0x8F3A
+	IMAGE_BINDING_LEVEL				= 0x8F3B
+	IMAGE_BINDING_LAYERED				= 0x8F3C
+	IMAGE_BINDING_LAYER				= 0x8F3D
+	IMAGE_BINDING_ACCESS				= 0x8F3E
+
 ARB_draw_indirect enum:
 	DRAW_INDIRECT_BUFFER				= 0x8F3F
 
 # Vivante: 0x8FC0-0x8FDF
 # Assigned for Frido Garritsen	(Khronos bug 4526)
 
+VIV_shader_binary enum: (OpenGL ES only)
+	SHADER_BINARY_VIV				= 0x8FC4
+
 ###############################################################################
 
 # NVIDIA: 0x8FE0-0x8FFF
 	LUMINANCE16_ALPHA16_SNORM			= 0x901A
 	INTENSITY16_SNORM				= 0x901B
 
-# AMD_future_use: 0x901C-0x901F
+AMD_blend_minmax_factor enum:
+	FACTOR_MIN_AMD					= 0x901C
+	FACTOR_MAX_AMD					= 0x901D
+
+AMD_depth_clamp_separate enum:
+	DEPTH_CLAMP_NEAR_AMD				= 0x901E
+	DEPTH_CLAMP_FAR_AMD				= 0x901F
 
 ###############################################################################
 
 # 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-0x904B
+	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-0x9044
+
+NV_texture_multisample enum:
+	TEXTURE_COVERAGE_SAMPLES_NV			= 0x9045
+	TEXTURE_COLOR_SAMPLES_NV			= 0x9046
+
+# NV_future_use: 0x9047-0x904B
 
 EXT_shader_image_load_store enum:
 	IMAGE_1D_EXT					= 0x904C
 	UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT	= 0x906C
 	MAX_IMAGE_SAMPLES_EXT				= 0x906D
 	IMAGE_BINDING_FORMAT_EXT			= 0x906E
-# ??? Not clear where to put new types of mask bits yet
-	VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT		= 0x00000001
-	ELEMENT_ARRAY_BARRIER_BIT_EXT			= 0x00000002
-	UNIFORM_BARRIER_BIT_EXT				= 0x00000004
-	TEXTURE_FETCH_BARRIER_BIT_EXT			= 0x00000008
-	SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT		= 0x00000020
-	COMMAND_BARRIER_BIT_EXT				= 0x00000040
-	PIXEL_BUFFER_BARRIER_BIT_EXT			= 0x00000080
-	TEXTURE_UPDATE_BARRIER_BIT_EXT			= 0x00000100
-	BUFFER_UPDATE_BARRIER_BIT_EXT			= 0x00000200
-	FRAMEBUFFER_BARRIER_BIT_EXT			= 0x00000400
-	TRANSFORM_FEEDBACK_BARRIER_BIT_EXT		= 0x00000800
-	ATOMIC_COUNTER_BARRIER_BIT_EXT			= 0x00001000
-	ALL_BARRIER_BITS_EXT				= 0xFFFFFFFF
+
+ARB_shader_image_load_store enum:
+	IMAGE_1D					= 0x904C
+	IMAGE_2D					= 0x904D
+	IMAGE_3D					= 0x904E
+	IMAGE_2D_RECT					= 0x904F
+	IMAGE_CUBE					= 0x9050
+	IMAGE_BUFFER					= 0x9051
+	IMAGE_1D_ARRAY					= 0x9052
+	IMAGE_2D_ARRAY					= 0x9053
+	IMAGE_CUBE_MAP_ARRAY				= 0x9054
+	IMAGE_2D_MULTISAMPLE				= 0x9055
+	IMAGE_2D_MULTISAMPLE_ARRAY			= 0x9056
+	INT_IMAGE_1D					= 0x9057
+	INT_IMAGE_2D					= 0x9058
+	INT_IMAGE_3D					= 0x9059
+	INT_IMAGE_2D_RECT				= 0x905A
+	INT_IMAGE_CUBE					= 0x905B
+	INT_IMAGE_BUFFER				= 0x905C
+	INT_IMAGE_1D_ARRAY				= 0x905D
+	INT_IMAGE_2D_ARRAY				= 0x905E
+	INT_IMAGE_CUBE_MAP_ARRAY			= 0x905F
+	INT_IMAGE_2D_MULTISAMPLE			= 0x9060
+	INT_IMAGE_2D_MULTISAMPLE_ARRAY			= 0x9061
+	UNSIGNED_INT_IMAGE_1D				= 0x9062
+	UNSIGNED_INT_IMAGE_2D				= 0x9063
+	UNSIGNED_INT_IMAGE_3D				= 0x9064
+	UNSIGNED_INT_IMAGE_2D_RECT			= 0x9065
+	UNSIGNED_INT_IMAGE_CUBE				= 0x9066
+	UNSIGNED_INT_IMAGE_BUFFER			= 0x9067
+	UNSIGNED_INT_IMAGE_1D_ARRAY			= 0x9068
+	UNSIGNED_INT_IMAGE_2D_ARRAY			= 0x9069
+	UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY		= 0x906A
+	UNSIGNED_INT_IMAGE_2D_MULTISAMPLE		= 0x906B
+	UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY		= 0x906C
+	MAX_IMAGE_SAMPLES				= 0x906D
+	IMAGE_BINDING_FORMAT				= 0x906E
 
 # Adds to mask bits for EXT_shader_image_load_store above
 NV_shader_buffer_store enum:
 ARB_texture_rgb10_a2ui enum:
 	RGB10_A2UI					= 0x906F
 
-# NV_future_use: 0x9070-0x90FF
+# NV_future_use: 0x9070-0x90B9
+
+EXT_framebuffer_multisample_blit_scaled enum:
+	SCALED_RESOLVE_FASTEST_EXT			= 0x90BA
+	SCALED_RESOLVE_NICEST_EXT			= 0x90BB
+
+ARB_map_buffer_alignment enum:
+	MIN_MAP_BUFFER_ALIGNMENT			= 0x90BC
+
+# NV_future_use: 0x90BD-0x90C6
+
+ARB_shader_image_load_store
+	IMAGE_FORMAT_COMPATIBILITY_TYPE			= 0x90C7
+	IMAGE_FORMAT_COMPATIBILITY_BY_SIZE		= 0x90C8
+	IMAGE_FORMAT_COMPATIBILITY_BY_CLASS		= 0x90C9
+	MAX_VERTEX_IMAGE_UNIFORMS			= 0x90CA
+	MAX_TESS_CONTROL_IMAGE_UNIFORMS			= 0x90CB
+	MAX_TESS_EVALUATION_IMAGE_UNIFORMS		= 0x90CC
+	MAX_GEOMETRY_IMAGE_UNIFORMS			= 0x90CD
+	MAX_FRAGMENT_IMAGE_UNIFORMS			= 0x90CE
+	MAX_COMBINED_IMAGE_UNIFORMS			= 0x90CF
+
+# NV_future_use: 0x90D0-0x90E0
+
+EXT_x11_sync_object enum:
+	SYNC_X11_FENCE_EXT				= 0x90E1
+
+# NV_future_use: 0x90E2-0x90FF
 
 ###############################################################################
 
 	CONTEXT_COMPATIBILITY_PROFILE_BIT		= 0x00000002
 	CONTEXT_PROFILE_MASK				= 0x9126
 
-# ARB_future_use: 0x9127-0x912F
+ARB_compressed_texture_pixel_storage enum:
+	UNPACK_COMPRESSED_BLOCK_WIDTH			= 0x9127
+	UNPACK_COMPRESSED_BLOCK_HEIGHT			= 0x9128
+	UNPACK_COMPRESSED_BLOCK_DEPTH			= 0x9129
+	UNPACK_COMPRESSED_BLOCK_SIZE			= 0x912A
+	PACK_COMPRESSED_BLOCK_WIDTH			= 0x912B
+	PACK_COMPRESSED_BLOCK_HEIGHT			= 0x912C
+	PACK_COMPRESSED_BLOCK_DEPTH			= 0x912D
+	PACK_COMPRESSED_BLOCK_SIZE			= 0x912E
+
+ARB_texture_storage enum:
+	TEXTURE_IMMUTABLE_FORMAT			= 0x912F
 
 ###############################################################################
 
 #	UNPACK_PREMULTIPLY_ALPHA_WEBGL			= 0x9241
 #	CONTEXT_LOST_WEBGL				= 0x9242
 
-# WebGL_future_use: 0x9243-0x924F
+# Khronos bug 6884
+
+#	UNPACK_COLORSPACE_CONVERSION_WEBGL		= 0x9243
+#	BROWSER_DEFAULT_WEBGL				= 0x9244
+
+# WebGL_future_use: 0x9245-0x924F
+
+###############################################################################
+
+# DMP: 0x9250-0x925F (email from Eisaku Ohbuchi)
+
+DMP_shader_binary enum: (OpenGL ES only)
+	SHADER_BINARY_DMP				= 0x9250
+
+# DMP_future_use: 0x9251-0x925F
+
+###############################################################################
+
+# Fujitsu: 0x9260-0x926F (Khronos bug 7486)
+
+# FJ_shader_binary enum: (OpenGL ES only)
+
+# FJ_future_use: 0x9260-0x926F
+
+###############################################################################
+
+# Khronos OpenGL ES: 0x9270-0x927F (Khronos Bug 7625)
+
+#	 COMPRESSED_R11_EAC_OES				 = 0x9270
+#	 COMPRESSED_SIGNED_R11_EAC_OES			 = 0x9271
+#	 COMPRESSED_RG11_EAC_OES			 = 0x9272
+#	 COMPRESSED_SIGNED_RG11_EAC_OES			 = 0x9273
+#	 COMPRESSED_RGB8_ETC2_OES			 = 0x9274
+#	 COMPRESSED_SRGB8_ETC2_OES			 = 0x9275
+#	 COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_OES	 = 0x9276
+#	 COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_OES	 = 0x9277
+#	 COMPRESSED_RGBA8_ETC2_EAC_OES			 = 0x9278
+#	 COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_OES		 = 0x9279
+
+# Khronos_future_use: 0x927A-0x927F
+
+###############################################################################
+
+# NVIDIA: 0x9280-0x937F (Khronos bug 7658)
+
+# NV_future_use: 0x9280-0x92BF
+
+ARB_shader_atomic_counters enum:
+	ATOMIC_COUNTER_BUFFER				 = 0x92C0
+	ATOMIC_COUNTER_BUFFER_BINDING			 = 0x92C1
+	ATOMIC_COUNTER_BUFFER_START			 = 0x92C2
+	ATOMIC_COUNTER_BUFFER_SIZE			 = 0x92C3
+	ATOMIC_COUNTER_BUFFER_DATA_SIZE			 = 0x92C4
+	ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS	 = 0x92C5
+	ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES	   = 0x92C6
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER	   = 0x92C7
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER    = 0x92C8
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x92C9
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER	   = 0x92CA
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER	   = 0x92CB
+	MAX_VERTEX_ATOMIC_COUNTER_BUFFERS		 = 0x92CC
+	MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS		 = 0x92CD
+	MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS	 = 0x92CE
+	MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS		 = 0x92CF
+	MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS		 = 0x92D0
+	MAX_COMBINED_ATOMIC_COUNTER_BUFFERS		 = 0x92D1
+	MAX_VERTEX_ATOMIC_COUNTERS			 = 0x92D2
+	MAX_TESS_CONTROL_ATOMIC_COUNTERS		 = 0x92D3
+	MAX_TESS_EVALUATION_ATOMIC_COUNTERS		 = 0x92D4
+	MAX_GEOMETRY_ATOMIC_COUNTERS			 = 0x92D5
+	MAX_FRAGMENT_ATOMIC_COUNTERS			 = 0x92D6
+	MAX_COMBINED_ATOMIC_COUNTERS			 = 0x92D7
+	MAX_ATOMIC_COUNTER_BUFFER_SIZE			 = 0x92D8
+	MAX_ATOMIC_COUNTER_BUFFER_BINDINGS		 = 0x92DC
+	ACTIVE_ATOMIC_COUNTER_BUFFERS			 = 0x92D9
+	UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX		 = 0x92DA
+	UNSIGNED_INT_ATOMIC_COUNTER			 = 0x92DB
+
+# NV_future_use: 0x92DC-0x937F
+
+###############################################################################
+
+# OpenGL ARB: 0x9380-0x939F
+
+ARB_internalformat_query enum:
+	NUM_SAMPLE_COUNTS				= 0x9380
+
+# ARB_future_use: 0x9381-0x939F
 
 ###############################################################################
 ### Please remember that new enumerant allocations must be obtained by request
 ### File requests in the Khronos Bugzilla, OpenGL project, Registry component.
 ###############################################################################
 
-# Any_vendor_future_use: 0x9250-0xFFFF
+# Any_vendor_future_use: 0x93A0-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

glspecs/enumext.spec

 # enumext.spec - list of GL enumerants for glext.h header
 #
-# $Revision: 12183 $ on $Date: 2010-08-06 02:53:05 -0700 (Fri, 06 Aug 2010) $
+# $Revision: 15267 $ on $Date: 2011-08-08 00:37:03 -0700 (Mon, 08 Aug 2011) $
 
 # This is derived from the master GL enumerant registry (enum.spec).
 #
 	use ARB_viewport_array		    VIEWPORT_INDEX_PROVOKING_VERTEX
 	use ARB_viewport_array		    UNDEFINED_VERTEX
 
+###############################################################################
+#
+# OpenGL 4.2 enums
+#
+###############################################################################
+
+VERSION_4_2 enum:
+passthru: /* Reuse tokens from ARB_base_instance (none) */
+passthru: /* Reuse tokens from ARB_shading_language_420pack (none) */
+passthru: /* Reuse tokens from ARB_transform_feedback_instanced (none) */
+passthru: /* Reuse tokens from ARB_compressed_texture_pixel_storage */
+	use ARB_compressed_texture_pixel_storage    UNPACK_COMPRESSED_BLOCK_WIDTH
+	use ARB_compressed_texture_pixel_storage    UNPACK_COMPRESSED_BLOCK_HEIGHT
+	use ARB_compressed_texture_pixel_storage    UNPACK_COMPRESSED_BLOCK_DEPTH
+	use ARB_compressed_texture_pixel_storage    UNPACK_COMPRESSED_BLOCK_SIZE
+	use ARB_compressed_texture_pixel_storage    PACK_COMPRESSED_BLOCK_WIDTH
+	use ARB_compressed_texture_pixel_storage    PACK_COMPRESSED_BLOCK_HEIGHT
+	use ARB_compressed_texture_pixel_storage    PACK_COMPRESSED_BLOCK_DEPTH
+	use ARB_compressed_texture_pixel_storage    PACK_COMPRESSED_BLOCK_SIZE
+passthru: /* Reuse tokens from ARB_conservative_depth (none) */
+passthru: /* Reuse tokens from ARB_internalformat_query */
+	use ARB_internalformat_query	    NUM_SAMPLE_COUNTS
+passthru: /* Reuse tokens from ARB_map_buffer_alignment */
+	use ARB_map_buffer_alignment	    MIN_MAP_BUFFER_ALIGNMENT
+passthru: /* Reuse tokens from ARB_shader_atomic_counters */
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_BINDING
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_START
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_SIZE
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_DATA_SIZE
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER
+	use ARB_shader_atomic_counters	    ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER
+	use ARB_shader_atomic_counters	    MAX_VERTEX_ATOMIC_COUNTER_BUFFERS
+	use ARB_shader_atomic_counters	    MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS
+	use ARB_shader_atomic_counters	    MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS
+	use ARB_shader_atomic_counters	    MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS
+	use ARB_shader_atomic_counters	    MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS
+	use ARB_shader_atomic_counters	    MAX_COMBINED_ATOMIC_COUNTER_BUFFERS
+	use ARB_shader_atomic_counters	    MAX_VERTEX_ATOMIC_COUNTERS
+	use ARB_shader_atomic_counters	    MAX_TESS_CONTROL_ATOMIC_COUNTERS
+	use ARB_shader_atomic_counters	    MAX_TESS_EVALUATION_ATOMIC_COUNTERS
+	use ARB_shader_atomic_counters	    MAX_GEOMETRY_ATOMIC_COUNTERS
+	use ARB_shader_atomic_counters	    MAX_FRAGMENT_ATOMIC_COUNTERS
+	use ARB_shader_atomic_counters	    MAX_COMBINED_ATOMIC_COUNTERS
+	use ARB_shader_atomic_counters	    MAX_ATOMIC_COUNTER_BUFFER_SIZE
+	use ARB_shader_atomic_counters	    MAX_ATOMIC_COUNTER_BUFFER_BINDINGS
+	use ARB_shader_atomic_counters	    ACTIVE_ATOMIC_COUNTER_BUFFERS
+	use ARB_shader_atomic_counters	    UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX
+	use ARB_shader_atomic_counters	    UNSIGNED_INT_ATOMIC_COUNTER
+passthru: /* Reuse tokens from ARB_shader_image_load_store */
+	use ARB_shader_image_load_store     VERTEX_ATTRIB_ARRAY_BARRIER_BIT
+	use ARB_shader_image_load_store     ELEMENT_ARRAY_BARRIER_BIT
+	use ARB_shader_image_load_store     UNIFORM_BARRIER_BIT
+	use ARB_shader_image_load_store     TEXTURE_FETCH_BARRIER_BIT
+	use ARB_shader_image_load_store     SHADER_IMAGE_ACCESS_BARRIER_BIT
+	use ARB_shader_image_load_store     COMMAND_BARRIER_BIT
+	use ARB_shader_image_load_store     PIXEL_BUFFER_BARRIER_BIT
+	use ARB_shader_image_load_store     TEXTURE_UPDATE_BARRIER_BIT
+	use ARB_shader_image_load_store     BUFFER_UPDATE_BARRIER_BIT
+	use ARB_shader_image_load_store     FRAMEBUFFER_BARRIER_BIT
+	use ARB_shader_image_load_store     TRANSFORM_FEEDBACK_BARRIER_BIT
+	use ARB_shader_image_load_store     ATOMIC_COUNTER_BARRIER_BIT
+	use ARB_shader_image_load_store     ALL_BARRIER_BITS
+	use ARB_shader_image_load_store     MAX_IMAGE_UNITS
+	use ARB_shader_image_load_store     MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS
+	use ARB_shader_image_load_store     IMAGE_BINDING_NAME
+	use ARB_shader_image_load_store     IMAGE_BINDING_LEVEL
+	use ARB_shader_image_load_store     IMAGE_BINDING_LAYERED
+	use ARB_shader_image_load_store     IMAGE_BINDING_LAYER
+	use ARB_shader_image_load_store     IMAGE_BINDING_ACCESS
+	use ARB_shader_image_load_store     IMAGE_1D
+	use ARB_shader_image_load_store     IMAGE_2D
+	use ARB_shader_image_load_store     IMAGE_3D
+	use ARB_shader_image_load_store     IMAGE_2D_RECT
+	use ARB_shader_image_load_store     IMAGE_CUBE
+	use ARB_shader_image_load_store     IMAGE_BUFFER
+	use ARB_shader_image_load_store     IMAGE_1D_ARRAY
+	use ARB_shader_image_load_store     IMAGE_2D_ARRAY
+	use ARB_shader_image_load_store     IMAGE_CUBE_MAP_ARRAY
+	use ARB_shader_image_load_store     IMAGE_2D_MULTISAMPLE
+	use ARB_shader_image_load_store     IMAGE_2D_MULTISAMPLE_ARRAY
+	use ARB_shader_image_load_store     INT_IMAGE_1D
+	use ARB_shader_image_load_store     INT_IMAGE_2D
+	use ARB_shader_image_load_store     INT_IMAGE_3D
+	use ARB_shader_image_load_store     INT_IMAGE_2D_RECT
+	use ARB_shader_image_load_store     INT_IMAGE_CUBE
+	use ARB_shader_image_load_store     INT_IMAGE_BUFFER
+	use ARB_shader_image_load_store     INT_IMAGE_1D_ARRAY
+	use ARB_shader_image_load_store     INT_IMAGE_2D_ARRAY
+	use ARB_shader_image_load_store     INT_IMAGE_CUBE_MAP_ARRAY
+	use ARB_shader_image_load_store     INT_IMAGE_2D_MULTISAMPLE
+	use ARB_shader_image_load_store     INT_IMAGE_2D_MULTISAMPLE_ARRAY
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_1D
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_2D
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_3D
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_2D_RECT
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_CUBE
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_BUFFER
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_1D_ARRAY
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_2D_ARRAY
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_2D_MULTISAMPLE
+	use ARB_shader_image_load_store     UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY
+	use ARB_shader_image_load_store     MAX_IMAGE_SAMPLES
+	use ARB_shader_image_load_store     IMAGE_BINDING_FORMAT
+	use ARB_shader_image_load_store     IMAGE_FORMAT_COMPATIBILITY_TYPE
+	use ARB_shader_image_load_store     IMAGE_FORMAT_COMPATIBILITY_BY_SIZE
+	use ARB_shader_image_load_store     IMAGE_FORMAT_COMPATIBILITY_BY_CLASS
+	use ARB_shader_image_load_store     MAX_VERTEX_IMAGE_UNIFORMS
+	use ARB_shader_image_load_store     MAX_TESS_CONTROL_IMAGE_UNIFORMS
+	use ARB_shader_image_load_store     MAX_TESS_EVALUATION_IMAGE_UNIFORMS
+	use ARB_shader_image_load_store     MAX_GEOMETRY_IMAGE_UNIFORMS
+	use ARB_shader_image_load_store     MAX_FRAGMENT_IMAGE_UNIFORMS
+	use ARB_shader_image_load_store     MAX_COMBINED_IMAGE_UNIFORMS
+passthru: /* Reuse tokens from ARB_shading_language_packing (none) */
+passthru: /* Reuse tokens from ARB_texture_storage */
+	use ARB_texture_storage		    TEXTURE_IMMUTABLE_FORMAT
+
 
 ###############################################################################
 #
 # ARB Extension #106
 ARB_shader_stencil_export enum:
 
+###############################################################################
+
+# No new tokens
+# ARB Extension #107
+ARB_base_instance enum:
+
+###############################################################################
+
+# No new tokens
+# ARB Extension #108
+ARB_shading_language_420pack enum:
+
+###############################################################################
+
+# No new tokens
+# ARB Extension #109
+ARB_transform_feedback_instanced enum:
+
+###############################################################################
+
+# ARB Extension #110
+ARB_compressed_texture_pixel_storage enum:
+	UNPACK_COMPRESSED_BLOCK_WIDTH			= 0x9127
+	UNPACK_COMPRESSED_BLOCK_HEIGHT			= 0x9128
+	UNPACK_COMPRESSED_BLOCK_DEPTH			= 0x9129
+	UNPACK_COMPRESSED_BLOCK_SIZE			= 0x912A
+	PACK_COMPRESSED_BLOCK_WIDTH			= 0x912B
+	PACK_COMPRESSED_BLOCK_HEIGHT			= 0x912C
+	PACK_COMPRESSED_BLOCK_DEPTH			= 0x912D
+	PACK_COMPRESSED_BLOCK_SIZE			= 0x912E
+
+###############################################################################
+
+# No new tokens
+# ARB Extension #111
+ARB_conservative_depth enum:
+
+###############################################################################
+
+# ARB Extension #112
+ARB_internalformat_query enum:
+	NUM_SAMPLE_COUNTS				= 0x9380
+
+###############################################################################
+
+# ARB Extension #113
+ARB_map_buffer_alignment enum:
+	MIN_MAP_BUFFER_ALIGNMENT			= 0x90BC
+
+###############################################################################
+
+# ARB Extension #114
+ARB_shader_atomic_counters enum:
+	ATOMIC_COUNTER_BUFFER				 = 0x92C0
+	ATOMIC_COUNTER_BUFFER_BINDING			 = 0x92C1
+	ATOMIC_COUNTER_BUFFER_START			 = 0x92C2
+	ATOMIC_COUNTER_BUFFER_SIZE			 = 0x92C3
+	ATOMIC_COUNTER_BUFFER_DATA_SIZE			 = 0x92C4
+	ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS	 = 0x92C5
+	ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES	   = 0x92C6
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER	   = 0x92C7
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER    = 0x92C8
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x92C9
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER	   = 0x92CA
+	ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER	   = 0x92CB
+	MAX_VERTEX_ATOMIC_COUNTER_BUFFERS		 = 0x92CC
+	MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS		 = 0x92CD
+	MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS	 = 0x92CE
+	MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS		 = 0x92CF
+	MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS		 = 0x92D0
+	MAX_COMBINED_ATOMIC_COUNTER_BUFFERS		 = 0x92D1
+	MAX_VERTEX_ATOMIC_COUNTERS			 = 0x92D2
+	MAX_TESS_CONTROL_ATOMIC_COUNTERS		 = 0x92D3
+	MAX_TESS_EVALUATION_ATOMIC_COUNTERS		 = 0x92D4
+	MAX_GEOMETRY_ATOMIC_COUNTERS			 = 0x92D5
+	MAX_FRAGMENT_ATOMIC_COUNTERS			 = 0x92D6
+	MAX_COMBINED_ATOMIC_COUNTERS			 = 0x92D7
+	MAX_ATOMIC_COUNTER_BUFFER_SIZE			 = 0x92D8
+	MAX_ATOMIC_COUNTER_BUFFER_BINDINGS		 = 0x92DC
+	ACTIVE_ATOMIC_COUNTER_BUFFERS			 = 0x92D9
+	UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX		 = 0x92DA
+	UNSIGNED_INT_ATOMIC_COUNTER			 = 0x92DB
+
+###############################################################################
+
+# ARB Extension #115
+ARB_shader_image_load_store enum:
+	VERTEX_ATTRIB_ARRAY_BARRIER_BIT			= 0x00000001
+	ELEMENT_ARRAY_BARRIER_BIT			= 0x00000002
+	UNIFORM_BARRIER_BIT				= 0x00000004
+	TEXTURE_FETCH_BARRIER_BIT			= 0x00000008
+	SHADER_IMAGE_ACCESS_BARRIER_BIT			= 0x00000020
+	COMMAND_BARRIER_BIT				= 0x00000040
+	PIXEL_BUFFER_BARRIER_BIT			= 0x00000080
+	TEXTURE_UPDATE_BARRIER_BIT			= 0x00000100
+	BUFFER_UPDATE_BARRIER_BIT			= 0x00000200
+	FRAMEBUFFER_BARRIER_BIT				= 0x00000400
+	TRANSFORM_FEEDBACK_BARRIER_BIT			= 0x00000800
+	ATOMIC_COUNTER_BARRIER_BIT			= 0x00001000
+	ALL_BARRIER_BITS				= 0xFFFFFFFF
+	MAX_IMAGE_UNITS					= 0x8F38
+	MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS	= 0x8F39
+	IMAGE_BINDING_NAME				= 0x8F3A
+	IMAGE_BINDING_LEVEL				= 0x8F3B
+	IMAGE_BINDING_LAYERED				= 0x8F3C
+	IMAGE_BINDING_LAYER				= 0x8F3D
+	IMAGE_BINDING_ACCESS				= 0x8F3E
+	IMAGE_1D					= 0x904C
+	IMAGE_2D					= 0x904D
+	IMAGE_3D					= 0x904E
+	IMAGE_2D_RECT					= 0x904F
+	IMAGE_CUBE					= 0x9050
+	IMAGE_BUFFER					= 0x9051
+	IMAGE_1D_ARRAY					= 0x9052
+	IMAGE_2D_ARRAY					= 0x9053
+	IMAGE_CUBE_MAP_ARRAY				= 0x9054
+	IMAGE_2D_MULTISAMPLE				= 0x9055
+	IMAGE_2D_MULTISAMPLE_ARRAY			= 0x9056
+	INT_IMAGE_1D					= 0x9057
+	INT_IMAGE_2D					= 0x9058
+	INT_IMAGE_3D					= 0x9059
+	INT_IMAGE_2D_RECT				= 0x905A
+	INT_IMAGE_CUBE					= 0x905B
+	INT_IMAGE_BUFFER				= 0x905C
+	INT_IMAGE_1D_ARRAY				= 0x905D
+	INT_IMAGE_2D_ARRAY				= 0x905E
+	INT_IMAGE_CUBE_MAP_ARRAY			= 0x905F
+	INT_IMAGE_2D_MULTISAMPLE			= 0x9060
+	INT_IMAGE_2D_MULTISAMPLE_ARRAY			= 0x9061
+	UNSIGNED_INT_IMAGE_1D				= 0x9062
+	UNSIGNED_INT_IMAGE_2D				= 0x9063
+	UNSIGNED_INT_IMAGE_3D				= 0x9064
+	UNSIGNED_INT_IMAGE_2D_RECT			= 0x9065
+	UNSIGNED_INT_IMAGE_CUBE				= 0x9066
+	UNSIGNED_INT_IMAGE_BUFFER			= 0x9067
+	UNSIGNED_INT_IMAGE_1D_ARRAY			= 0x9068
+	UNSIGNED_INT_IMAGE_2D_ARRAY			= 0x9069
+	UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY		= 0x906A
+	UNSIGNED_INT_IMAGE_2D_MULTISAMPLE		= 0x906B
+	UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY		= 0x906C
+	MAX_IMAGE_SAMPLES				= 0x906D
+	IMAGE_BINDING_FORMAT				= 0x906E
+	IMAGE_FORMAT_COMPATIBILITY_TYPE			= 0x90C7
+	IMAGE_FORMAT_COMPATIBILITY_BY_SIZE		= 0x90C8
+	IMAGE_FORMAT_COMPATIBILITY_BY_CLASS		= 0x90C9
+	MAX_VERTEX_IMAGE_UNIFORMS			= 0x90CA
+	MAX_TESS_CONTROL_IMAGE_UNIFORMS			= 0x90CB
+	MAX_TESS_EVALUATION_IMAGE_UNIFORMS		= 0x90CC
+	MAX_GEOMETRY_IMAGE_UNIFORMS			= 0x90CD
+	MAX_FRAGMENT_IMAGE_UNIFORMS			= 0x90CE
+	MAX_COMBINED_IMAGE_UNIFORMS			= 0x90CF
+
+###############################################################################
+
+# No new tokens
+# ARB Extension #116
+ARB_shading_language_packing enum:
+
+###############################################################################
+
+# ARB Extension #117
+ARB_texture_storage enum:
+	TEXTURE_IMMUTABLE_FORMAT			= 0x912F
+
 
 ###############################################################################
 #
 	MIN_FRAGMENT_INTERPOLATION_OFFSET_NV		= 0x8E5B
 	MAX_FRAGMENT_INTERPOLATION_OFFSET_NV		= 0x8E5C
 	FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV	= 0x8E5D
+	MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV		= 0x8E5E
+	MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV		= 0x8E5F
 	MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV		= 0x8F44    # Requires ARB_shader_subroutine
 	MAX_PROGRAM_SUBROUTINE_NUM_NV			= 0x8F45    # Requires ARB_shader_subroutine
 
 # Extension #399 - GLX_EXT_create_context_es2_profile
 # Extension #400 - WGL_EXT_create_context_es2_profile
 
+###############################################################################
+
+# Extension #401
+AMD_depth_clamp_separate enum:
+	DEPTH_CLAMP_NEAR_AMD				= 0x901E
+	DEPTH_CLAMP_FAR_AMD				= 0x901F
+
+###############################################################################
+
+# Extension #402
+EXT_texture_sRGB_decode enum:
+	TEXTURE_SRGB_DECODE_EXT				= 0x8A48
+	DECODE_EXT					= 0x8A49
+	SKIP_DECODE_EXT					= 0x8A4A
+
+###############################################################################
+
+# Extension #403
+NV_texture_multisample enum:
+	TEXTURE_COVERAGE_SAMPLES_NV			= 0x9045
+	TEXTURE_COLOR_SAMPLES_NV			= 0x9046
+
+###############################################################################
+
+# Extension #404
+AMD_blend_minmax_factor enum:
+	FACTOR_MIN_AMD					= 0x901C
+	FACTOR_MAX_AMD					= 0x901D
+
+###############################################################################
+
+# Extension #405
+AMD_sample_positions enum:
+	SUBSAMPLE_DISTANCE_AMD				= 0x883F
+
+###############################################################################
+
+# Extension #406
+EXT_x11_sync_object enum:
+	SYNC_X11_FENCE_EXT				= 0x90E1
+
+###############################################################################
+
+# Extension #407 - WGL_NV_DX_interop
+
+###############################################################################
+
+# No new tokens
+# Extension #408
+AMD_multi_draw_indirect enum:
+
+###############################################################################
+
+# Extension #409
+EXT_framebuffer_multisample_blit_scaled enum:
+	SCALED_RESOLVE_FASTEST_EXT			= 0x90BA
+	SCALED_RESOLVE_NICEST_EXT			= 0x90BB
 # This document is licensed under the SGI Free Software B License Version
 # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
 #
-# $Revision: 12194 $ on $Date: 2010-08-09 02:56:00 -0700 (Mon, 09 Aug 2010) $
+# $Revision: 15267 $ on $Date: 2011-08-08 00:37:03 -0700 (Mon, 08 Aug 2011) $
 
 required-props:
 # Description of a parameter
 # 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 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_1_DEPRECATED 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 ARB_shading_language_include ARB_blend_func_extended ARB_sampler_objects ARB_timer_query ARB_vertex_type_2_10_10_10_rev ARB_draw_indirect ARB_gpu_shader_fp64 ARB_shader_subroutine ARB_tessellation_shader ARB_transform_feedback2 ARB_transform_feedback3 AMD_conservative_depth NV_vdpau_interop ARB_ES2_compatibility ARB_get_program_binary ARB_separate_shader_objects ARB_vertex_attrib_64bit ARB_viewport_array ARB_cl_event ARB_debug_output ARB_robustness EXT_shader_image_load_store EXT_vertex_attrib_64bit NV_gpu_shader5 NV_vertex_attrib_integer_64bit AMD_name_gen_delete AMD_debug_output NV_vdpau_interop NV_gpu_program5
+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 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_1_DEPRECATED 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 ARB_shading_language_include ARB_blend_func_extended ARB_sampler_objects ARB_timer_query ARB_vertex_type_2_10_10_10_rev ARB_draw_indirect ARB_gpu_shader_fp64 ARB_shader_subroutine ARB_tessellation_shader ARB_transform_feedback2 ARB_transform_feedback3 AMD_conservative_depth NV_vdpau_interop ARB_ES2_compatibility ARB_get_program_binary ARB_separate_shader_objects ARB_vertex_attrib_64bit ARB_viewport_array ARB_cl_event ARB_debug_output ARB_robustness EXT_shader_image_load_store EXT_vertex_attrib_64bit NV_gpu_shader5 NV_vertex_attrib_integer_64bit AMD_name_gen_delete AMD_debug_output NV_vdpau_interop NV_gpu_program5 NV_texture_multisample AMD_sample_positions EXT_x11_sync_object AMD_multi_draw_indirect ARB_base_instance ARB_transform_feedback_instanced ARB_internalformat_query ARB_shader_atomic_counters ARB_shader_image_load_store ARB_texture_storage commands
 
 # Categories for extensions with no functions - need not be included now
 # ARB_texture_env_add ARB_texture_cube_map ARB_texture_border_clamp
 # 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
-# AMD_shader_stencil_export AMD_seamless_cubemap_per_texture
+# ARB_texture_gather ARB_texture_query_lod AMD_shader_stencil_export
+# AMD_seamless_cubemap_per_texture AMD_blend_minmax_factor
+# ARB_shading_language_420pack ARB_compressed_texture_pixel_storage
+# ARB_conservative_depth ARB_map_buffer_alignment
+# ARB_shading_language_packing
 
 # 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 3.3 4.0 4.1
+version:	1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2 3.3 4.0 4.1 4.2
 # Core version in which a function was removed
 deprecated:	3.1
 # GLX Single, Rendering, or Vendor Private opcode
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
-	deprecated	3.1
 	glxropcode	4114
 	offset		371
 
 ###############################################################################
 ###############################################################################
 
-# New commands in OpenGL 4.0 - none
+# New commands in OpenGL 4.0
 
 # OpenGL 4.0 (ARB_sample_shading) commands
 
 # New commands in OpenGL 4.1 - none
 newcategory: VERSION_4_1
 
-passthru: /* OpenGL 4.1 also reuses entry points from these extensions: */
+passthru: /* OpenGL 4.1 reuses entry points from these extensions: */
 passthru: /* ARB_ES2_compatibility */
 passthru: /* ARB_get_program_binary */
 passthru: /* ARB_separate_shader_objects */
 ###############################################################################
 ###############################################################################
 #
+# OpenGL 4.2 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 4.2 - none
+newcategory: VERSION_4_2
+
+passthru: /* OpenGL 4.2 reuses entry points from these extensions: */
+passthru: /* ARB_base_instance */
+passthru: /* ARB_shading_language_420pack (no entry points) */
+passthru: /* ARB_transform_feedback_instanced */
+passthru: /* ARB_compressed_texture_pixel_storage (no entry points) */
+passthru: /* ARB_conservative_depth (no entry points) */
+passthru: /* ARB_internalformat_query */
+passthru: /* ARB_map_buffer_alignment (no entry points) */
+passthru: /* ARB_shader_atomic_counters */
+passthru: /* ARB_shader_image_load_store */
+passthru: /* ARB_shading_language_packing (no entry points) */
+passthru: /* ARB_texture_storage */
+
+
+###############################################################################
+###############################################################################
+#
 # ARB extensions, in order by ARB extension number
 #
 ###############################################################################
 ###############################################################################
 
 # (none)
-newcategroy: ARB_shader_bit_encoding
+newcategory: ARB_shader_bit_encoding
 
 ###############################################################################
 #
 # (none)
 newcategory: ARB_shader_stencil_export
 
+###############################################################################
+#
+# ARB Extension #107
+# ARB_base_instance commands
+#
+###############################################################################
+
+DrawArraysInstancedBaseInstance(mode, first, count, primcount, baseinstance)
+	return		void
+	param		mode		GLenum in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		primcount	SizeI in value
+	param		baseinstance	UInt32 in value
+	category	ARB_base_instance
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsInstancedBaseInstance(mode, count, type, indices, primcount, baseinstance)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		GLenum in value
+	param		indices		void in array [count]
+	param		primcount	SizeI in value
+	param		baseinstance	UInt32 in value
+	category	ARB_base_instance
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, primcount, basevertex, baseinstance)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		GLenum in value
+	param		indices		void in array [count]
+	param		primcount	SizeI in value
+	param		basevertex	Int32 in value
+	param		baseinstance	UInt32 in value
+	category	ARB_base_instance
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #108
+# ARB_shading_language_420pack commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shading_language_420pack
+
+###############################################################################
+#
+# ARB Extension #109
+# ARB_transform_feedback_instanced commands
+#
+###############################################################################
+
+DrawTransformFeedbackInstanced(mode, id, primcount)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	param		primcount	SizeI in value
+	category	ARB_transform_feedback_instanced
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawTransformFeedbackStreamInstanced(mode, id, stream, primcount)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	param		stream		UInt32 in value
+	param		primcount	SizeI in value
+	category	ARB_transform_feedback_instanced
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #110
+# ARB_compressed_texture_pixel_storage commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_compressed_texture_pixel_storage
+
+###############################################################################
+#
+# ARB Extension #111
+# ARB_conservative_depth commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_conservative_depth
+
+###############################################################################
+#
+# ARB Extension #112
+# ARB_internalformat_query commands
+#
+###############################################################################
+
+GetInternalformativ(target, internalformat, pname, bufSize, params)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		params		Int32 out array [bufSize]
+	category	ARB_internalformat_query
+	dlflags		notlistable
+	version		4.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #113
+# ARB_map_buffer_alignment commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_map_buffer_alignment
+
+###############################################################################
+#
+# ARB Extension #114
+# ARB_shader_atomic_counters commands
+#
+###############################################################################
+
+GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		bufferIndex	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_shader_atomic_counters
+	dlflags		notlistable
+	version		4.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #115
+# ARB_shader_image_load_store commands
+#
+###############################################################################
+
+BindImageTexture(unit, texture, level, layered, layer, access, format)
+	return		void
+	param		unit		UInt32 in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		layered		Boolean in value
+	param		layer		Int32 in value
+	param		access		GLenum in value
+	param		format		GLenum in value
+	category	ARB_shader_image_load_store
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MemoryBarrier(barriers)
+	return		void
+	param		barriers	GLbitfield in value
+	category	ARB_shader_image_load_store
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #116
+# ARB_shading_language_packing commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shading_language_packing
+
+###############################################################################
+#
+# ARB Extension #117
+# ARB_texture_storage commands
+#
+###############################################################################
+
+TexStorage1D(target, levels, internalformat, width)
+	return		void
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexStorage2D(target, levels, internalformat, width, height)
+	return		void
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexStorage3D(target, levels, internalformat, width, height, depth)
+	return		void
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage1DEXT(texture, target, levels, internalformat, width)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage2DEXT(texture, target, levels, internalformat, width, height)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage3DEXT(texture, target, levels, internalformat, width, height, depth)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
 
 ###############################################################################
 ###############################################################################
 	return		void
 	param		target		VertexAttribEnumNV in value
 	param		index		UInt32 in value
-	param		count		UInt32 in value
+	param		count		SizeI in value
 	param		v		Float64 in array [count*4]
 	category	NV_vertex_program
 	version		1.2
 	glxropcode	4187
 	offset		598
 
-#??? 'count' was SizeI in the latest NVIDIA gl.spec, but UInt32 in the
-#??? extension specification in the registry.
 ProgramParameters4fvNV(target, index, count, v)
 	return		void
 	param		target		VertexAttribEnumNV in value
 	param		index		UInt32 in value
-	param		count		UInt32 in value
+	param		count		SizeI in value
 	param		v		Float32 in array [count*4]
 	category	NV_vertex_program
 	version		1.2
 ###############################################################################
 #
 # Extension #398 - GLX_AMD_gpu_association
-#
-###############################################################################
-
-
+# Extension #399 - GLX_EXT_create_context_es2_profile
+# Extension #400 - WGL_EXT_create_context_es2_profile
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #401
+# AMD_depth_clamp_separate commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_depth_clamp_separate
+
+###############################################################################
+#
+# Extension #402
+# EXT_texture_sRGB_decode commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_sRGB_decode
+
+###############################################################################
+#
+# Extension #403
+# NV_texture_multisample commands
+#
+###############################################################################
+
+TexImage2DMultisampleCoverageNV(target, coverageSamples, colorSamples, internalFormat, width, height, fixedSampleLocations)
+	return		void
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexImage3DMultisampleCoverageNV(target, coverageSamples, colorSamples, internalFormat, width, height, depth, fixedSampleLocations)
+	return		void
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	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	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage2DMultisampleNV(texture, target, samples, internalFormat, width, height, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	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	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage3DMultisampleNV(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	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	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage2DMultisampleCoverageNV(texture, target, coverageSamples, colorSamples, internalFormat, width, height, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage3DMultisampleCoverageNV(texture, target, coverageSamples, colorSamples, internalFormat, width, height, depth, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	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	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #404
+# AMD_blend_minmax_factor commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_blend_minmax_factor
+
+###############################################################################
+#
+# Extension #405
+# AMD_sample_positions commands
+#
+###############################################################################
+
+SetMultisamplefvAMD(pname, index, val)
+	return		void
+	param		pname		GLenum in value
+	param		index		UInt32 in value
+	param		val		Float32 in array [2]
+	category	AMD_sample_positions
+	glxflags	ignore
+	version		3.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #406
+# EXT_x11_sync_object commands
+#
+###############################################################################
+
+ImportSyncEXT(external_sync_type, external_sync, flags)
+	return		sync
+	param		external_sync_type  GLenum in value
+	param		external_sync	Intptr in value
+	param		flags		GLbitfield in value
+	category	EXT_x11_sync_object
+	glxflags	ignore
+	version		3.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #407 - WGL_NV_DX_interop
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #408
+# AMD_multi_draw_indirect commands
+#
+###############################################################################
+
+MultiDrawArraysIndirectAMD(mode, indirect, primcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		indirect	Void in array []
+	param		primcount	SizeI in value
+	param		stride		SizeI in value
+	category	AMD_multi_draw_indirect
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementsIndirectAMD(mode, type, indirect, primcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		type		GLenum in value
+	param		indirect	Void in array []
+	param		primcount	SizeI in value
+	param		stride		SizeI in value
+	category	AMD_multi_draw_indirect
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #409
+# EXT_framebuffer_multisample_blit_scaled commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_framebuffer_multisample_blit_scaled
+

glspecs/wglenum.spec

 # This document is licensed under the SGI Free Software B License Version
 # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
 #
-# $Revision: 12183 $ on $Date: 2010-08-06 02:53:05 -0700 (Fri, 06 Aug 2010) $
+# $Revision: 14504 $ on $Date: 2011-04-13 21:31:13 -0700 (Wed, 13 Apr 2011) $
 
 # This is the master WGL enumerant registry.
 #
 
 ###############################################################################
 
+# Not a bitfield but not from an assigned range, either
+WGL_NV_DX_interop enum:
+	WGL_ACCESS_READ_ONLY_NV				= 0x00000000
+	WGL_ACCESS_READ_WRITE_NV			= 0x00000001
+	WGL_ACCESS_WRITE_DISCARD_NV			= 0x00000002
+
 # Bitmasks - not consumed by the registry
 WGL_ARB_buffer_region enum:
 	WGL_FRONT_COLOR_BUFFER_BIT_ARB			= 0x00000001

glspecs/wglenumext.spec

 # This document is licensed under the SGI Free Software B License Version
 # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
 #
-# $Revision: 12183 $ on $Date: 2010-08-06 02:53:05 -0700 (Fri, 06 Aug 2010) $
+# $Revision: 14504 $ on $Date: 2011-04-13 21:31:13 -0700 (Wed, 13 Apr 2011) $
 
 # List of WGL enumerants for wglext.h header
 #
 
 passthru:
 passthru: /* Header file version number */
-passthru: /* wglext.h last updated 2010/08/06 */
+passthru: /* wglext.h last updated 2011/04/13 */
 passthru: /* Current version at http://www.opengl.org/registry/ */
-passthru: #define WGL_WGLEXT_VERSION 22
+passthru: #define WGL_WGLEXT_VERSION 23
 
 ###############################################################################
 #
 # All values are shared with GLX and GL
 WGL_EXT_create_context_es2_profile enum:
 	WGL_CONTEXT_ES2_PROFILE_BIT_EXT			= 0x00000004
+
+###############################################################################
+
+# Extension #407
+# Not a bitfield but not from an assigned range, either
+WGL_NV_DX_interop enum:
+	WGL_ACCESS_READ_ONLY_NV				= 0x00000000
+	WGL_ACCESS_READ_WRITE_NV			= 0x00000001
+	WGL_ACCESS_WRITE_DISCARD_NV			= 0x00000002
+

glspecs/wglext.spec

 # This document is licensed under the SGI Free Software B License Version
 # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
 #
-# $Revision: 12183 $ on $Date: 2010-08-06 02:53:05 -0700 (Fri, 06 Aug 2010) $
+# $Revision: 14504 $ on $Date: 2011-04-13 21:31:13 -0700 (Wed, 13 Apr 2011) $
 
 required-props:
 param:		retval retained
-category:	wgl ARB_buffer_region ARB_extensions_string ARB_pixel_format ARB_make_current_read ARB_pbuffer ARB_render_texture ARB_pixel_format_float EXT_display_color_table EXT_extensions_string EXT_make_current_read EXT_pbuffer EXT_pixel_format EXT_swap_control OML_sync_control I3D_digital_video_control I3D_gamma I3D_genlock I3D_image_buffer I3D_swap_frame_lock I3D_swap_frame_usage NV_vertex_array_range 3DL_stereo_control NV_swap_group NV_video_output NV_present_video ARB_create_context NV_gpu_affinity AMD_gpu_association NV_video_capture NV_copy_image ARB_framebuffer_sRGB
+category:	wgl ARB_buffer_region ARB_extensions_string ARB_pixel_format ARB_make_current_read ARB_pbuffer ARB_render_texture ARB_pixel_format_float EXT_display_color_table EXT_extensions_string EXT_make_current_read EXT_pbuffer EXT_pixel_format EXT_swap_control OML_sync_control I3D_digital_video_control I3D_gamma I3D_genlock I3D_image_buffer I3D_swap_frame_lock I3D_swap_frame_usage NV_vertex_array_range 3DL_stereo_control NV_swap_group NV_video_output NV_present_video ARB_create_context NV_gpu_affinity AMD_gpu_association NV_video_capture NV_copy_image ARB_framebuffer_sRGB NV_DX_interop
 # required-props in wgl.spec (which is not used for anything):
 # dlflags:	  notlistable handcode
 # wglflags:	  client-handcode server-handcode non-dispatch
 
 # (none)
 newcategory: NV_multisample_coverage
+
+###############################################################################
+#
+# Extension #407
+# NV_DX_interop commands
+#
+###############################################################################
+
+DXSetResourceShareHandleNV(dxObject, shareHandle)
+	return		BOOL
+	param		dxObject	void out array [1]
+	param		shareHandle	HANDLE in value
+	category	NV_DX_interop
+
+DXOpenDeviceNV(dxDevice)
+	return		HANDLE
+	param		dxDevice	void out array [1]
+	category	NV_DX_interop
+
+DXCloseDeviceNV(hDevice)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	category	NV_DX_interop
+
+DXRegisterObjectNV(hDevice, dxObject, name, type, access)
+	return		HANDLE
+	param		hDevice		HANDLE in value
+	param		dxObject	void out array [1]
+	param		name		GLuint in value
+	param		type		GLenum in value
+	param		access		GLenum in value
+	category	NV_DX_interop
+
+DXUnregisterObjectNV(hDevice, hObject)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	param		hObject		HANDLE in value
+	category	NV_DX_interop
+
+DXObjectAccessNV(hObject, access)
+	return		BOOL
+	param		hObject		HANDLE in value
+	param		access		GLenum in value
+	category	NV_DX_interop
+
+DXLockObjectsNV(hDevice, count, hObjects)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	param		count		GLint in value
+	param		hObjects	HANDLE out array [count]
+	category	NV_DX_interop
+
+DXUnlockObjectsNV(hDevice, count, hObjects)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	param		count		GLint in value
+	param		hObjects	HANDLE out array [count]
+	category	NV_DX_interop
+