Revert "opengl: Update registry and headers from Khronos"

This reverts commit f466a51c1325d2034326e25dd61c359ed2c566af.

Change-Id: I2fe400e2dab8327695c36dc8eed101654368cd4b
diff --git a/opengl/tools/glgen2/registry/gl.xml b/opengl/tools/glgen2/registry/gl.xml
index ab5a422..6d63b4d 100755
--- a/opengl/tools/glgen2/registry/gl.xml
+++ b/opengl/tools/glgen2/registry/gl.xml
@@ -1726,11 +1726,9 @@
             <enum name="GL_LINE_STRIP_ADJACENCY_ARB"/>
             <enum name="GL_LINE_STRIP_ADJACENCY_EXT"/>
             <enum name="GL_PATCHES"/>
-            <enum name="GL_PATCHES_EXT"/>
             <enum name="GL_POINTS"/>
             <enum name="GL_POLYGON"/>
             <enum name="GL_QUADS"/>
-            <enum name="GL_QUADS_EXT"/>
             <enum name="GL_QUAD_STRIP"/>
             <enum name="GL_TRIANGLES"/>
             <enum name="GL_TRIANGLES_ADJACENCY"/>
@@ -1992,11 +1990,8 @@
             <enum name="GL_FRAGMENT_SHADER_BIT"/>
             <enum name="GL_FRAGMENT_SHADER_BIT_EXT"/>
             <enum name="GL_GEOMETRY_SHADER_BIT"/>
-            <enum name="GL_GEOMETRY_SHADER_BIT_EXT"/>
             <enum name="GL_TESS_CONTROL_SHADER_BIT"/>
-            <enum name="GL_TESS_CONTROL_SHADER_BIT_EXT"/>
             <enum name="GL_TESS_EVALUATION_SHADER_BIT"/>
-            <enum name="GL_TESS_EVALUATION_SHADER_BIT_EXT"/>
             <enum name="GL_COMPUTE_SHADER_BIT"/>
             <enum name="GL_ALL_SHADER_BITS"/>
             <enum name="GL_ALL_SHADER_BITS_EXT"/>
@@ -2137,11 +2132,8 @@
         <enum value="0x00000002" name="GL_FRAGMENT_SHADER_BIT"/>
         <enum value="0x00000002" name="GL_FRAGMENT_SHADER_BIT_EXT"/>
         <enum value="0x00000004" name="GL_GEOMETRY_SHADER_BIT"/>
-        <enum value="0x00000004" name="GL_GEOMETRY_SHADER_BIT_EXT"/>                             
         <enum value="0x00000008" name="GL_TESS_CONTROL_SHADER_BIT"/>
-        <enum value="0x00000008" name="GL_TESS_CONTROL_SHADER_BIT_EXT"/>
         <enum value="0x00000010" name="GL_TESS_EVALUATION_SHADER_BIT"/>
-        <enum value="0x00000010" name="GL_TESS_EVALUATION_SHADER_BIT_EXT"/>
         <enum value="0x00000020" name="GL_COMPUTE_SHADER_BIT"/>
         <enum value="0xFFFFFFFF" name="GL_ALL_SHADER_BITS"/>
         <enum value="0xFFFFFFFF" name="GL_ALL_SHADER_BITS_EXT"/>
@@ -2372,7 +2364,6 @@
         <enum value="0x0005" name="GL_TRIANGLE_STRIP"/>
         <enum value="0x0006" name="GL_TRIANGLE_FAN"/>
         <enum value="0x0007" name="GL_QUADS"/>
-        <enum value="0x0007" name="GL_QUADS_EXT"/>                                           
         <enum value="0x0008" name="GL_QUAD_STRIP"/>
         <enum value="0x0009" name="GL_POLYGON"/>
         <enum value="0x000A" name="GL_LINES_ADJACENCY"/>
@@ -2388,7 +2379,6 @@
         <enum value="0x000D" name="GL_TRIANGLE_STRIP_ADJACENCY_ARB"/>
         <enum value="0x000D" name="GL_TRIANGLE_STRIP_ADJACENCY_EXT"/>
         <enum value="0x000E" name="GL_PATCHES"/>
-        <enum value="0x000E" name="GL_PATCHES_EXT"/>                                         
             <unused start="0x000F" end="0x00FF" comment="Unused for PrimitiveType"/>
         <enum value="0x0100" name="GL_ACCUM"/>
         <enum value="0x0101" name="GL_LOAD"/>
@@ -2735,7 +2725,6 @@
         <enum value="0x1003" name="GL_TEXTURE_INTERNAL_FORMAT"/>
         <enum value="0x1003" name="GL_TEXTURE_COMPONENTS"/>
         <enum value="0x1004" name="GL_TEXTURE_BORDER_COLOR"/>
-        <enum value="0x1004" name="GL_TEXTURE_BORDER_COLOR_EXT"/>
         <enum value="0x1004" name="GL_TEXTURE_BORDER_COLOR_NV"/>
         <enum value="0x1005" name="GL_TEXTURE_BORDER"/>
             <unused start="0x1006" end="0x10FF" comment="Unused for GetTextureParameter"/>
@@ -3470,7 +3459,6 @@
         <enum value="0x812C" name="GL_MAX_FOG_FUNC_POINTS_SGIS"/>
         <enum value="0x812D" name="GL_CLAMP_TO_BORDER"/>
         <enum value="0x812D" name="GL_CLAMP_TO_BORDER_ARB"/>
-        <enum value="0x812D" name="GL_CLAMP_TO_BORDER_EXT"/>
         <enum value="0x812D" name="GL_CLAMP_TO_BORDER_NV"/>
         <enum value="0x812D" name="GL_CLAMP_TO_BORDER_SGIS"/>
         <enum value="0x812E" name="GL_TEXTURE_MULTI_BUFFER_HINT_SGIX"/>
@@ -3855,10 +3843,8 @@
         <enum value="0x825C" name="GL_VIEWPORT_SUBPIXEL_BITS"/>
         <enum value="0x825D" name="GL_VIEWPORT_BOUNDS_RANGE"/>
         <enum value="0x825E" name="GL_LAYER_PROVOKING_VERTEX"/>
-        <enum value="0x825E" name="GL_LAYER_PROVOKING_VERTEX_EXT"/>
         <enum value="0x825F" name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX"/>
         <enum value="0x8260" name="GL_UNDEFINED_VERTEX"/>
-        <enum value="0x8260" name="GL_UNDEFINED_VERTEX_EXT"/>                                
         <enum value="0x8261" name="GL_NO_RESET_NOTIFICATION_ARB"/>
         <enum value="0x8261" name="GL_NO_RESET_NOTIFICATION_EXT"/>
         <enum value="0x8262" name="GL_MAX_COMPUTE_SHARED_MEMORY_SIZE"/>
@@ -3992,13 +3978,9 @@
         <enum value="0x82D9" name="GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
         <enum value="0x82DA" name="GL_MAX_VERTEX_ATTRIB_BINDINGS"/>
         <enum value="0x82DB" name="GL_TEXTURE_VIEW_MIN_LEVEL"/>
-        <enum value="0x82DB" name="GL_TEXTURE_VIEW_MIN_LEVEL_EXT"/>                          
         <enum value="0x82DC" name="GL_TEXTURE_VIEW_NUM_LEVELS"/>
-        <enum value="0x82DC" name="GL_TEXTURE_VIEW_NUM_LEVELS_EXT"/>                         
         <enum value="0x82DD" name="GL_TEXTURE_VIEW_MIN_LAYER"/>
-        <enum value="0x82DD" name="GL_TEXTURE_VIEW_MIN_LAYER_EXT"/>                          
         <enum value="0x82DE" name="GL_TEXTURE_VIEW_NUM_LAYERS"/>
-        <enum value="0x82DE" name="GL_TEXTURE_VIEW_NUM_LAYERS_EXT"/>                         
         <enum value="0x82DF" name="GL_TEXTURE_IMMUTABLE_LEVELS"/>
         <enum value="0x82E0" name="GL_BUFFER"/>
         <enum value="0x82E0" name="GL_BUFFER_KHR"/>
@@ -5610,9 +5592,7 @@
         <enum value="0x886A" name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB"/>
             <unused start="0x886B"/>
         <enum value="0x886C" name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS"/>
-        <enum value="0x886C" name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_EXT"/>               
         <enum value="0x886D" name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS"/>
-        <enum value="0x886D" name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_EXT"/>            
         <enum value="0x886E" name="GL_DEPTH_STENCIL_TO_RGBA_NV"/>
         <enum value="0x886F" name="GL_DEPTH_STENCIL_TO_BGRA_NV"/>
         <enum value="0x8870" name="GL_FRAGMENT_PROGRAM_NV"/>
@@ -5636,7 +5616,6 @@
         <enum value="0x887D" name="GL_READ_PIXEL_DATA_RANGE_POINTER_NV"/>
             <unused start="0x887E"/>
         <enum value="0x887F" name="GL_GEOMETRY_SHADER_INVOCATIONS"/>
-        <enum value="0x887F" name="GL_GEOMETRY_SHADER_INVOCATIONS_EXT"/>                     
         <enum value="0x8880" name="GL_FLOAT_R_NV"/>
         <enum value="0x8881" name="GL_FLOAT_RG_NV"/>
         <enum value="0x8882" name="GL_FLOAT_RGB_NV"/>
@@ -5837,11 +5816,8 @@
         <enum value="0x8914" name="GL_SAMPLES_PASSED_ARB"/>
             <unused start="0x8915"/>
         <enum value="0x8916" name="GL_GEOMETRY_VERTICES_OUT"/>
-        <enum value="0x8916" name="GL_GEOMETRY_LINKED_VERTICES_OUT_EXT"/>                           
         <enum value="0x8917" name="GL_GEOMETRY_INPUT_TYPE"/>
-        <enum value="0x8917" name="GL_GEOMETRY_LINKED_INPUT_TYPE_EXT"/>                             
         <enum value="0x8918" name="GL_GEOMETRY_OUTPUT_TYPE"/>
-        <enum value="0x8918" name="GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT"/>                            
         <enum value="0x8919" name="GL_SAMPLER_BINDING"/>
         <enum value="0x891A" name="GL_CLAMP_VERTEX_COLOR"/>
         <enum value="0x891A" name="GL_CLAMP_VERTEX_COLOR_ARB"/>
@@ -6012,14 +5988,12 @@
         <enum value="0x8A2A" name="GL_UNIFORM_BUFFER_SIZE"/>
         <enum value="0x8A2B" name="GL_MAX_VERTEX_UNIFORM_BLOCKS"/>
         <enum value="0x8A2C" name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS"/>
-        <enum value="0x8A2C" name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT"/>                     
         <enum value="0x8A2D" name="GL_MAX_FRAGMENT_UNIFORM_BLOCKS"/>
         <enum value="0x8A2E" name="GL_MAX_COMBINED_UNIFORM_BLOCKS"/>
         <enum value="0x8A2F" name="GL_MAX_UNIFORM_BUFFER_BINDINGS"/>
         <enum value="0x8A30" name="GL_MAX_UNIFORM_BLOCK_SIZE"/>
         <enum value="0x8A31" name="GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS"/>
         <enum value="0x8A32" name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS"/>
-        <enum value="0x8A32" name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT"/>
         <enum value="0x8A33" name="GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS"/>
         <enum value="0x8A34" name="GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT"/>
         <enum value="0x8A35" name="GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH"/>
@@ -6301,7 +6275,6 @@
         <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_ARB"/>
         <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_EXT"/>
         <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_BINDING" comment="Equivalent to GL_TEXTURE_BUFFER_ARB query, but named more consistently"/>
-        <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_BINDING_EXT"/>                          
         <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE"/>
         <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE_ARB"/>
         <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE_EXT"/>
@@ -6900,9 +6873,7 @@
         <enum value="0x8E16" name="GL_QUERY_BY_REGION_NO_WAIT_NV"/>
             <unused start="0x8E17" end="0x8E1D"/>
         <enum value="0x8E1E" name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS"/>
-        <enum value="0x8E1E" name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_EXT"/>    
         <enum value="0x8E1F" name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
-        <enum value="0x8E1F" name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT"/> 
         <enum value="0x8E20" name="GL_COLOR_SAMPLES_NV"/>
             <unused start="0x8E21"/>
         <enum value="0x8E22" name="GL_TRANSFORM_FEEDBACK"/>
@@ -6967,7 +6938,6 @@
         <enum value="0x8E59" name="GL_MAX_SAMPLE_MASK_WORDS_NV"/>
         <enum value="0x8E5A" name="GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV"/>
         <enum value="0x8E5A" name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS"/>
-        <enum value="0x8E5A" name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT"/>                 
         <enum value="0x8E5B" name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET"/>
         <enum value="0x8E5B" name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_OES"/>
         <enum value="0x8E5B" name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV"/>
@@ -6987,56 +6957,30 @@
         <enum value="0x8E70" name="GL_MAX_TRANSFORM_FEEDBACK_BUFFERS"/>
         <enum value="0x8E71" name="GL_MAX_VERTEX_STREAMS"/>
         <enum value="0x8E72" name="GL_PATCH_VERTICES"/>
-        <enum value="0x8E72" name="GL_PATCH_VERTICES_EXT"/>
         <enum value="0x8E73" name="GL_PATCH_DEFAULT_INNER_LEVEL"/>
-        <enum value="0x8E73" name="GL_PATCH_DEFAULT_INNER_LEVEL_EXT"/>
         <enum value="0x8E74" name="GL_PATCH_DEFAULT_OUTER_LEVEL"/>
-        <enum value="0x8E74" name="GL_PATCH_DEFAULT_OUTER_LEVEL_EXT"/>
         <enum value="0x8E75" name="GL_TESS_CONTROL_OUTPUT_VERTICES"/>
-        <enum value="0x8E75" name="GL_TESS_CONTROL_OUTPUT_VERTICES_EXT"/>
         <enum value="0x8E76" name="GL_TESS_GEN_MODE"/>
-        <enum value="0x8E76" name="GL_TESS_GEN_MODE_EXT"/>
         <enum value="0x8E77" name="GL_TESS_GEN_SPACING"/>
-        <enum value="0x8E77" name="GL_TESS_GEN_SPACING_EXT"/>
         <enum value="0x8E78" name="GL_TESS_GEN_VERTEX_ORDER"/>
-        <enum value="0x8E78" name="GL_TESS_GEN_VERTEX_ORDER_EXT"/>
         <enum value="0x8E79" name="GL_TESS_GEN_POINT_MODE"/>
-        <enum value="0x8E79" name="GL_TESS_GEN_POINT_MODE_EXT"/>
         <enum value="0x8E7A" name="GL_ISOLINES"/>
-        <enum value="0x8E7A" name="GL_ISOLINES_EXT"/>
         <enum value="0x8E7B" name="GL_FRACTIONAL_ODD"/>
-        <enum value="0x8E7B" name="GL_FRACTIONAL_ODD_EXT"/>
         <enum value="0x8E7C" name="GL_FRACTIONAL_EVEN"/>
-        <enum value="0x8E7C" name="GL_FRACTIONAL_EVEN_EXT"/>
         <enum value="0x8E7D" name="GL_MAX_PATCH_VERTICES"/>
-        <enum value="0x8E7D" name="GL_MAX_PATCH_VERTICES_EXT"/>
         <enum value="0x8E7E" name="GL_MAX_TESS_GEN_LEVEL"/>
-        <enum value="0x8E7E" name="GL_MAX_TESS_GEN_LEVEL_EXT"/>
         <enum value="0x8E7F" name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS"/>
-        <enum value="0x8E7F" name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_EXT"/>
         <enum value="0x8E80" name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
-        <enum value="0x8E80" name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT"/>
         <enum value="0x8E81" name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS"/>
-        <enum value="0x8E81" name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_EXT"/>
         <enum value="0x8E82" name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS"/>
-        <enum value="0x8E82" name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_EXT"/>
         <enum value="0x8E83" name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS"/>
-        <enum value="0x8E83" name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_EXT"/>
         <enum value="0x8E84" name="GL_MAX_TESS_PATCH_COMPONENTS"/>
-        <enum value="0x8E84" name="GL_MAX_TESS_PATCH_COMPONENTS_EXT"/>
         <enum value="0x8E85" name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS"/>
-        <enum value="0x8E85" name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_EXT"/>
         <enum value="0x8E86" name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS"/>
-        <enum value="0x8E86" name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_EXT"/>
         <enum value="0x8E87" name="GL_TESS_EVALUATION_SHADER"/>
-        <enum value="0x8E87" name="GL_TESS_EVALUATION_SHADER_EXT"/>
         <enum value="0x8E88" name="GL_TESS_CONTROL_SHADER"/>
-        <enum value="0x8E88" name="GL_TESS_CONTROL_SHADER_EXT"/>
         <enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS"/>
-        <enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_EXT"/>
         <enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS"/>
-        <enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_EXT"/>
-            <unused start="0x8E8B"/>
         <enum value="0x8E8C" name="GL_COMPRESSED_RGBA_BPTC_UNORM"/>
         <enum value="0x8E8C" name="GL_COMPRESSED_RGBA_BPTC_UNORM_ARB"/>
         <enum value="0x8E8D" name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/>
@@ -7241,24 +7185,18 @@
             <unused start="0x9008"/>
         <enum value="0x9009" name="GL_TEXTURE_CUBE_MAP_ARRAY"/>
         <enum value="0x9009" name="GL_TEXTURE_CUBE_MAP_ARRAY_ARB"/>
-        <enum value="0x9009" name="GL_TEXTURE_CUBE_MAP_ARRAY_EXT"/>
         <enum value="0x900A" name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY"/>
         <enum value="0x900A" name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB"/>
-        <enum value="0x900A" name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_EXT"/>
         <enum value="0x900B" name="GL_PROXY_TEXTURE_CUBE_MAP_ARRAY"/>
         <enum value="0x900B" name="GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB"/>
         <enum value="0x900C" name="GL_SAMPLER_CUBE_MAP_ARRAY"/>
         <enum value="0x900C" name="GL_SAMPLER_CUBE_MAP_ARRAY_ARB"/>
-        <enum value="0x900C" name="GL_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
         <enum value="0x900D" name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW"/>
         <enum value="0x900D" name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB"/>
-        <enum value="0x900D" name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_EXT"/>
         <enum value="0x900E" name="GL_INT_SAMPLER_CUBE_MAP_ARRAY"/>
         <enum value="0x900E" name="GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB"/>
-        <enum value="0x900E" name="GL_INT_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
         <enum value="0x900F" name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY"/>
         <enum value="0x900F" name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB"/>
-        <enum value="0x900F" name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
         <enum value="0x9010" name="GL_ALPHA_SNORM"/>
         <enum value="0x9011" name="GL_LUMINANCE_SNORM"/>
         <enum value="0x9012" name="GL_LUMINANCE_ALPHA_SNORM"/>
@@ -7472,11 +7410,8 @@
         <enum value="0x90C9" name="GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS"/>
         <enum value="0x90CA" name="GL_MAX_VERTEX_IMAGE_UNIFORMS"/>
         <enum value="0x90CB" name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS"/>
-        <enum value="0x90CB" name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_EXT"/>
         <enum value="0x90CC" name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS"/>
-        <enum value="0x90CC" name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_EXT"/>
         <enum value="0x90CD" name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS"/>
-        <enum value="0x90CD" name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT"/>
         <enum value="0x90CE" name="GL_MAX_FRAGMENT_IMAGE_UNIFORMS"/>
         <enum value="0x90CF" name="GL_MAX_COMBINED_IMAGE_UNIFORMS"/>
         <enum value="0x90D0" name="GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV"/>
@@ -7487,11 +7422,8 @@
         <enum value="0x90D5" name="GL_SHADER_STORAGE_BUFFER_SIZE"/>
         <enum value="0x90D6" name="GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS"/>
         <enum value="0x90D7" name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS"/>
-        <enum value="0x90D7" name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT"/>
         <enum value="0x90D8" name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS"/>
-        <enum value="0x90D8" name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_EXT"/>
         <enum value="0x90D9" name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS"/>
-        <enum value="0x90D9" name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_EXT"/>
         <enum value="0x90DA" name="GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS"/>
         <enum value="0x90DB" name="GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS"/>
         <enum value="0x90DC" name="GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS"/>
@@ -7572,9 +7504,7 @@
         <enum value="0x9121" name="GL_BUFFER_MAP_OFFSET"/>
         <enum value="0x9122" name="GL_MAX_VERTEX_OUTPUT_COMPONENTS"/>
         <enum value="0x9123" name="GL_MAX_GEOMETRY_INPUT_COMPONENTS"/>
-        <enum value="0x9123" name="GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT"/>
         <enum value="0x9124" name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS"/>
-        <enum value="0x9124" name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT"/>
         <enum value="0x9125" name="GL_MAX_FRAGMENT_INPUT_COMPONENTS"/>
         <enum value="0x9126" name="GL_CONTEXT_PROFILE_MASK"/>
         <enum value="0x9127" name="GL_UNPACK_COMPRESSED_BLOCK_WIDTH"/>
@@ -7668,11 +7598,8 @@
         <enum value="0x919B" name="GL_MIN_SPARSE_LEVEL_AMD"/>
         <enum value="0x919C" name="GL_MIN_LOD_WARNING_AMD"/>
         <enum value="0x919D" name="GL_TEXTURE_BUFFER_OFFSET"/>
-        <enum value="0x919D" name="GL_TEXTURE_BUFFER_OFFSET_EXT"/>
         <enum value="0x919E" name="GL_TEXTURE_BUFFER_SIZE"/>
-        <enum value="0x919E" name="GL_TEXTURE_BUFFER_SIZE_EXT"/>
         <enum value="0x919F" name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT"/>
-        <enum value="0x919F" name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_EXT"/>
         <enum value="0x91A0" name="GL_STREAM_RASTERIZATION_AMD"/>
             <unused start="0x91A1" end="0x91A3"/>
         <enum value="0x91A4" name="GL_VERTEX_ELEMENT_SWIZZLE_AMD"/>
@@ -7819,20 +7746,14 @@
         <enum value="0x92CB" name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER"/>
         <enum value="0x92CC" name="GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS"/>
         <enum value="0x92CD" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS"/>
-        <enum value="0x92CD" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_EXT"/>
         <enum value="0x92CE" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS"/>
-        <enum value="0x92CE" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_EXT"/>
         <enum value="0x92CF" name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS"/>
-        <enum value="0x92CF" name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT"/>
         <enum value="0x92D0" name="GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS"/>
         <enum value="0x92D1" name="GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS"/>
         <enum value="0x92D2" name="GL_MAX_VERTEX_ATOMIC_COUNTERS"/>
         <enum value="0x92D3" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS"/>
-        <enum value="0x92D3" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_EXT"/>
         <enum value="0x92D4" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS"/>
-        <enum value="0x92D4" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_EXT"/>
         <enum value="0x92D5" name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS"/>
-        <enum value="0x92D5" name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT"/>
         <enum value="0x92D6" name="GL_MAX_FRAGMENT_ATOMIC_COUNTERS"/>
         <enum value="0x92D7" name="GL_MAX_COMBINED_ATOMIC_COUNTERS"/>
         <enum value="0x92D8" name="GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE"/>
@@ -7850,7 +7771,6 @@
         <enum value="0x92E5" name="GL_BUFFER_VARIABLE"/>
         <enum value="0x92E6" name="GL_SHADER_STORAGE_BLOCK"/>
         <enum value="0x92E7" name="GL_IS_PER_PATCH"/>
-        <enum value="0x92E7" name="GL_IS_PER_PATCH_EXT"/>
         <enum value="0x92E8" name="GL_VERTEX_SUBROUTINE"/>
         <enum value="0x92E9" name="GL_TESS_CONTROL_SUBROUTINE"/>
         <enum value="0x92EA" name="GL_TESS_EVALUATION_SUBROUTINE"/>
@@ -7883,11 +7803,8 @@
         <enum value="0x9305" name="GL_ACTIVE_VARIABLES"/>
         <enum value="0x9306" name="GL_REFERENCED_BY_VERTEX_SHADER"/>
         <enum value="0x9307" name="GL_REFERENCED_BY_TESS_CONTROL_SHADER"/>
-        <enum value="0x9307" name="GL_REFERENCED_BY_TESS_CONTROL_SHADER_EXT"/>
         <enum value="0x9308" name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
-        <enum value="0x9308" name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER_EXT"/>
         <enum value="0x9309" name="GL_REFERENCED_BY_GEOMETRY_SHADER"/>
-        <enum value="0x9309" name="GL_REFERENCED_BY_GEOMETRY_SHADER_EXT"/>
         <enum value="0x930A" name="GL_REFERENCED_BY_FRAGMENT_SHADER"/>
         <enum value="0x930B" name="GL_REFERENCED_BY_COMPUTE_SHADER"/>
         <enum value="0x930C" name="GL_TOP_LEVEL_ARRAY_SIZE"/>
@@ -7897,13 +7814,11 @@
         <enum value="0x9310" name="GL_FRAMEBUFFER_DEFAULT_WIDTH"/>
         <enum value="0x9311" name="GL_FRAMEBUFFER_DEFAULT_HEIGHT"/>
         <enum value="0x9312" name="GL_FRAMEBUFFER_DEFAULT_LAYERS"/>
-        <enum value="0x9312" name="GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT"/>
         <enum value="0x9313" name="GL_FRAMEBUFFER_DEFAULT_SAMPLES"/>
         <enum value="0x9314" name="GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS"/>
         <enum value="0x9315" name="GL_MAX_FRAMEBUFFER_WIDTH"/>
         <enum value="0x9316" name="GL_MAX_FRAMEBUFFER_HEIGHT"/>
         <enum value="0x9317" name="GL_MAX_FRAMEBUFFER_LAYERS"/>
-        <enum value="0x9317" name="GL_MAX_FRAMEBUFFER_LAYERS_EXT"/>
         <enum value="0x9318" name="GL_MAX_FRAMEBUFFER_SAMPLES"/>
             <unused start="0x9319" end="0x9338"/>
         <enum value="0x9339" name="GL_WARP_SIZE_NV"/>
@@ -7993,9 +7908,7 @@
     </enums>
 
     <enums namespace="GL" start="0x93F0" end="0x94EF" vendor="APPLE" comment="Khronos bug 10233">
-        <enum value="0x93F0" name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV2_IMG"/>
-        <enum value="0x93F1" name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV2_IMG"/>
-            <unused start="0x93F2" end="0x94EF"/>
+            <unused start="0x93F0" end="0x94EF"/>
     </enums>
 
     <enums namespace="GL" start="0x94F0" end="0x950F" vendor="INTEL" comment="Khronos bug 11345">
@@ -8018,10 +7931,6 @@
             <unused start="0x9501" end="0x950F"/>
     </enums>
 
-    <enums namespace="GL" start="0x9510" end="0x952F" vendor="Broadcom" comment="Khronos bug 12203">
-            <unused start="0x9510" end="0x952F"/>
-    </enums>
-
 <!-- Enums reservable for future use. To reserve a new range, allocate one
      or more multiples of 16 starting at the lowest available point in this
      block and note it in a new <enums> block immediately above.
@@ -8031,8 +7940,8 @@
      file) File requests in the Khronos Bugzilla, OpenGL project, Registry
      component. -->
 
-    <enums namespace="GL" start="0x9530" end="99999" vendor="ARB" comment="RESERVED FOR FUTURE ALLOCATIONS BY KHRONOS">
-        <unused start="0x9530" end="99999"/>
+    <enums namespace="GL" start="0x9510" end="99999" vendor="ARB" comment="RESERVED FOR FUTURE ALLOCATIONS BY KHRONOS">
+        <unused start="0x9510" end="99999"/>
     </enums>
 
 <!-- Historical large block allocations, all unused except (in older days) by IBM -->
@@ -8837,24 +8746,11 @@
             <alias name="glBlendEquationSeparatei"/>
         </command>
         <command>
-            <proto>void <name>glBlendEquationSeparateiEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>buf</name></param>
-            <param><ptype>GLenum</ptype> <name>modeRGB</name></param>
-            <param><ptype>GLenum</ptype> <name>modeAlpha</name></param>
-            <alias name="glBlendEquationSeparatei"/>
-        </command>
-        <command>
             <proto>void <name>glBlendEquationi</name></proto>
             <param><ptype>GLuint</ptype> <name>buf</name></param>
             <param><ptype>GLenum</ptype> <name>mode</name></param>
         </command>
         <command>
-            <proto>void <name>glBlendEquationiEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>buf</name></param>
-            <param><ptype>GLenum</ptype> <name>mode</name></param>
-            <alias name="glBlendEquationi"/>
-        </command>
-        <command>
             <proto>void <name>glBlendEquationiARB</name></proto>
             <param><ptype>GLuint</ptype> <name>buf</name></param>
             <param><ptype>GLenum</ptype> <name>mode</name></param>
@@ -8933,15 +8829,6 @@
             <alias name="glBlendFuncSeparatei"/>
         </command>
         <command>
-            <proto>void <name>glBlendFuncSeparateiEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>buf</name></param>
-            <param><ptype>GLenum</ptype> <name>srcRGB</name></param>
-            <param><ptype>GLenum</ptype> <name>dstRGB</name></param>
-            <param><ptype>GLenum</ptype> <name>srcAlpha</name></param>
-            <param><ptype>GLenum</ptype> <name>dstAlpha</name></param>
-            <alias name="glBlendFuncSeparatei"/>
-        </command>
-        <command>
             <proto>void <name>glBlendFunci</name></proto>
             <param><ptype>GLuint</ptype> <name>buf</name></param>
             <param><ptype>GLenum</ptype> <name>src</name></param>
@@ -8955,13 +8842,6 @@
             <alias name="glBlendFunci"/>
         </command>
         <command>
-            <proto>void <name>glBlendFunciEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>buf</name></param>
-            <param><ptype>GLenum</ptype> <name>src</name></param>
-            <param><ptype>GLenum</ptype> <name>dst</name></param>
-            <alias name="glBlendFunci"/>
-        </command>
-        <command>
             <proto>void <name>glBlendParameteriNV</name></proto>
             <param><ptype>GLenum</ptype> <name>pname</name></param>
             <param><ptype>GLint</ptype> <name>value</name></param>
@@ -9749,15 +9629,6 @@
             <param group="Boolean"><ptype>GLboolean</ptype> <name>a</name></param>
         </command>
         <command>
-            <proto>void <name>glColorMaskiEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>index</name></param>
-            <param group="Boolean"><ptype>GLboolean</ptype> <name>r</name></param>
-            <param group="Boolean"><ptype>GLboolean</ptype> <name>g</name></param>
-            <param group="Boolean"><ptype>GLboolean</ptype> <name>b</name></param>
-            <param group="Boolean"><ptype>GLboolean</ptype> <name>a</name></param>
-            <alias name="glColorMaski"/>
-        </command>
-        <command>
             <proto>void <name>glColorMaterial</name></proto>
             <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
             <param group="ColorMaterialParameter"><ptype>GLenum</ptype> <name>mode</name></param>
@@ -10536,25 +10407,6 @@
             <param><ptype>GLsizei</ptype> <name>srcDepth</name></param>
         </command>
         <command>
-            <proto>void <name>glCopyImageSubDataEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>srcName</name></param>
-            <param><ptype>GLenum</ptype> <name>srcTarget</name></param>
-            <param><ptype>GLint</ptype> <name>srcLevel</name></param>
-            <param><ptype>GLint</ptype> <name>srcX</name></param>
-            <param><ptype>GLint</ptype> <name>srcY</name></param>
-            <param><ptype>GLint</ptype> <name>srcZ</name></param>
-            <param><ptype>GLuint</ptype> <name>dstName</name></param>
-            <param><ptype>GLenum</ptype> <name>dstTarget</name></param>
-            <param><ptype>GLint</ptype> <name>dstLevel</name></param>
-            <param><ptype>GLint</ptype> <name>dstX</name></param>
-            <param><ptype>GLint</ptype> <name>dstY</name></param>
-            <param><ptype>GLint</ptype> <name>dstZ</name></param>
-            <param><ptype>GLsizei</ptype> <name>srcWidth</name></param>
-            <param><ptype>GLsizei</ptype> <name>srcHeight</name></param>
-            <param><ptype>GLsizei</ptype> <name>srcDepth</name></param>
-            <alias name="glCopyImageSubData"/>
-        </command>
-        <command>
             <proto>void <name>glCopyImageSubDataNV</name></proto>
             <param><ptype>GLuint</ptype> <name>srcName</name></param>
             <param><ptype>GLenum</ptype> <name>srcTarget</name></param>
@@ -11452,12 +11304,6 @@
             <param><ptype>GLuint</ptype> <name>index</name></param>
         </command>
         <command>
-            <proto>void <name>glDisableiEXT</name></proto>
-            <param><ptype>GLenum</ptype> <name>target</name></param>
-            <param><ptype>GLuint</ptype> <name>index</name></param>
-            <alias name="glDisablei"/>
-        </command>
-        <command>
             <proto>void <name>glDiscardFramebufferEXT</name></proto>
             <param><ptype>GLenum</ptype> <name>target</name></param>
             <param><ptype>GLsizei</ptype> <name>numAttachments</name></param>
@@ -11961,12 +11807,6 @@
             <param><ptype>GLuint</ptype> <name>index</name></param>
         </command>
         <command>
-            <proto>void <name>glEnableiEXT</name></proto>
-            <param><ptype>GLenum</ptype> <name>target</name></param>
-            <param><ptype>GLuint</ptype> <name>index</name></param>
-            <alias name="glEnablei"/>
-        </command>
-        <command>
             <proto>void <name>glEnd</name></proto>
             <glx type="render" opcode="23"/>
         </command>
@@ -14985,26 +14825,12 @@
             <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
         </command>
         <command>
-            <proto>void <name>glGetSamplerParameterIivEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>sampler</name></param>
-            <param><ptype>GLenum</ptype> <name>pname</name></param>
-            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
-            <alias name="glGetSamplerParameterIiv"/>
-        </command>
-        <command>
             <proto>void <name>glGetSamplerParameterIuiv</name></proto>
             <param><ptype>GLuint</ptype> <name>sampler</name></param>
             <param><ptype>GLenum</ptype> <name>pname</name></param>
             <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
         </command>
         <command>
-            <proto>void <name>glGetSamplerParameterIuivEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>sampler</name></param>
-            <param><ptype>GLenum</ptype> <name>pname</name></param>
-            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
-            <alias name="glGetSamplerParameterIuiv"/>
-        </command>
-        <command>
             <proto>void <name>glGetSamplerParameterfv</name></proto>
             <param><ptype>GLuint</ptype> <name>sampler</name></param>
             <param><ptype>GLenum</ptype> <name>pname</name></param>
@@ -16231,12 +16057,6 @@
             <param><ptype>GLuint</ptype> <name>index</name></param>
         </command>
         <command>
-            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsEnablediEXT</name></proto>
-            <param><ptype>GLenum</ptype> <name>target</name></param>
-            <param><ptype>GLuint</ptype> <name>index</name></param>
-            <alias name="glIsEnabledi"/>
-        </command>
-        <command>
             <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsFenceAPPLE</name></proto>
             <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
         </command>
@@ -18852,12 +18672,6 @@
             <param><ptype>GLint</ptype> <name>value</name></param>
         </command>
         <command>
-            <proto>void <name>glPatchParameteriEXT</name></proto>
-            <param><ptype>GLenum</ptype> <name>pname</name></param>
-            <param><ptype>GLint</ptype> <name>value</name></param>
-            <alias name="glPatchParameteri"/>
-        </command>
-        <command>
             <proto>void <name>glPathColorGenNV</name></proto>
             <param group="PathColor"><ptype>GLenum</ptype> <name>color</name></param>
             <param group="PathGenMode"><ptype>GLenum</ptype> <name>genMode</name></param>
@@ -21439,26 +21253,12 @@
             <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>param</name></param>
         </command>
         <command>
-            <proto>void <name>glSamplerParameterIivEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>sampler</name></param>
-            <param><ptype>GLenum</ptype> <name>pname</name></param>
-            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>param</name></param>
-            <alias name="glSamplerParameterIiv"/>
-        </command>
-        <command>
             <proto>void <name>glSamplerParameterIuiv</name></proto>
             <param><ptype>GLuint</ptype> <name>sampler</name></param>
             <param><ptype>GLenum</ptype> <name>pname</name></param>
             <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>param</name></param>
         </command>
         <command>
-            <proto>void <name>glSamplerParameterIuivEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>sampler</name></param>
-            <param><ptype>GLenum</ptype> <name>pname</name></param>
-            <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>param</name></param>
-            <alias name="glSamplerParameterIuiv"/>
-        </command>
-        <command>
             <proto>void <name>glSamplerParameterf</name></proto>
             <param><ptype>GLuint</ptype> <name>sampler</name></param>
             <param><ptype>GLenum</ptype> <name>pname</name></param>
@@ -22205,15 +22005,6 @@
             <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
         </command>
         <command>
-            <proto>void <name>glTexBufferRangeEXT</name></proto>
-            <param><ptype>GLenum</ptype> <name>target</name></param>
-            <param><ptype>GLenum</ptype> <name>internalformat</name></param>
-            <param><ptype>GLuint</ptype> <name>buffer</name></param>
-            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
-            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
-            <alias name="glTexBufferRange"/>
-        </command>
-        <command>
             <proto>void <name>glTexBumpParameterfvATI</name></proto>
             <param group="TexBumpParameterATI"><ptype>GLenum</ptype> <name>pname</name></param>
             <param len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>param</name></param>
@@ -23602,18 +23393,6 @@
             <param><ptype>GLuint</ptype> <name>numlayers</name></param>
         </command>
         <command>
-            <proto>void <name>glTextureViewEXT</name></proto>
-            <param><ptype>GLuint</ptype> <name>texture</name></param>
-            <param><ptype>GLenum</ptype> <name>target</name></param>
-            <param><ptype>GLuint</ptype> <name>origtexture</name></param>
-            <param><ptype>GLenum</ptype> <name>internalformat</name></param>
-            <param><ptype>GLuint</ptype> <name>minlevel</name></param>
-            <param><ptype>GLuint</ptype> <name>numlevels</name></param>
-            <param><ptype>GLuint</ptype> <name>minlayer</name></param>
-            <param><ptype>GLuint</ptype> <name>numlayers</name></param>
-            <alias name="glTextureView"/>
-        </command>
-        <command>
             <proto>void <name>glTrackMatrixNV</name></proto>
             <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
             <param><ptype>GLuint</ptype> <name>address</name></param>
@@ -33106,7 +32885,10 @@
                 <command name="glTessellationModeAMD"/>
             </require>
         </extension>
-        <extension name="GL_AMD_vertex_shader_viewport_index" supported="gl"/>
+        <extension name="GL_AMD_vertex_shader_viewport_index" supported="gl">
+            <require>
+            </require>
+        </extension>
         <extension name="GL_ANGLE_depth_texture" supported="gles2">
             <require>
                 <enum name="GL_DEPTH_COMPONENT"/>
@@ -33317,7 +33099,10 @@
                 <command name="glGetSyncivAPPLE"/>
             </require>
         </extension>
-        <extension name="GL_APPLE_texture_2D_limited_npot" supported="gles1"/>
+        <extension name="GL_APPLE_texture_2D_limited_npot" supported="gles1">
+            <require>
+            </require>
+        </extension>
         <extension name="GL_APPLE_texture_format_BGRA8888" supported="gles1|gles2">
             <require>
                 <enum name="GL_BGRA_EXT"/>
@@ -34945,7 +34730,10 @@
                 <command name="glGetProgramStageiv"/>
             </require>
         </extension>
-        <extension name="GL_ARB_shader_texture_lod" supported="gl"/>
+        <extension name="GL_ARB_shader_texture_lod" supported="gl">
+            <require>
+            </require>
+        </extension>
         <extension name="GL_ARB_shading_language_100" supported="gl">
             <require>
                 <enum name="GL_SHADING_LANGUAGE_VERSION_ARB"/>
@@ -36476,11 +36264,6 @@
                 <command name="glBinormalPointerEXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_copy_image" supported="gles2">
-            <require>
-                <command name="glCopyImageSubDataEXT"/>
-            </require>
-        </extension>
         <extension name="GL_EXT_copy_texture" supported="gl">
             <require>
                 <command name="glCopyTexImage1DEXT"/>
@@ -36962,46 +36745,6 @@
                 <command name="glIsEnabledIndexedEXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_draw_buffers_indexed" supported="gles2">
-            <require>
-                <enum name="GL_BLEND_EQUATION_RGB"/>
-                <enum name="GL_BLEND_EQUATION_ALPHA"/>
-                <enum name="GL_BLEND_SRC_RGB"/>
-                <enum name="GL_BLEND_SRC_ALPHA"/>
-                <enum name="GL_BLEND_DST_RGB"/>
-                <enum name="GL_BLEND_DST_ALPHA"/>
-                <enum name="GL_COLOR_WRITEMASK"/>
-                <enum name="GL_BLEND"/>
-                <enum name="GL_FUNC_ADD"/>
-                <enum name="GL_FUNC_SUBTRACT"/>
-                <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
-                <enum name="GL_MIN"/>
-                <enum name="GL_MAX"/>
-                <enum name="GL_ZERO"/>
-                <enum name="GL_ONE"/>
-                <enum name="GL_SRC_COLOR"/>
-                <enum name="GL_ONE_MINUS_SRC_COLOR"/>
-                <enum name="GL_DST_COLOR"/>
-                <enum name="GL_ONE_MINUS_DST_COLOR"/>
-                <enum name="GL_SRC_ALPHA"/>
-                <enum name="GL_ONE_MINUS_SRC_ALPHA"/>
-                <enum name="GL_DST_ALPHA"/>
-                <enum name="GL_ONE_MINUS_DST_ALPHA"/>
-                <enum name="GL_CONSTANT_COLOR"/>
-                <enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
-                <enum name="GL_CONSTANT_ALPHA"/>
-                <enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
-                <enum name="GL_SRC_ALPHA_SATURATE"/>
-                <command name="glEnableiEXT"/>
-                <command name="glDisableiEXT"/>
-                <command name="glBlendEquationiEXT"/>
-                <command name="glBlendEquationSeparateiEXT"/>
-                <command name="glBlendFunciEXT"/>
-                <command name="glBlendFuncSeparateiEXT"/>
-                <command name="glColorMaskiEXT"/>
-                <command name="glIsEnablediEXT"/>
-            </require>
-        </extension>
         <extension name="GL_EXT_draw_instanced" supported="gl|gles2">
             <require>
                 <command name="glDrawArraysInstancedEXT"/>
@@ -37133,44 +36876,6 @@
                 <enum name="GL_FRAMEBUFFER_SRGB_CAPABLE_EXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_geometry_shader" supported="gles2">
-            <require>
-                <enum name="GL_GEOMETRY_SHADER_EXT"/>
-                <enum name="GL_GEOMETRY_SHADER_BIT_EXT"/>
-                <enum name="GL_GEOMETRY_LINKED_VERTICES_OUT_EXT"/>
-                <enum name="GL_GEOMETRY_LINKED_INPUT_TYPE_EXT"/>
-                <enum name="GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT"/>
-                <enum name="GL_GEOMETRY_SHADER_INVOCATIONS_EXT"/>
-                <enum name="GL_LAYER_PROVOKING_VERTEX_EXT"/>
-                <enum name="GL_LINES_ADJACENCY_EXT"/>
-                <enum name="GL_LINE_STRIP_ADJACENCY_EXT"/>
-                <enum name="GL_TRIANGLES_ADJACENCY_EXT"/>
-                <enum name="GL_TRIANGLE_STRIP_ADJACENCY_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT"/>
-                <enum name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT"/>
-                <enum name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT"/>
-                <enum name="GL_FIRST_VERTEX_CONVENTION_EXT"/>
-                <enum name="GL_LAST_VERTEX_CONVENTION_EXT"/>
-                <enum name="GL_UNDEFINED_VERTEX_EXT"/>
-                <enum name="GL_PRIMITIVES_GENERATED_EXT"/>
-                <enum name="GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT"/>
-                <enum name="GL_MAX_FRAMEBUFFER_LAYERS_EXT"/>
-                <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT"/>
-                <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT"/>
-                <enum name="GL_REFERENCED_BY_GEOMETRY_SHADER_EXT"/>
-                <command name="glFramebufferTextureEXT"/>
-            </require>
-        </extension>
         <extension name="GL_EXT_geometry_shader4" supported="gl">
             <require>
                 <enum name="GL_GEOMETRY_SHADER_EXT"/>
@@ -37245,9 +36950,6 @@
                 <command name="glUniform4uivEXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_gpu_shader5" supported="gles2">
-            <require/>
-        </extension>
         <extension name="GL_EXT_histogram" supported="gl">
             <require>
                 <enum name="GL_HISTOGRAM_EXT"/>
@@ -37304,7 +37006,10 @@
                 <command name="glIndexMaterialEXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_index_texture" supported="gl"/>
+        <extension name="GL_EXT_index_texture" supported="gl">
+            <require>
+            </require>
+        </extension>
         <extension name="GL_EXT_instanced_arrays" supported="gles2">
             <require>
                 <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT"/>
@@ -37342,7 +37047,10 @@
                 <command name="glFlushMappedBufferRangeEXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_misc_attribute" supported="gl"/>
+        <extension name="GL_EXT_misc_attribute" supported="gl">
+            <require>
+            </require>
+        </extension>
         <extension name="GL_EXT_multi_draw_arrays" supported="gl|gles1|gles2">
             <require>
                 <command name="glMultiDrawArraysEXT"/>
@@ -37476,7 +37184,10 @@
                 <command name="glGetPixelTransformParameterfvEXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_pixel_transform_color_table" supported="gl"/>
+        <extension name="GL_EXT_pixel_transform_color_table" supported="gl">
+            <require>
+            </require>
+        </extension>
         <extension name="GL_EXT_point_parameters" supported="gl">
             <require>
                 <enum name="GL_POINT_SIZE_MIN_EXT"/>
@@ -37510,8 +37221,6 @@
                 <enum name="GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"/>
                 <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"/>
                 <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"/>
-                <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV2_IMG"/>
-                <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV2_IMG"/>
             </require>
         </extension>
         <extension name="GL_EXT_read_format_bgra" supported="gles1|gles2">
@@ -37719,9 +37428,7 @@
                 <command name="glMemoryBarrierEXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_shader_implicit_conversions" supported="gles2"/>
         <extension name="GL_EXT_shader_integer_mix" supported="gl|gles2"/>
-        <extension name="GL_EXT_shader_io_blocks" supported="gles2"/>
         <extension name="GL_EXT_shader_pixel_local_storage" supported="gles2">
             <require>
                 <enum name="GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE_EXT"/>
@@ -37770,58 +37477,6 @@
                 <command name="glTexSubImage2DEXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_tessellation_shader" supported="gles2">
-            <require>
-                <enum name="GL_PATCHES_EXT"/>
-                <enum name="GL_PATCH_VERTICES_EXT"/>
-                <enum name="GL_TESS_CONTROL_OUTPUT_VERTICES_EXT"/>
-                <enum name="GL_TESS_GEN_MODE_EXT"/>
-                <enum name="GL_TESS_GEN_SPACING_EXT"/>
-                <enum name="GL_TESS_GEN_VERTEX_ORDER_EXT"/>
-                <enum name="GL_TESS_GEN_POINT_MODE_EXT"/>
-                <enum name="GL_TRIANGLES"/>                         
-                <enum name="GL_ISOLINES_EXT"/>
-                <enum name="GL_QUADS_EXT"/>
-                <enum name="GL_EQUAL"/>
-                <enum name="GL_FRACTIONAL_ODD_EXT"/>
-                <enum name="GL_FRACTIONAL_EVEN_EXT"/>
-                <enum name="GL_CCW"/>
-                <enum name="GL_CW"/>
-                <enum name="GL_MAX_PATCH_VERTICES_EXT"/>
-                <enum name="GL_MAX_TESS_GEN_LEVEL_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_EXT"/>
-                <enum name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_TESS_PATCH_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_EXT"/>
-                <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_EXT"/>
-                <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_EXT"/>
-                <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_EXT"/>
-                <enum name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_EXT"/>
-                <enum name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_EXT"/>
-                <enum name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_EXT"/>
-                <enum name="GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED"/>
-                <enum name="GL_IS_PER_PATCH_EXT"/>
-                <enum name="GL_REFERENCED_BY_TESS_CONTROL_SHADER_EXT"/>
-                <enum name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER_EXT"/>
-                <enum name="GL_TESS_CONTROL_SHADER_EXT"/>
-                <enum name="GL_TESS_EVALUATION_SHADER_EXT"/>
-                <enum name="GL_TESS_CONTROL_SHADER_BIT_EXT"/>
-                <enum name="GL_TESS_EVALUATION_SHADER_BIT_EXT"/>
-                <command name="glPatchParameteriEXT"/>
-            </require>
-        </extension>
         <extension name="GL_EXT_texture" supported="gl">
             <require>
                 <enum name="GL_ALPHA4_EXT"/>
@@ -37897,40 +37552,6 @@
                 <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_texture_border_clamp" supported="gles2">
-            <require>
-                <enum name="GL_TEXTURE_BORDER_COLOR_EXT"/>
-                <enum name="GL_CLAMP_TO_BORDER_EXT"/>
-                <command name="glTexParameterIivEXT"/>
-                <command name="glTexParameterIuivEXT"/>
-                <command name="glGetTexParameterIivEXT"/>
-                <command name="glGetTexParameterIuivEXT"/>
-                <command name="glSamplerParameterIivEXT"/>
-                <command name="glSamplerParameterIuivEXT"/>
-                <command name="glGetSamplerParameterIivEXT"/>
-                <command name="glGetSamplerParameterIuivEXT"/>
-            </require>
-        </extension>
-        <extension name="GL_EXT_texture_buffer" supported="gles2">
-            <require>
-                <enum name="GL_TEXTURE_BUFFER_EXT"/>
-                <enum name="GL_TEXTURE_BUFFER_BINDING_EXT"/>
-                <enum name="GL_MAX_TEXTURE_BUFFER_SIZE_EXT"/>
-                <enum name="GL_TEXTURE_BINDING_BUFFER_EXT"/>
-                <enum name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT"/>
-                <enum name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_EXT"/>
-                <enum name="GL_SAMPLER_BUFFER_EXT"/>
-                <enum name="GL_INT_SAMPLER_BUFFER_EXT"/>
-                <enum name="GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT"/>
-                <enum name="GL_IMAGE_BUFFER_EXT"/>
-                <enum name="GL_INT_IMAGE_BUFFER_EXT"/>
-                <enum name="GL_UNSIGNED_INT_IMAGE_BUFFER_EXT"/>
-                <enum name="GL_TEXTURE_BUFFER_OFFSET_EXT"/>
-                <enum name="GL_TEXTURE_BUFFER_SIZE_EXT"/>
-                <command name="glTexBufferEXT"/>
-                <command name="glTexBufferRangeEXT"/>
-            </require>
-        </extension>
         <extension name="GL_EXT_texture_buffer_object" supported="gl">
             <require>
                 <enum name="GL_TEXTURE_BUFFER_EXT"/>
@@ -37987,20 +37608,10 @@
                 <enum name="GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_texture_cube_map_array" supported="gles2">
+        <extension name="GL_EXT_texture_env_add" supported="gl">
             <require>
-                <enum name="GL_TEXTURE_CUBE_MAP_ARRAY_EXT"/>
-                <enum name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_EXT"/>
-                <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
-                <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_EXT"/>
-                <enum name="GL_INT_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
-                <enum name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
-                <enum name="GL_IMAGE_CUBE_MAP_ARRAY_EXT"/>
-                <enum name="GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT"/>
-                <enum name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_texture_env_add" supported="gl"/>
         <extension name="GL_EXT_texture_env_combine" supported="gl">
             <require>
                 <enum name="GL_COMBINE_EXT"/>
@@ -38256,16 +37867,6 @@
                 <enum name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT"/>
             </require>
         </extension>
-        <extension name="GL_EXT_texture_view" supported="gles2">
-            <require>
-                <enum name="GL_TEXTURE_VIEW_MIN_LEVEL_EXT"/>
-                <enum name="GL_TEXTURE_VIEW_NUM_LEVELS_EXT"/>
-                <enum name="GL_TEXTURE_VIEW_MIN_LAYER_EXT"/>
-                <enum name="GL_TEXTURE_VIEW_NUM_LAYERS_EXT"/>
-                <enum name="GL_TEXTURE_IMMUTABLE_LEVELS"/>
-                <command name="glTextureViewEXT"/>
-            </require>
-        </extension>
         <extension name="GL_EXT_timer_query" supported="gl">
             <require>
                 <enum name="GL_TIME_ELAPSED_EXT"/>
@@ -39502,7 +39103,10 @@
                 <command name="glFramebufferTextureFaceEXT"/>
             </require>
         </extension>
-        <extension name="GL_NV_geometry_shader4" supported="gl"/>
+        <extension name="GL_NV_geometry_shader4" supported="gl">
+            <require>
+            </require>
+        </extension>
         <extension name="GL_NV_gpu_program4" supported="gl">
             <require>
                 <enum name="GL_MIN_PROGRAM_TEXEL_OFFSET_NV"/>
@@ -40183,7 +39787,10 @@
                 <command name="glTextureImage3DMultisampleCoverageNV"/>
             </require>
         </extension>
-        <extension name="GL_NV_texture_npot_2D_mipmap" supported="gles2"/>
+        <extension name="GL_NV_texture_npot_2D_mipmap" supported="gles2">
+            <require>
+            </require>
+        </extension>
         <extension name="GL_NV_texture_rectangle" supported="gl">
             <require>
                 <enum name="GL_TEXTURE_RECTANGLE_NV"/>
@@ -41111,8 +40718,12 @@
                 <enum name="GL_MIN_SAMPLE_SHADING_VALUE_OES"/>                              
             </require>
         </extension>
-        <extension name="GL_OES_sample_variables" supported="gles2"/>
-        <extension name="GL_OES_shader_image_atomic" supported="gles2"/>
+        <extension name="GL_OES_sample_variables" supported="gles2">
+            <require/>
+        </extension>
+        <extension name="GL_OES_shader_image_atomic" supported="gles2">
+            <require/>
+        </extension>
         <extension name="GL_OES_shader_multisample_interpolation" supported="gles2">
             <require>
                 <enum name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_OES"/>