Import registry from SVN 26622

3 files changed, 536 insertions, 419 deletions

diff --git a/registry/egl.xml b/registry/egl.xml
index dd0e505..6f6ebc3 100644
--- a/registry/egl.xml
+++ b/registry/egl.xml
@@ -264,7 +264,8 @@
     </enums>
 
     <enums namespace="EGL" start="0x3070-0x307F" vendor="NOK" comment="Reserved for Jani Vaarala">
-        <unused start="0x3070" end="0x307F"/>
+        <unused start="0x3070" end="0x307E"/>
+        <enum value="0x307F" name="EGL_Y_INVERTED_NOK"/>
     </enums>
 
     <enums namespace="EGL" start="0x3080-0x30AF" vendor="KHR">
@@ -1126,6 +1127,20 @@
             <param><ptype>EGLint</ptype> <name>n_rects</name></param>
         </command>
         <command>
+            <proto><ptype>EGLBoolean</ptype> <name>eglSwapBuffersRegionNOK</name></proto>
+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
+            <param><ptype>EGLint</ptype> <name>numRects</name></param>
+            <param>const <ptype>EGLint</ptype> *<name>rects</name></param>
+        </command>
+        <command>
+            <proto><ptype>EGLBoolean</ptype> <name>eglSwapBuffersRegion2NOK</name></proto>
+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
+            <param><ptype>EGLint</ptype> <name>numRects</name></param>
+            <param>const <ptype>EGLint</ptype> *<name>rects</name></param>
+        </command>
+        <command>
             <proto><ptype>EGLBoolean</ptype> <name>eglSwapInterval</name></proto>
             <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
             <param><ptype>EGLint</ptype> <name>interval</name></param>
@@ -1854,6 +1869,21 @@
                 <enum name="EGL_PLATFORM_GBM_MESA"/>
             </require>
         </extension>
+        <extension name="EGL_NOK_swap_region" supported="egl">
+            <require>
+                <command name="eglSwapBuffersRegionNOK"/>
+            </require>
+        </extension>
+        <extension name="EGL_NOK_swap_region2" supported="egl">
+            <require>
+                <command name="eglSwapBuffersRegion2NOK"/>
+            </require>
+        </extension>
+        <extension name="EGL_NOK_texture_from_pixmap" supported="egl">
+            <require>
+                <enum name="EGL_Y_INVERTED_NOK"/>
+            </require>
+        </extension>
         <extension name="EGL_NV_3dvision_surface" supported="egl">
             <require>
                 <enum name="EGL_AUTO_STEREO_NV"/>
diff --git a/registry/gl.xml b/registry/gl.xml
index b062cb9..6d63b4d 100644
--- a/registry/gl.xml
+++ b/registry/gl.xml
@@ -7600,7 +7600,8 @@ typedef unsigned int GLhandleARB;
         <enum value="0x919D" name="GL_TEXTURE_BUFFER_OFFSET"/>
         <enum value="0x919E" name="GL_TEXTURE_BUFFER_SIZE"/>
         <enum value="0x919F" name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT"/>
-            <unused start="0x91A0" end="0x91A3"/>
+        <enum value="0x91A0" name="GL_STREAM_RASTERIZATION_AMD"/>
+            <unused start="0x91A1" end="0x91A3"/>
         <enum value="0x91A4" name="GL_VERTEX_ELEMENT_SWIZZLE_AMD"/>
         <enum value="0x91A5" name="GL_VERTEX_ID_SWIZZLE_AMD"/>
         <enum value="0x91A6" name="GL_TEXTURE_SPARSE_ARB"/>
@@ -32674,6 +32675,74 @@ typedef unsigned int GLhandleARB;
                 <command name="glBlendEquationSeparateIndexedAMD"/>
             </require>
         </extension>
+        <extension name="GL_AMD_gpu_shader_int64" supported="gl">
+            <require>
+                <enum name="GL_INT64_NV"/>
+                <enum name="GL_UNSIGNED_INT64_NV"/>
+                <enum name="GL_INT8_NV"/>
+                <enum name="GL_INT8_VEC2_NV"/>
+                <enum name="GL_INT8_VEC3_NV"/>
+                <enum name="GL_INT8_VEC4_NV"/>
+                <enum name="GL_INT16_NV"/>
+                <enum name="GL_INT16_VEC2_NV"/>
+                <enum name="GL_INT16_VEC3_NV"/>
+                <enum name="GL_INT16_VEC4_NV"/>
+                <enum name="GL_INT64_VEC2_NV"/>
+                <enum name="GL_INT64_VEC3_NV"/>
+                <enum name="GL_INT64_VEC4_NV"/>
+                <enum name="GL_UNSIGNED_INT8_NV"/>
+                <enum name="GL_UNSIGNED_INT8_VEC2_NV"/>
+                <enum name="GL_UNSIGNED_INT8_VEC3_NV"/>
+                <enum name="GL_UNSIGNED_INT8_VEC4_NV"/>
+                <enum name="GL_UNSIGNED_INT16_NV"/>
+                <enum name="GL_UNSIGNED_INT16_VEC2_NV"/>
+                <enum name="GL_UNSIGNED_INT16_VEC3_NV"/>
+                <enum name="GL_UNSIGNED_INT16_VEC4_NV"/>
+                <enum name="GL_UNSIGNED_INT64_VEC2_NV"/>
+                <enum name="GL_UNSIGNED_INT64_VEC3_NV"/>
+                <enum name="GL_UNSIGNED_INT64_VEC4_NV"/>
+                <enum name="GL_FLOAT16_NV"/>
+                <enum name="GL_FLOAT16_VEC2_NV"/>
+                <enum name="GL_FLOAT16_VEC3_NV"/>
+                <enum name="GL_FLOAT16_VEC4_NV"/>
+                <command name="glUniform1i64NV"/>
+                <command name="glUniform2i64NV"/>
+                <command name="glUniform3i64NV"/>
+                <command name="glUniform4i64NV"/>
+                <command name="glUniform1i64vNV"/>
+                <command name="glUniform2i64vNV"/>
+                <command name="glUniform3i64vNV"/>
+                <command name="glUniform4i64vNV"/>
+                <command name="glUniform1ui64NV"/>
+                <command name="glUniform2ui64NV"/>
+                <command name="glUniform3ui64NV"/>
+                <command name="glUniform4ui64NV"/>
+                <command name="glUniform1ui64vNV"/>
+                <command name="glUniform2ui64vNV"/>
+                <command name="glUniform3ui64vNV"/>
+                <command name="glUniform4ui64vNV"/>
+                <command name="glGetUniformi64vNV"/>
+                <command name="glGetUniformui64vNV"/>
+            </require>
+            <require comment="Supported only if GL_EXT_direct_state_access is supported">
+                <command name="glProgramUniform1i64NV"/>
+                <command name="glProgramUniform2i64NV"/>
+                <command name="glProgramUniform3i64NV"/>
+                <command name="glProgramUniform4i64NV"/>
+                <command name="glProgramUniform1i64vNV"/>
+                <command name="glProgramUniform2i64vNV"/>
+                <command name="glProgramUniform3i64vNV"/>
+                <command name="glProgramUniform4i64vNV"/>
+                <command name="glProgramUniform1ui64NV"/>
+                <command name="glProgramUniform2ui64NV"/>
+                <command name="glProgramUniform3ui64NV"/>
+                <command name="glProgramUniform4ui64NV"/>
+                <command name="glProgramUniform1ui64vNV"/>
+                <command name="glProgramUniform2ui64vNV"/>
+                <command name="glProgramUniform3ui64vNV"/>
+                <command name="glProgramUniform4ui64vNV"/>
+            </require>
+        </extension>
         <extension name="GL_AMD_interleaved_elements" supported="gl">
             <require>
                 <enum name="GL_VERTEX_ELEMENT_SWIZZLE_AMD"/>
@@ -32688,6 +32757,7 @@ typedef unsigned int GLhandleARB;
                 <command name="glVertexAttribParameteriAMD"/>
             </require>
         </extension>
+        <extension name="GL_AMD_gcn_shader" supported="gl"/>
         <extension name="GL_AMD_multi_draw_indirect" supported="gl">
             <require>
                 <command name="glMultiDrawArraysIndirectAMD"/>
@@ -32796,6 +32866,11 @@ typedef unsigned int GLhandleARB;
         </extension>
         <extension name="GL_AMD_texture_texture4" supported="gl"/>
         <extension name="GL_AMD_transform_feedback3_lines_triangles" supported="gl"/>
+        <extension name="GL_AMD_transform_feedback4" supported="gl">
+            <require>
+                <enum name="GL_STREAM_RASTERIZATION_AMD"/>
+            </require>
+        </extension>
         <extension name="GL_AMD_vertex_shader_layer" supported="gl"/>
         <extension name="GL_AMD_vertex_shader_tessellator" supported="gl">
             <require>
diff --git a/registry/glx.xml b/registry/glx.xml
index 6cef56b..224f893 100644
--- a/registry/glx.xml
+++ b/registry/glx.xml
@@ -147,6 +147,17 @@ typedef unsigned __int64 uint64_t;
 
         <type>typedef struct {
     int type;
+    unsigned long serial;
+    Bool send_event;
+    Display *display;
+    int extension;
+    int evtype;
+    GLXDrawable window;
+    Bool stereo_tree;
+} <name>GLXStereoNotifyEventEXT</name>;</type>
+
+        <type>typedef struct {
+    int type;
     unsigned long serial;   /* # of last request processed by server */
     Bool send_event;        /* true if this came for SendEvent request */
     Display *display;       /* display the event was read from */
@@ -184,13 +195,11 @@ typedef unsigned __int64 uint64_t;
 
     </types>
 
+
     <!-- SECTION: GLX enumerant (token) definitions. -->
 
-    <!-- This is modest abuse of the <enum> mechanism but there's no
-         better way to inject this #define at present (maybe a <string>
-         tag?). -->
     <enums namespace="GLXStrings">
-        <enum value="&quot;GLX&quot;"  name="GLX_EXTENSION_NAME"/>
+        <enum value="&quot;GLX&quot;"  name="GLX_EXTENSION_NAME" comment="This is modest abuse of the enum tag mechanism, maybe a string tag?"/>
     </enums>
 
     <!-- Bitmasks each have their own namespace, as do a few other
@@ -228,6 +237,10 @@ typedef unsigned __int64 uint64_t;
         <enum value="92"            name="GLX_BAD_HYPERPIPE_SGIX"/>
     </enums>
 
+    <enums namespace="GLX_GenericEventCode" vendor="ARB" comment="Returned in the evtype field of XGenericEventCookie requests. This is a numeric code, not a bitmask. See http://www.x.org/releases/X11R7.6/doc/xextproto/geproto.html">
+        <enum value="0x00000000"    name="GLX_STEREO_NOTIFY_EXT"/>
+    </enums>
+
     <enums namespace="GLXDrawableTypeMask" type="bitmask" comment="DRAWABLE_TYPE bits">
         <enum value="0x00000001"    name="GLX_WINDOW_BIT"/>
         <enum value="0x00000001"    name="GLX_WINDOW_BIT_SGIX"/>
@@ -252,6 +265,7 @@ typedef unsigned __int64 uint64_t;
     </enums>
 
     <enums namespace="GLXEventMask" type="bitmask" comment="SelectEvent mask">
+        <enum value="0x00000001"    name="GLX_STEREO_NOTIFY_MASK_EXT"/>
         <enum value="0x04000000"    name="GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK"/>
         <enum value="0x08000000"    name="GLX_PBUFFER_CLOBBER_MASK"/>
         <enum value="0x08000000"    name="GLX_BUFFER_CLOBBER_MASK_SGIX"/>
@@ -278,8 +292,8 @@ typedef unsigned __int64 uint64_t;
     </enums>
 
     <enums namespace="GLXHyperpipeTypeMask" type="bitmask">
-        <enum value="0x00000001"    name="GLX_HYPERPIPE_DISPLAY_PIPE_SGIX"/>                     <!-- SGIX_hyperpipe                                 -->
-        <enum value="0x00000002"    name="GLX_HYPERPIPE_RENDER_PIPE_SGIX"/>                      <!--   "                                            -->
+        <enum value="0x00000001"    name="GLX_HYPERPIPE_DISPLAY_PIPE_SGIX"/>
+        <enum value="0x00000002"    name="GLX_HYPERPIPE_RENDER_PIPE_SGIX"/>
     </enums>
 
     <enums namespace="GLXHyperpipeAttribSGIX" type="bitmask">
@@ -313,10 +327,11 @@ typedef unsigned __int64 uint64_t;
         <enum value="80"            name="GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX"/>
     </enums>
 
+
     <enums namespace="GLX" start="0x0000" end="0x2FFF" vendor="ARB"           comment="Miscellaneous OpenGL 1.0/1.1 enums. Most parts of this range are unused and should remain unused."/>
 
     <enums namespace="GLX" group="SpecialNumbers"  vendor="ARB" comment="Tokens whose numeric value is intrinsically meaningful">
-        <enum value="0xFFFFFFFF"    name="GLX_DONT_CARE"/>                                       <!-- for ChooseFBConfig attributes                  -->
+        <enum value="0xFFFFFFFF"    name="GLX_DONT_CARE"                            comment="For ChooseFBConfig attributes"/>
     </enums>
 
     <enums namespace="GLX" group="GLXAttribute" vendor="ARB" comment="Visual attributes">
@@ -431,7 +446,8 @@ typedef unsigned __int64 uint64_t;
         <enum value="0x20F2"        name="GLX_MAX_SWAP_INTERVAL_EXT"/>
         <enum value="0x20F3"        name="GLX_LATE_SWAPS_TEAR_EXT"/>
         <enum value="0x20F4"        name="GLX_BACK_BUFFER_AGE_EXT"/>
-            <unused start="0x20F5" end="0x219F"/>
+        <enum value="0x20F5"        name="GLX_STEREO_TREE_EXT"/>
+            <unused start="0x20F6" end="0x219F"/>
     </enums>
 
     <enums namespace="GLX" start="0x21A0" end="0x21AF" vendor="AMD" comment="Shared with WGL; synchronize create_context enums">
@@ -447,81 +463,81 @@ typedef unsigned __int64 uint64_t;
     </enums>
 
     <enums namespace="GLX" start="0x8000" end="0x804F" vendor="ARB">
-        <enum value="0x8000"        name="GLX_NONE"/>                                            <!-- several attribute values                       -->
-        <enum value="0x8001"        name="GLX_SLOW_CONFIG"/>                                     <!-- CONFIG_CAVEAT attribute value                  -->
-        <enum value="0x8002"        name="GLX_TRUE_COLOR"/>                                      <!-- X_VISUAL_TYPE attribute value                  -->
-        <enum value="0x8003"        name="GLX_DIRECT_COLOR"/>                                    <!--   "                                            -->
-        <enum value="0x8004"        name="GLX_PSEUDO_COLOR"/>                                    <!--   "                                            -->
-        <enum value="0x8005"        name="GLX_STATIC_COLOR"/>                                    <!--   "                                            -->
-        <enum value="0x8006"        name="GLX_GRAY_SCALE"/>                                      <!--   "                                            -->
-        <enum value="0x8007"        name="GLX_STATIC_GRAY"/>                                     <!--   "                                            -->
-        <enum value="0x8008"        name="GLX_TRANSPARENT_RGB"/>                                 <!-- TRANSPARENT_TYPE attribute value               -->
-        <enum value="0x8009"        name="GLX_TRANSPARENT_INDEX"/>                               <!--   "                                            -->
-        <enum value="0x800B"        name="GLX_VISUAL_ID"/>                                       <!-- Context attribute                              -->
-        <enum value="0x800C"        name="GLX_SCREEN"/>                                          <!--   "                                            -->
-        <enum value="0x800D"        name="GLX_NON_CONFORMANT_CONFIG"/>                           <!-- CONFIG_CAVEAT attribute value                  -->
-        <enum value="0x8010"        name="GLX_DRAWABLE_TYPE"/>                                   <!-- FBConfig attribute                             -->
-        <enum value="0x8011"        name="GLX_RENDER_TYPE"/>                                     <!--   "                                            -->
-        <enum value="0x8012"        name="GLX_X_RENDERABLE"/>                                    <!--   "                                            -->
-        <enum value="0x8013"        name="GLX_FBCONFIG_ID"/>                                     <!--   "                                            -->
-        <enum value="0x8014"        name="GLX_RGBA_TYPE"/>                                       <!-- CreateNewContext render_type value             -->
-        <enum value="0x8015"        name="GLX_COLOR_INDEX_TYPE"/>                                <!--   "                                            -->
-        <enum value="0x8016"        name="GLX_MAX_PBUFFER_WIDTH"/>                               <!-- FBConfig attribute                             -->
-        <enum value="0x8017"        name="GLX_MAX_PBUFFER_HEIGHT"/>                              <!--   "                                            -->
-        <enum value="0x8018"        name="GLX_MAX_PBUFFER_PIXELS"/>                              <!--   "                                            -->
-        <enum value="0x801B"        name="GLX_PRESERVED_CONTENTS"/>                              <!-- CreateGLXPbuffer attribute                     -->
-        <enum value="0x801C"        name="GLX_LARGEST_PBUFFER"/>                                 <!--   "                                            -->
-        <enum value="0x801D"        name="GLX_WIDTH"/>                                           <!-- Drawable attribute                             -->
-        <enum value="0x801E"        name="GLX_HEIGHT"/>                                          <!--   "                                            -->
-        <enum value="0x801F"        name="GLX_EVENT_MASK"/>                                      <!--   "                                            -->
-        <enum value="0x8020"        name="GLX_DAMAGED"/>                                         <!-- PbufferClobber event_type value                -->
-        <enum value="0x8021"        name="GLX_SAVED"/>                                           <!--   "                                            -->
-        <enum value="0x8022"        name="GLX_WINDOW"/>                                          <!-- PbufferClobber draw_type value                 -->
-        <enum value="0x8023"        name="GLX_PBUFFER"/>                                         <!--   "                                            -->
-        <enum value="0x8000"        name="GLX_NONE_EXT"/>                                        <!-- several EXT attribute values                   -->
-        <enum value="0x8001"        name="GLX_SLOW_VISUAL_EXT"/>                                 <!-- VISUAL_CAVEAT_EXT attribute value              -->
-        <enum value="0x8002"        name="GLX_TRUE_COLOR_EXT"/>                                  <!-- X_VISUAL_TYPE_EXT attribute value              -->
-        <enum value="0x8003"        name="GLX_DIRECT_COLOR_EXT"/>                                <!--   "                                            -->
-        <enum value="0x8004"        name="GLX_PSEUDO_COLOR_EXT"/>                                <!--   "                                            -->
-        <enum value="0x8005"        name="GLX_STATIC_COLOR_EXT"/>                                <!--   "                                            -->
-        <enum value="0x8006"        name="GLX_GRAY_SCALE_EXT"/>                                  <!--   "                                            -->
-        <enum value="0x8007"        name="GLX_STATIC_GRAY_EXT"/>                                 <!--   "                                            -->
-        <enum value="0x8008"        name="GLX_TRANSPARENT_RGB_EXT"/>                             <!-- TRANSPARENT_TYPE_EXT attribute value           -->
-        <enum value="0x8009"        name="GLX_TRANSPARENT_INDEX_EXT"/>                           <!--   "                                            -->
-        <enum value="0x800A"        name="GLX_SHARE_CONTEXT_EXT"/>                               <!-- QueryContextInfoEXT attribute                  -->
-        <enum value="0x800B"        name="GLX_VISUAL_ID_EXT"/>                                   <!--   "                                            -->
-        <enum value="0x800C"        name="GLX_SCREEN_EXT"/>                                      <!--   "                                            -->
-        <enum value="0x800D"        name="GLX_NON_CONFORMANT_VISUAL_EXT"/>                       <!-- VISUAL_CAVEAT_EXT attribute value              -->
-        <enum value="0x8010"        name="GLX_DRAWABLE_TYPE_SGIX"/>                              <!-- FBConfigSGIX attribute                         -->
-        <enum value="0x8011"        name="GLX_RENDER_TYPE_SGIX"/>                                <!--   "                                            -->
-        <enum value="0x8012"        name="GLX_X_RENDERABLE_SGIX"/>                               <!--   "                                            -->
-        <enum value="0x8013"        name="GLX_FBCONFIG_ID_SGIX"/>                                <!--   "                                            -->
-        <enum value="0x8014"        name="GLX_RGBA_TYPE_SGIX"/>                                  <!-- CreateContextWithConfigSGIX render_type value  -->
-        <enum value="0x8015"        name="GLX_COLOR_INDEX_TYPE_SGIX"/>                           <!--   "                                            -->
-        <enum value="0x8016"        name="GLX_MAX_PBUFFER_WIDTH_SGIX"/>                          <!-- FBConfigSGIX attribute                         -->
-        <enum value="0x8017"        name="GLX_MAX_PBUFFER_HEIGHT_SGIX"/>                         <!--   "                                            -->
-        <enum value="0x8018"        name="GLX_MAX_PBUFFER_PIXELS_SGIX"/>                         <!--   "                                            -->
-        <enum value="0x8019"        name="GLX_OPTIMAL_PBUFFER_WIDTH_SGIX"/>                      <!--   "                                            -->
-        <enum value="0x801A"        name="GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX"/>                     <!--   "                                            -->
-        <enum value="0x801B"        name="GLX_PRESERVED_CONTENTS_SGIX"/>                         <!-- PbufferSGIX attribute                          -->
-        <enum value="0x801C"        name="GLX_LARGEST_PBUFFER_SGIX"/>                            <!--   "                                            -->
-        <enum value="0x801D"        name="GLX_WIDTH_SGIX"/>                                      <!--   "                                            -->
-        <enum value="0x801E"        name="GLX_HEIGHT_SGIX"/>                                     <!--   "                                            -->
-        <enum value="0x801F"        name="GLX_EVENT_MASK_SGIX"/>                                 <!--   "                                            -->
-        <enum value="0x8020"        name="GLX_DAMAGED_SGIX"/>                                    <!-- BufferClobberSGIX event_type value             -->
-        <enum value="0x8021"        name="GLX_SAVED_SGIX"/>                                      <!--   "                                            -->
-        <enum value="0x8022"        name="GLX_WINDOW_SGIX"/>                                     <!-- BufferClobberSGIX draw_type value              -->
-        <enum value="0x8023"        name="GLX_PBUFFER_SGIX"/>                                    <!--   "                                            -->
-        <enum value="0x8024"        name="GLX_DIGITAL_MEDIA_PBUFFER_SGIX"/>                      <!-- PbufferSGIX attribute                          -->
-        <enum value="0x8025"        name="GLX_BLENDED_RGBA_SGIS"/>                               <!-- TRANSPARENT_TYPE_EXT attribute value           -->
-        <enum value="0x8026"        name="GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS"/>                 <!-- Visual attribute (shared_multisample)          -->
-        <enum value="0x8027"        name="GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS"/>                <!--   "                                            -->
-        <enum value="0x8028"        name="GLX_VISUAL_SELECT_GROUP_SGIX"/>                        <!-- Visual attribute (visual_select_group)         -->
+        <enum value="0x8000"        name="GLX_NONE"                                 comment="Attribute value"/>
+        <enum value="0x8001"        name="GLX_SLOW_CONFIG"                          comment="CONFIG_CAVEAT attribute value"/>
+        <enum value="0x8002"        name="GLX_TRUE_COLOR"                           comment="X_VISUAL_TYPE attribute value"/>
+        <enum value="0x8003"        name="GLX_DIRECT_COLOR"                         comment="X_VISUAL_TYPE attribute value"/>
+        <enum value="0x8004"        name="GLX_PSEUDO_COLOR"                         comment="X_VISUAL_TYPE attribute value"/>
+        <enum value="0x8005"        name="GLX_STATIC_COLOR"                         comment="X_VISUAL_TYPE attribute value"/>
+        <enum value="0x8006"        name="GLX_GRAY_SCALE"                           comment="X_VISUAL_TYPE attribute value"/>
+        <enum value="0x8007"        name="GLX_STATIC_GRAY"                          comment="X_VISUAL_TYPE attribute value"/>
+        <enum value="0x8008"        name="GLX_TRANSPARENT_RGB"                      comment="TRANSPARENT_TYPE attribute value"/>
+        <enum value="0x8009"        name="GLX_TRANSPARENT_INDEX"                    comment="TRANSPARENT_TYPE attribute value"/>
+        <enum value="0x800B"        name="GLX_VISUAL_ID"                            comment="Context attribute"/>
+        <enum value="0x800C"        name="GLX_SCREEN"                               comment="Context attribute"/>
+        <enum value="0x800D"        name="GLX_NON_CONFORMANT_CONFIG"                comment="CONFIG_CAVEAT attribute value"/>
+        <enum value="0x8010"        name="GLX_DRAWABLE_TYPE"                        comment="FBConfig attribute"/>
+        <enum value="0x8011"        name="GLX_RENDER_TYPE"                          comment="FBConfig attribute"/>
+        <enum value="0x8012"        name="GLX_X_RENDERABLE"                         comment="FBConfig attribute"/>
+        <enum value="0x8013"        name="GLX_FBCONFIG_ID"                          comment="FBConfig attribute"/>
+        <enum value="0x8014"        name="GLX_RGBA_TYPE"                            comment="CreateNewContext render_type value"/>
+        <enum value="0x8015"        name="GLX_COLOR_INDEX_TYPE"                     comment="CreateNewContext render_type value"/>
+        <enum value="0x8016"        name="GLX_MAX_PBUFFER_WIDTH"                    comment="FBConfig attribute"/>
+        <enum value="0x8017"        name="GLX_MAX_PBUFFER_HEIGHT"                   comment="FBConfig attribute"/>
+        <enum value="0x8018"        name="GLX_MAX_PBUFFER_PIXELS"                   comment="FBConfig attribute"/>
+        <enum value="0x801B"        name="GLX_PRESERVED_CONTENTS"                   comment="CreateGLXPbuffer attribute"/>
+        <enum value="0x801C"        name="GLX_LARGEST_PBUFFER"                      comment="CreateGLXPbuffer attribute"/>
+        <enum value="0x801D"        name="GLX_WIDTH"                                comment="Drawable attribute"/>
+        <enum value="0x801E"        name="GLX_HEIGHT"                               comment="Drawable attribute"/>
+        <enum value="0x801F"        name="GLX_EVENT_MASK"                           comment="Drawable attribute"/>
+        <enum value="0x8020"        name="GLX_DAMAGED"                              comment="PbufferClobber event_type value"/>
+        <enum value="0x8021"        name="GLX_SAVED"                                comment="PbufferClobber event_type value"/>
+        <enum value="0x8022"        name="GLX_WINDOW"                               comment="PbufferClobber draw_type value"/>
+        <enum value="0x8023"        name="GLX_PBUFFER"                              comment="PbufferClobber draw_type value"/>
+        <enum value="0x8000"        name="GLX_NONE_EXT"                             comment="several EXT attribute values"/>
+        <enum value="0x8001"        name="GLX_SLOW_VISUAL_EXT"                      comment="VISUAL_CAVEAT_EXT attribute value"/>
+        <enum value="0x8002"        name="GLX_TRUE_COLOR_EXT"                       comment="X_VISUAL_TYPE_EXT attribute value"/>
+        <enum value="0x8003"        name="GLX_DIRECT_COLOR_EXT"                     comment="X_VISUAL_TYPE_EXT attribute value"/>
+        <enum value="0x8004"        name="GLX_PSEUDO_COLOR_EXT"                     comment="X_VISUAL_TYPE_EXT attribute value"/>
+        <enum value="0x8005"        name="GLX_STATIC_COLOR_EXT"                     comment="X_VISUAL_TYPE_EXT attribute value"/>
+        <enum value="0x8006"        name="GLX_GRAY_SCALE_EXT"                       comment="X_VISUAL_TYPE_EXT attribute value"/>
+        <enum value="0x8007"        name="GLX_STATIC_GRAY_EXT"                      comment="X_VISUAL_TYPE_EXT attribute value"/>
+        <enum value="0x8008"        name="GLX_TRANSPARENT_RGB_EXT"                  comment="TRANSPARENT_TYPE_EXT attribute value"/>
+        <enum value="0x8009"        name="GLX_TRANSPARENT_INDEX_EXT"                comment="TRANSPARENT_TYPE_EXT attribute value"/>
+        <enum value="0x800A"        name="GLX_SHARE_CONTEXT_EXT"                    comment="QueryContextInfoEXT attribute"/>
+        <enum value="0x800B"        name="GLX_VISUAL_ID_EXT"                        comment="QueryContextInfoEXT attribute"/>
+        <enum value="0x800C"        name="GLX_SCREEN_EXT"                           comment="QueryContextInfoEXT attribute"/>
+        <enum value="0x800D"        name="GLX_NON_CONFORMANT_VISUAL_EXT"            comment="VISUAL_CAVEAT_EXT attribute value"/>
+        <enum value="0x8010"        name="GLX_DRAWABLE_TYPE_SGIX"                   comment="FBConfigSGIX attribute"/>
+        <enum value="0x8011"        name="GLX_RENDER_TYPE_SGIX"                     comment="FBConfigSGIX attribute"/>
+        <enum value="0x8012"        name="GLX_X_RENDERABLE_SGIX"                    comment="FBConfigSGIX attribute"/>
+        <enum value="0x8013"        name="GLX_FBCONFIG_ID_SGIX"                     comment="FBConfigSGIX attribute"/>
+        <enum value="0x8014"        name="GLX_RGBA_TYPE_SGIX"                       comment="CreateContextWithConfigSGIX render_type value"/>
+        <enum value="0x8015"        name="GLX_COLOR_INDEX_TYPE_SGIX"                comment="CreateContextWithConfigSGIX render_type value"/>
+        <enum value="0x8016"        name="GLX_MAX_PBUFFER_WIDTH_SGIX"               comment="FBConfigSGIX attribute"/>
+        <enum value="0x8017"        name="GLX_MAX_PBUFFER_HEIGHT_SGIX"              comment="FBConfigSGIX attribute"/>
+        <enum value="0x8018"        name="GLX_MAX_PBUFFER_PIXELS_SGIX"              comment="FBConfigSGIX attribute"/>
+        <enum value="0x8019"        name="GLX_OPTIMAL_PBUFFER_WIDTH_SGIX"           comment="FBConfigSGIX attribute"/>
+        <enum value="0x801A"        name="GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX"          comment="FBConfigSGIX attribute"/>
+        <enum value="0x801B"        name="GLX_PRESERVED_CONTENTS_SGIX"              comment="PbufferSGIX attribute"/>
+        <enum value="0x801C"        name="GLX_LARGEST_PBUFFER_SGIX"                 comment="PbufferSGIX attribute"/>
+        <enum value="0x801D"        name="GLX_WIDTH_SGIX"                           comment="PbufferSGIX attribute"/>
+        <enum value="0x801E"        name="GLX_HEIGHT_SGIX"                          comment="PbufferSGIX attribute"/>
+        <enum value="0x801F"        name="GLX_EVENT_MASK_SGIX"                      comment="PbufferSGIX attribute"/>
+        <enum value="0x8020"        name="GLX_DAMAGED_SGIX"                         comment="BufferClobberSGIX event_type value"/>
+        <enum value="0x8021"        name="GLX_SAVED_SGIX"                           comment="BufferClobberSGIX event_type value"/>
+        <enum value="0x8022"        name="GLX_WINDOW_SGIX"                          comment="BufferClobberSGIX draw_type value"/>
+        <enum value="0x8023"        name="GLX_PBUFFER_SGIX"                         comment="BufferClobberSGIX draw_type value"/>
+        <enum value="0x8024"        name="GLX_DIGITAL_MEDIA_PBUFFER_SGIX"           comment="PbufferSGIX attribute"/>
+        <enum value="0x8025"        name="GLX_BLENDED_RGBA_SGIS"                    comment="TRANSPARENT_TYPE_EXT attribute value"/>
+        <enum value="0x8026"        name="GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS"      comment="Visual attribute (shared_multisample)"/>
+        <enum value="0x8027"        name="GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS"     comment="Visual attribute (shared_multisample)"/>
+        <enum value="0x8028"        name="GLX_VISUAL_SELECT_GROUP_SGIX"             comment="Visual attribute (visual_select_group)"/>
             <unused start="0x8029" end="0x802F"/>
-        <enum value="0x8030"        name="GLX_HYPERPIPE_ID_SGIX"/>                               <!-- Associated hyperpipe ID (SGIX_hyperpipe)       -->
+        <enum value="0x8030"        name="GLX_HYPERPIPE_ID_SGIX"/>
             <unused start="0x8031" end="0x803F"/>
-        <enum value="0x8040"        name="GLX_PBUFFER_HEIGHT"/>                                  <!-- CreateGLXPbuffer attribute                     -->
-        <enum value="0x8041"        name="GLX_PBUFFER_WIDTH"/>                                   <!--   "                                            -->
+        <enum value="0x8040"        name="GLX_PBUFFER_HEIGHT"                       comment="CreateGLXPbuffer attribute"/>
+        <enum value="0x8041"        name="GLX_PBUFFER_WIDTH"                        comment="CreateGLXPbuffer attribute"/>
             <unused start="0x8042" end="0x804F"/>
     </enums>
 
@@ -552,18 +568,18 @@ typedef unsigned __int64 uint64_t;
         <enum value="0x8180"        name="GLX_EXCHANGE_COMPLETE_INTEL"/>
         <enum value="0x8181"        name="GLX_COPY_COMPLETE_INTEL"/>
         <enum value="0x8182"        name="GLX_FLIP_COMPLETE_INTEL"/>
-        <enum value="0x8183"        name="GLX_RENDERER_VENDOR_ID_MESA"/>                               
-        <enum value="0x8184"        name="GLX_RENDERER_DEVICE_ID_MESA"/>                               
-        <enum value="0x8185"        name="GLX_RENDERER_VERSION_MESA"/>                                 
-        <enum value="0x8186"        name="GLX_RENDERER_ACCELERATED_MESA"/>                             
-        <enum value="0x8187"        name="GLX_RENDERER_VIDEO_MEMORY_MESA"/>                            
-        <enum value="0x8188"        name="GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA"/>             
-        <enum value="0x8189"        name="GLX_RENDERER_PREFERRED_PROFILE_MESA"/>                       
-        <enum value="0x818A"        name="GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA"/>             
-        <enum value="0x818B"        name="GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA"/>    
-        <enum value="0x818C"        name="GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA"/>               
-        <enum value="0x818D"        name="GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA"/>              
-        <enum value="0x818E"        name="GLX_RENDERER_ID_MESA"/>                                      
+        <enum value="0x8183"        name="GLX_RENDERER_VENDOR_ID_MESA"/>
+        <enum value="0x8184"        name="GLX_RENDERER_DEVICE_ID_MESA"/>
+        <enum value="0x8185"        name="GLX_RENDERER_VERSION_MESA"/>
+        <enum value="0x8186"        name="GLX_RENDERER_ACCELERATED_MESA"/>
+        <enum value="0x8187"        name="GLX_RENDERER_VIDEO_MEMORY_MESA"/>
+        <enum value="0x8188"        name="GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA"/>
+        <enum value="0x8189"        name="GLX_RENDERER_PREFERRED_PROFILE_MESA"/>
+        <enum value="0x818A"        name="GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA"/>
+        <enum value="0x818B"        name="GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA"/>
+        <enum value="0x818C"        name="GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA"/>
+        <enum value="0x818D"        name="GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA"/>
+        <enum value="0x818E"        name="GLX_RENDERER_ID_MESA"/>
             <unused start="0x818F"/>
     </enums>
 
@@ -573,11 +589,8 @@ typedef unsigned __int64 uint64_t;
      component. Also note that some GLX enum values are shared with GL and
      WGL, and new ranges should be allocated with such overlaps in mind. -->
 
-<!-- Reservable for future use: 0x8190-0x824F.
-     To generate a new range, allocate multiples of 16 starting at the
-     lowest available point in this block. -->
     <enums namespace="GLX" start="0x8190" end="0x824F" vendor="ARB">
-            <unused start="0x8190" end="0x824F" comment="Reserved for future use"/>
+            <unused start="0x8190" end="0x824F" comment="Reserved for future use. Reserve enums in blocks of 16 from the start."/>
     </enums>
 
     <enums namespace="GL" start="0x8250" end="0x826F" vendor="ARB" comment="Values shared with GL. Do not allocate additional values in this range.">
@@ -592,8 +605,7 @@ typedef unsigned __int64 uint64_t;
             <unused start="0x9127" end="99999"/>
     </enums>
 
-<!-- Historical allocations. Do not allocate new values in this space. -->
-    <enums namespace="GLX" start="100000" end="100001" vendor="ARB" comment="Visual attributes for multisampling">
+    <enums namespace="GLX" start="100000" end="100001" vendor="ARB" comment="Visual attributes for multisampling. Historical range only; do not allocate new values in this space.">
         <enum value="100000"        name="GLX_SAMPLE_BUFFERS"/>
         <enum value="100000"        name="GLX_SAMPLE_BUFFERS_ARB"/>
         <enum value="100000"        name="GLX_SAMPLE_BUFFERS_SGIS"/>
@@ -1117,7 +1129,7 @@ typedef unsigned __int64 uint64_t;
         </command>
         <command>
             <proto><ptype>Bool</ptype> <name>glXQueryCurrentRendererIntegerMESA</name></proto>
-            <param>int <name>attribute</name></param> 
+            <param>int <name>attribute</name></param>
             <param>unsigned int *<name>value</name></param>
         </command>
         <command>
@@ -1198,17 +1210,17 @@ typedef unsigned __int64 uint64_t;
         </command>
         <command>
             <proto><ptype>Bool</ptype> <name>glXQueryRendererIntegerMESA</name></proto>
-            <param><ptype>Display</ptype> *<name>dpy</name></param> 
+            <param><ptype>Display</ptype> *<name>dpy</name></param>
             <param>int <name>screen</name></param>
-            <param>int <name>renderer</name></param> 
+            <param>int <name>renderer</name></param>
             <param>int <name>attribute</name></param>
             <param>unsigned int *<name>value</name></param>
         </command>
         <command>
             <proto>const char *<name>glXQueryRendererStringMESA</name></proto>
-            <param><ptype>Display</ptype> *<name>dpy</name></param> 
+            <param><ptype>Display</ptype> *<name>dpy</name></param>
             <param>int <name>screen</name></param>
-            <param>int <name>renderer</name></param> 
+            <param>int <name>renderer</name></param>
             <param>int <name>attribute</name></param>
         </command>
         <command>
@@ -1370,8 +1382,7 @@ typedef unsigned __int64 uint64_t;
     <!-- SECTION: GLX API interface definitions. -->
     <feature api="glx" name="GLX_VERSION_1_0" number="1.0">
         <require>
-                <!-- A string #define. Maybe should have a <text> tag for this use? -->
-            <enum name="GLX_EXTENSION_NAME"/>
+            <enum name="GLX_EXTENSION_NAME" comment="A string #define"/>
                 <!-- Events -->
             <enum name="GLX_PbufferClobber"/>
             <enum name="GLX_BufferSwapComplete"/>
@@ -1530,37 +1541,24 @@ typedef unsigned __int64 uint64_t;
 
     <!-- SECTION: GLX extension interface definitions -->
     <extensions>
-        <extension name="GLX_ARB_get_proc_address" supported="glx">
-            <require>
-                <command name="glXGetProcAddressARB"/>
-            </require>
-        </extension>
-        <extension name="GLX_ARB_multisample" supported="glx">
-            <require>
-                <enum name="GLX_SAMPLE_BUFFERS_ARB"/>
-                <enum name="GLX_SAMPLES_ARB"/>
-            </require>
-        </extension>
         <extension name="GLX_3DFX_multisample" supported="glx">
             <require>
                 <enum name="GLX_SAMPLE_BUFFERS_3DFX"/>
                 <enum name="GLX_SAMPLES_3DFX"/>
             </require>
         </extension>
-        <extension name="GLX_ARB_vertex_buffer_object" supported="glx">
-            <require>
-                <enum name="GLX_CONTEXT_ALLOW_BUFFER_BYTE_ORDER_MISMATCH_ARB"/>
-            </require>
-        </extension>
-        <extension name="GLX_ARB_fbconfig_float" supported="glx">
-            <require>
-                <enum name="GLX_RGBA_FLOAT_TYPE_ARB"/>
-                <enum name="GLX_RGBA_FLOAT_BIT_ARB"/>
-            </require>
-        </extension>
-        <extension name="GLX_ARB_framebuffer_sRGB" supported="glx">
+        <extension name="GLX_AMD_gpu_association" supported="glx">
             <require>
-                <enum name="GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB"/>
+                <enum name="GLX_GPU_VENDOR_AMD"/>
+                <enum name="GLX_GPU_RENDERER_STRING_AMD"/>
+                <enum name="GLX_GPU_OPENGL_VERSION_STRING_AMD"/>
+                <enum name="GLX_GPU_FASTEST_TARGET_GPUS_AMD"/>
+                <enum name="GLX_GPU_RAM_AMD"/>
+                <enum name="GLX_GPU_CLOCK_AMD"/>
+                <enum name="GLX_GPU_NUM_PIPES_AMD"/>
+                <enum name="GLX_GPU_NUM_SIMD_AMD"/>
+                <enum name="GLX_GPU_NUM_RB_AMD"/>
+                <enum name="GLX_GPU_NUM_SPI_AMD"/>
             </require>
         </extension>
         <extension name="GLX_ARB_create_context" supported="glx">
@@ -1588,71 +1586,67 @@ typedef unsigned __int64 uint64_t;
                 <enum name="GLX_NO_RESET_NOTIFICATION_ARB"/>
             </require>
         </extension>
-        <extension name="GLX_ARB_robustness_application_isolation" supported="glx">
+        <extension name="GLX_ARB_fbconfig_float" supported="glx">
             <require>
-                <enum name="GLX_CONTEXT_RESET_ISOLATION_BIT_ARB"/>
+                <enum name="GLX_RGBA_FLOAT_TYPE_ARB"/>
+                <enum name="GLX_RGBA_FLOAT_BIT_ARB"/>
             </require>
         </extension>
-        <extension name="GLX_ARB_robustness_share_group_isolation" supported="glx">
+        <extension name="GLX_ARB_framebuffer_sRGB" supported="glx">
+            <require>
+                <enum name="GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB"/>
+            </require>
+        </extension>
+        <extension name="GLX_ARB_get_proc_address" supported="glx">
+            <require>
+                <command name="glXGetProcAddressARB"/>
+            </require>
+        </extension>
+        <extension name="GLX_ARB_multisample" supported="glx">
+            <require>
+                <enum name="GLX_SAMPLE_BUFFERS_ARB"/>
+                <enum name="GLX_SAMPLES_ARB"/>
+            </require>
+        </extension>
+        <extension name="GLX_ARB_robustness_application_isolation" supported="glx">
             <require>
                 <enum name="GLX_CONTEXT_RESET_ISOLATION_BIT_ARB"/>
             </require>
         </extension>
-        <extension name="GLX_SGIS_multisample" supported="glx">
+        <extension name="GLX_ARB_robustness_share_group_isolation" supported="glx">
             <require>
-                <enum name="GLX_SAMPLE_BUFFERS_SGIS"/>
-                <enum name="GLX_SAMPLES_SGIS"/>
+                <enum name="GLX_CONTEXT_RESET_ISOLATION_BIT_ARB"/>
             </require>
         </extension>
-        <extension name="GLX_EXT_visual_info" supported="glx">
+        <extension name="GLX_ARB_vertex_buffer_object" supported="glx">
             <require>
-                <enum name="GLX_X_VISUAL_TYPE_EXT"/>
-                <enum name="GLX_TRANSPARENT_TYPE_EXT"/>
-                <enum name="GLX_TRANSPARENT_INDEX_VALUE_EXT"/>
-                <enum name="GLX_TRANSPARENT_RED_VALUE_EXT"/>
-                <enum name="GLX_TRANSPARENT_GREEN_VALUE_EXT"/>
-                <enum name="GLX_TRANSPARENT_BLUE_VALUE_EXT"/>
-                <enum name="GLX_TRANSPARENT_ALPHA_VALUE_EXT"/>
-                <enum name="GLX_NONE_EXT"/>
-                <enum name="GLX_TRUE_COLOR_EXT"/>
-                <enum name="GLX_DIRECT_COLOR_EXT"/>
-                <enum name="GLX_PSEUDO_COLOR_EXT"/>
-                <enum name="GLX_STATIC_COLOR_EXT"/>
-                <enum name="GLX_GRAY_SCALE_EXT"/>
-                <enum name="GLX_STATIC_GRAY_EXT"/>
-                <enum name="GLX_TRANSPARENT_RGB_EXT"/>
-                <enum name="GLX_TRANSPARENT_INDEX_EXT"/>
+                <enum name="GLX_CONTEXT_ALLOW_BUFFER_BYTE_ORDER_MISMATCH_ARB"/>
             </require>
         </extension>
-        <extension name="GLX_SGI_swap_control" supported="glx">
+        <extension name="GLX_EXT_buffer_age" supported="glx">
             <require>
-                <command name="glXSwapIntervalSGI"/>
+                <enum name="GLX_BACK_BUFFER_AGE_EXT"/>
             </require>
         </extension>
-        <extension name="GLX_SGI_video_sync" supported="glx">
+        <extension name="GLX_EXT_create_context_es_profile" supported="glx">
             <require>
-                <command name="glXGetVideoSyncSGI"/>
-                <command name="glXWaitVideoSyncSGI"/>
+                <enum name="GLX_CONTEXT_ES_PROFILE_BIT_EXT"/>
             </require>
         </extension>
-        <extension name="GLX_SGI_make_current_read" supported="glx">
+        <extension name="GLX_EXT_create_context_es2_profile" supported="glx">
             <require>
-                <command name="glXMakeCurrentReadSGI"/>
-                <command name="glXGetCurrentReadDrawableSGI"/>
+                <enum name="GLX_CONTEXT_ES2_PROFILE_BIT_EXT"/>
             </require>
         </extension>
-        <extension name="GLX_SGIX_video_source" supported="glx" protect="_VL_H">
+        <extension name="GLX_EXT_fbconfig_packed_float" supported="glx">
             <require>
-                <command name="glXCreateGLXVideoSourceSGIX"/>
-                <command name="glXDestroyGLXVideoSourceSGIX"/>
+                <enum name="GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT"/>
+                <enum name="GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT"/>
             </require>
         </extension>
-        <extension name="GLX_EXT_visual_rating" supported="glx">
+        <extension name="GLX_EXT_framebuffer_sRGB" supported="glx">
             <require>
-                <enum name="GLX_VISUAL_CAVEAT_EXT"/>
-                <enum name="GLX_SLOW_VISUAL_EXT"/>
-                <enum name="GLX_NON_CONFORMANT_VISUAL_EXT"/>
-                <enum name="GLX_NONE_EXT"/>
+                <enum name="GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT"/>
             </require>
         </extension>
         <extension name="GLX_EXT_import_context" supported="glx">
@@ -1667,115 +1661,104 @@ typedef unsigned __int64 uint64_t;
                 <command name="glXFreeContextEXT"/>
             </require>
         </extension>
-        <extension name="GLX_SGIX_fbconfig" supported="glx">
+        <extension name="GLX_EXT_stereo_tree" supported="glx">
             <require>
-                <enum name="GLX_WINDOW_BIT_SGIX"/>
-                <enum name="GLX_PIXMAP_BIT_SGIX"/>
-                <enum name="GLX_RGBA_BIT_SGIX"/>
-                <enum name="GLX_COLOR_INDEX_BIT_SGIX"/>
-                <enum name="GLX_DRAWABLE_TYPE_SGIX"/>
-                <enum name="GLX_RENDER_TYPE_SGIX"/>
-                <enum name="GLX_X_RENDERABLE_SGIX"/>
-                <enum name="GLX_FBCONFIG_ID_SGIX"/>
-                <enum name="GLX_RGBA_TYPE_SGIX"/>
-                <enum name="GLX_COLOR_INDEX_TYPE_SGIX"/>
-                <enum name="GLX_SCREEN_EXT"/>
-                <command name="glXGetFBConfigAttribSGIX"/>
-                <command name="glXChooseFBConfigSGIX"/>
-                <command name="glXCreateGLXPixmapWithConfigSGIX"/>
-                <command name="glXCreateContextWithConfigSGIX"/>
-                <command name="glXGetVisualFromFBConfigSGIX"/>
-                <command name="glXGetFBConfigFromVisualSGIX"/>
+                <type name="GLXStereoNotifyEventEXT"/>
+                <enum name="GLX_STEREO_TREE_EXT"/>
+                <enum name="GLX_STEREO_NOTIFY_MASK_EXT"/>
+                <enum name="GLX_STEREO_NOTIFY_EXT"/>
             </require>
         </extension>
-        <extension name="GLX_SGIX_pbuffer" supported="glx">
-            <require>
-                <enum name="GLX_PBUFFER_BIT_SGIX"/>
-                <enum name="GLX_BUFFER_CLOBBER_MASK_SGIX"/>
-                <enum name="GLX_FRONT_LEFT_BUFFER_BIT_SGIX"/>
-                <enum name="GLX_FRONT_RIGHT_BUFFER_BIT_SGIX"/>
-                <enum name="GLX_BACK_LEFT_BUFFER_BIT_SGIX"/>
-                <enum name="GLX_BACK_RIGHT_BUFFER_BIT_SGIX"/>
-                <enum name="GLX_AUX_BUFFERS_BIT_SGIX"/>
-                <enum name="GLX_DEPTH_BUFFER_BIT_SGIX"/>
-                <enum name="GLX_STENCIL_BUFFER_BIT_SGIX"/>
-                <enum name="GLX_ACCUM_BUFFER_BIT_SGIX"/>
-                <enum name="GLX_SAMPLE_BUFFERS_BIT_SGIX"/>
-                <enum name="GLX_MAX_PBUFFER_WIDTH_SGIX"/>
-                <enum name="GLX_MAX_PBUFFER_HEIGHT_SGIX"/>
-                <enum name="GLX_MAX_PBUFFER_PIXELS_SGIX"/>
-                <enum name="GLX_OPTIMAL_PBUFFER_WIDTH_SGIX"/>
-                <enum name="GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX"/>
-                <enum name="GLX_PRESERVED_CONTENTS_SGIX"/>
-                <enum name="GLX_LARGEST_PBUFFER_SGIX"/>
-                <enum name="GLX_WIDTH_SGIX"/>
-                <enum name="GLX_HEIGHT_SGIX"/>
-                <enum name="GLX_EVENT_MASK_SGIX"/>
-                <enum name="GLX_DAMAGED_SGIX"/>
-                <enum name="GLX_SAVED_SGIX"/>
-                <enum name="GLX_WINDOW_SGIX"/>
-                <enum name="GLX_PBUFFER_SGIX"/>
-                <command name="glXCreateGLXPbufferSGIX"/>
-                <command name="glXDestroyGLXPbufferSGIX"/>
-                <command name="glXQueryGLXPbufferSGIX"/>
-                <command name="glXSelectEventSGIX"/>
-                <command name="glXGetSelectedEventSGIX"/>
-            </require>
-        </extension>
-        <extension name="GLX_SGIS_blended_overlay" supported="glx">
-            <require>
-                <enum name="GLX_BLENDED_RGBA_SGIS"/>
-            </require>
-        </extension>
-        <extension name="GLX_SGI_cushion" supported="glx">
+        <extension name="GLX_EXT_swap_control" supported="glx">
             <require>
-                <command name="glXCushionSGI"/>
+                <enum name="GLX_SWAP_INTERVAL_EXT"/>
+                <enum name="GLX_MAX_SWAP_INTERVAL_EXT"/>
+                <command name="glXSwapIntervalEXT"/>
             </require>
         </extension>
-        <extension name="GLX_SGIS_shared_multisample" supported="glx">
+        <extension name="GLX_EXT_swap_control_tear" supported="glx">
             <require>
-                <enum name="GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS"/>
-                <enum name="GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS"/>
+                <enum name="GLX_LATE_SWAPS_TEAR_EXT"/>
             </require>
         </extension>
-        <extension name="GLX_SGIX_video_resize" supported="glx">
+        <extension name="GLX_EXT_texture_from_pixmap" supported="glx">
             <require>
-                <enum name="GLX_SYNC_FRAME_SGIX"/>
-                <enum name="GLX_SYNC_SWAP_SGIX"/>
-                <command name="glXBindChannelToWindowSGIX"/>
-                <command name="glXChannelRectSGIX"/>
-                <command name="glXQueryChannelRectSGIX"/>
-                <command name="glXQueryChannelDeltasSGIX"/>
-                <command name="glXChannelRectSyncSGIX"/>
+                <enum name="GLX_TEXTURE_1D_BIT_EXT"/>
+                <enum name="GLX_TEXTURE_2D_BIT_EXT"/>
+                <enum name="GLX_TEXTURE_RECTANGLE_BIT_EXT"/>
+                <enum name="GLX_BIND_TO_TEXTURE_RGB_EXT"/>
+                <enum name="GLX_BIND_TO_TEXTURE_RGBA_EXT"/>
+                <enum name="GLX_BIND_TO_MIPMAP_TEXTURE_EXT"/>
+                <enum name="GLX_BIND_TO_TEXTURE_TARGETS_EXT"/>
+                <enum name="GLX_Y_INVERTED_EXT"/>
+                <enum name="GLX_TEXTURE_FORMAT_EXT"/>
+                <enum name="GLX_TEXTURE_TARGET_EXT"/>
+                <enum name="GLX_MIPMAP_TEXTURE_EXT"/>
+                <enum name="GLX_TEXTURE_FORMAT_NONE_EXT"/>
+                <enum name="GLX_TEXTURE_FORMAT_RGB_EXT"/>
+                <enum name="GLX_TEXTURE_FORMAT_RGBA_EXT"/>
+                <enum name="GLX_TEXTURE_1D_EXT"/>
+                <enum name="GLX_TEXTURE_2D_EXT"/>
+                <enum name="GLX_TEXTURE_RECTANGLE_EXT"/>
+                <enum name="GLX_FRONT_LEFT_EXT"/>
+                <enum name="GLX_FRONT_RIGHT_EXT"/>
+                <enum name="GLX_BACK_LEFT_EXT"/>
+                <enum name="GLX_BACK_RIGHT_EXT"/>
+                <enum name="GLX_FRONT_EXT"/>
+                <enum name="GLX_BACK_EXT"/>
+                <enum name="GLX_AUX0_EXT"/>
+                <enum name="GLX_AUX1_EXT"/>
+                <enum name="GLX_AUX2_EXT"/>
+                <enum name="GLX_AUX3_EXT"/>
+                <enum name="GLX_AUX4_EXT"/>
+                <enum name="GLX_AUX5_EXT"/>
+                <enum name="GLX_AUX6_EXT"/>
+                <enum name="GLX_AUX7_EXT"/>
+                <enum name="GLX_AUX8_EXT"/>
+                <enum name="GLX_AUX9_EXT"/>
+                <command name="glXBindTexImageEXT"/>
+                <command name="glXReleaseTexImageEXT"/>
             </require>
         </extension>
-<!--     Comment GLX_SGIX_dmbuffer out for the moment. The extension pulls in
-         the GLXPbufferSGIX <type> but then comments it out with #ifdef
-         _DM_BUFFER_H_, making it unavailable to later extensions. Need some
-         work on dependencies.
--->
-        <extension name="GLX_SGIX_dmbuffer" supported="glx" protect="_DM_BUFFER_H_">
+        <extension name="GLX_EXT_visual_info" supported="glx">
             <require>
-                <enum name="GLX_DIGITAL_MEDIA_PBUFFER_SGIX"/>
-                <command name="glXAssociateDMPbufferSGIX"/>
+                <enum name="GLX_X_VISUAL_TYPE_EXT"/>
+                <enum name="GLX_TRANSPARENT_TYPE_EXT"/>
+                <enum name="GLX_TRANSPARENT_INDEX_VALUE_EXT"/>
+                <enum name="GLX_TRANSPARENT_RED_VALUE_EXT"/>
+                <enum name="GLX_TRANSPARENT_GREEN_VALUE_EXT"/>
+                <enum name="GLX_TRANSPARENT_BLUE_VALUE_EXT"/>
+                <enum name="GLX_TRANSPARENT_ALPHA_VALUE_EXT"/>
+                <enum name="GLX_NONE_EXT"/>
+                <enum name="GLX_TRUE_COLOR_EXT"/>
+                <enum name="GLX_DIRECT_COLOR_EXT"/>
+                <enum name="GLX_PSEUDO_COLOR_EXT"/>
+                <enum name="GLX_STATIC_COLOR_EXT"/>
+                <enum name="GLX_GRAY_SCALE_EXT"/>
+                <enum name="GLX_STATIC_GRAY_EXT"/>
+                <enum name="GLX_TRANSPARENT_RGB_EXT"/>
+                <enum name="GLX_TRANSPARENT_INDEX_EXT"/>
             </require>
         </extension>
-<!--
--->
-        <extension name="GLX_SGIX_swap_group" supported="glx">
+        <extension name="GLX_EXT_visual_rating" supported="glx">
             <require>
-                <command name="glXJoinSwapGroupSGIX"/>
+                <enum name="GLX_VISUAL_CAVEAT_EXT"/>
+                <enum name="GLX_SLOW_VISUAL_EXT"/>
+                <enum name="GLX_NON_CONFORMANT_VISUAL_EXT"/>
+                <enum name="GLX_NONE_EXT"/>
             </require>
         </extension>
-        <extension name="GLX_SGIX_swap_barrier" supported="glx">
+        <extension name="GLX_INTEL_swap_event" supported="glx">
             <require>
-                <command name="glXBindSwapBarrierSGIX"/>
-                <command name="glXQueryMaxSwapBarriersSGIX"/>
+                <enum name="GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK"/>
+                <enum name="GLX_EXCHANGE_COMPLETE_INTEL"/>
+                <enum name="GLX_COPY_COMPLETE_INTEL"/>
+                <enum name="GLX_FLIP_COMPLETE_INTEL"/>
             </require>
         </extension>
-        <extension name="GLX_SUN_get_transparent_index" supported="glx">
+        <extension name="GLX_MESA_agp_offset" supported="glx">
             <require>
-                <command name="glXGetTransparentIndexSUN"/>
+                <command name="glXGetAGPOffsetMESA"/>
             </require>
         </extension>
         <extension name="GLX_MESA_copy_sub_buffer" supported="glx">
@@ -1788,6 +1771,26 @@ typedef unsigned __int64 uint64_t;
                 <command name="glXCreateGLXPixmapMESA"/>
             </require>
         </extension>
+        <extension name="GLX_MESA_query_renderer" supported="glx">
+            <require>
+                <enum name="GLX_RENDERER_VENDOR_ID_MESA"/>
+                <enum name="GLX_RENDERER_DEVICE_ID_MESA"/>
+                <enum name="GLX_RENDERER_VERSION_MESA"/>
+                <enum name="GLX_RENDERER_ACCELERATED_MESA"/>
+                <enum name="GLX_RENDERER_VIDEO_MEMORY_MESA"/>
+                <enum name="GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA"/>
+                <enum name="GLX_RENDERER_PREFERRED_PROFILE_MESA"/>
+                <enum name="GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA"/>
+                <enum name="GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA"/>
+                <enum name="GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA"/>
+                <enum name="GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA"/>
+                <enum name="GLX_RENDERER_ID_MESA"/>
+                <command name="glXQueryCurrentRendererIntegerMESA"/>
+                <command name="glXQueryCurrentRendererStringMESA"/>
+                <command name="glXQueryRendererIntegerMESA"/>
+                <command name="glXQueryRendererStringMESA"/>
+            </require>
+        </extension>
         <extension name="GLX_MESA_release_buffers" supported="glx">
             <require>
                 <command name="glXReleaseBuffersMESA"/>
@@ -1800,26 +1803,9 @@ typedef unsigned __int64 uint64_t;
                 <command name="glXSet3DfxModeMESA"/>
             </require>
         </extension>
-        <extension name="GLX_SGIX_visual_select_group" supported="glx">
-            <require>
-                <enum name="GLX_VISUAL_SELECT_GROUP_SGIX"/>
-            </require>
-        </extension>
-        <extension name="GLX_OML_swap_method" supported="glx">
-            <require>
-                <enum name="GLX_SWAP_METHOD_OML"/>
-                <enum name="GLX_SWAP_EXCHANGE_OML"/>
-                <enum name="GLX_SWAP_COPY_OML"/>
-                <enum name="GLX_SWAP_UNDEFINED_OML"/>
-            </require>
-        </extension>
-        <extension name="GLX_OML_sync_control" supported="glx">
+        <extension name="GLX_NV_copy_image" supported="glx">
             <require>
-                <command name="glXGetSyncValuesOML"/>
-                <command name="glXGetMscRateOML"/>
-                <command name="glXSwapBuffersMscOML"/>
-                <command name="glXWaitForMscOML"/>
-                <command name="glXWaitForSbcOML"/>
+                <command name="glXCopyImageSubDataNV"/>
             </require>
         </extension>
         <extension name="GLX_NV_delay_before_swap" supported="glx">
@@ -1832,92 +1818,39 @@ typedef unsigned __int64 uint64_t;
                 <enum name="GLX_FLOAT_COMPONENTS_NV"/>
             </require>
         </extension>
-        <extension name="GLX_SGIX_hyperpipe" supported="glx">
-            <require>
-                <type name="GLXHyperpipeNetworkSGIX"/>
-                <type name="GLXHyperpipeConfigSGIX"/>
-                <type name="GLXPipeRect"/>
-                <type name="GLXPipeRectLimits"/>
-                <enum name="GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX"/>
-                <enum name="GLX_BAD_HYPERPIPE_CONFIG_SGIX"/>
-                <enum name="GLX_BAD_HYPERPIPE_SGIX"/>
-                <enum name="GLX_HYPERPIPE_DISPLAY_PIPE_SGIX"/>
-                <enum name="GLX_HYPERPIPE_RENDER_PIPE_SGIX"/>
-                <enum name="GLX_PIPE_RECT_SGIX"/>
-                <enum name="GLX_PIPE_RECT_LIMITS_SGIX"/>
-                <enum name="GLX_HYPERPIPE_STEREO_SGIX"/>
-                <enum name="GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX"/>
-                <enum name="GLX_HYPERPIPE_ID_SGIX"/>
-                <command name="glXQueryHyperpipeNetworkSGIX"/>
-                <command name="glXHyperpipeConfigSGIX"/>
-                <command name="glXQueryHyperpipeConfigSGIX"/>
-                <command name="glXDestroyHyperpipeConfigSGIX"/>
-                <command name="glXBindHyperpipeSGIX"/>
-                <command name="glXQueryHyperpipeBestAttribSGIX"/>
-                <command name="glXHyperpipeAttribSGIX"/>
-                <command name="glXQueryHyperpipeAttribSGIX"/>
-            </require>
-        </extension>
-        <extension name="GLX_MESA_agp_offset" supported="glx">
-            <require>
-                <command name="glXGetAGPOffsetMESA"/>
-            </require>
-        </extension>
-        <extension name="GLX_EXT_fbconfig_packed_float" supported="glx">
+        <extension name="GLX_NV_multisample_coverage" supported="glx">
             <require>
-                <enum name="GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT"/>
-                <enum name="GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT"/>
+                <enum name="GLX_COVERAGE_SAMPLES_NV"/>
+                <enum name="GLX_COLOR_SAMPLES_NV"/>
             </require>
         </extension>
-        <extension name="GLX_EXT_framebuffer_sRGB" supported="glx">
+        <extension name="GLX_NV_present_video" supported="glx">
             <require>
-                <enum name="GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT"/>
+                <enum name="GLX_NUM_VIDEO_SLOTS_NV"/>
+                <command name="glXEnumerateVideoDevicesNV"/>
+                <command name="glXBindVideoDeviceNV"/>
             </require>
         </extension>
-        <extension name="GLX_EXT_texture_from_pixmap" supported="glx">
+        <extension name="GLX_NV_swap_group" supported="glx">
             <require>
-                <enum name="GLX_TEXTURE_1D_BIT_EXT"/>
-                <enum name="GLX_TEXTURE_2D_BIT_EXT"/>
-                <enum name="GLX_TEXTURE_RECTANGLE_BIT_EXT"/>
-                <enum name="GLX_BIND_TO_TEXTURE_RGB_EXT"/>
-                <enum name="GLX_BIND_TO_TEXTURE_RGBA_EXT"/>
-                <enum name="GLX_BIND_TO_MIPMAP_TEXTURE_EXT"/>
-                <enum name="GLX_BIND_TO_TEXTURE_TARGETS_EXT"/>
-                <enum name="GLX_Y_INVERTED_EXT"/>
-                <enum name="GLX_TEXTURE_FORMAT_EXT"/>
-                <enum name="GLX_TEXTURE_TARGET_EXT"/>
-                <enum name="GLX_MIPMAP_TEXTURE_EXT"/>
-                <enum name="GLX_TEXTURE_FORMAT_NONE_EXT"/>
-                <enum name="GLX_TEXTURE_FORMAT_RGB_EXT"/>
-                <enum name="GLX_TEXTURE_FORMAT_RGBA_EXT"/>
-                <enum name="GLX_TEXTURE_1D_EXT"/>
-                <enum name="GLX_TEXTURE_2D_EXT"/>
-                <enum name="GLX_TEXTURE_RECTANGLE_EXT"/>
-                <enum name="GLX_FRONT_LEFT_EXT"/>
-                <enum name="GLX_FRONT_RIGHT_EXT"/>
-                <enum name="GLX_BACK_LEFT_EXT"/>
-                <enum name="GLX_BACK_RIGHT_EXT"/>
-                <enum name="GLX_FRONT_EXT"/>
-                <enum name="GLX_BACK_EXT"/>
-                <enum name="GLX_AUX0_EXT"/>
-                <enum name="GLX_AUX1_EXT"/>
-                <enum name="GLX_AUX2_EXT"/>
-                <enum name="GLX_AUX3_EXT"/>
-                <enum name="GLX_AUX4_EXT"/>
-                <enum name="GLX_AUX5_EXT"/>
-                <enum name="GLX_AUX6_EXT"/>
-                <enum name="GLX_AUX7_EXT"/>
-                <enum name="GLX_AUX8_EXT"/>
-                <enum name="GLX_AUX9_EXT"/>
-                <command name="glXBindTexImageEXT"/>
-                <command name="glXReleaseTexImageEXT"/>
+                <command name="glXJoinSwapGroupNV"/>
+                <command name="glXBindSwapBarrierNV"/>
+                <command name="glXQuerySwapGroupNV"/>
+                <command name="glXQueryMaxSwapGroupsNV"/>
+                <command name="glXQueryFrameCountNV"/>
+                <command name="glXResetFrameCountNV"/>
             </require>
         </extension>
-        <extension name="GLX_NV_present_video" supported="glx">
+        <extension name="GLX_NV_video_capture" supported="glx">
             <require>
-                <enum name="GLX_NUM_VIDEO_SLOTS_NV"/>
-                <command name="glXEnumerateVideoDevicesNV"/>
-                <command name="glXBindVideoDeviceNV"/>
+                <enum name="GLX_DEVICE_ID_NV"/>
+                <enum name="GLX_UNIQUE_ID_NV"/>
+                <enum name="GLX_NUM_VIDEO_CAPTURE_SLOTS_NV"/>
+                <command name="glXBindVideoCaptureDeviceNV"/>
+                <command name="glXEnumerateVideoCaptureDevicesNV"/>
+                <command name="glXLockVideoCaptureDeviceNV"/>
+                <command name="glXQueryVideoCaptureDeviceNV"/>
+                <command name="glXReleaseVideoCaptureDeviceNV"/>
             </require>
         </extension>
         <extension name="GLX_NV_video_output" supported="glx">
@@ -1940,106 +1873,185 @@ typedef unsigned __int64 uint64_t;
                 <command name="glXGetVideoInfoNV"/>
             </require>
         </extension>
-        <extension name="GLX_NV_swap_group" supported="glx">
+        <extension name="GLX_OML_swap_method" supported="glx">
             <require>
-                <command name="glXJoinSwapGroupNV"/>
-                <command name="glXBindSwapBarrierNV"/>
-                <command name="glXQuerySwapGroupNV"/>
-                <command name="glXQueryMaxSwapGroupsNV"/>
-                <command name="glXQueryFrameCountNV"/>
-                <command name="glXResetFrameCountNV"/>
+                <enum name="GLX_SWAP_METHOD_OML"/>
+                <enum name="GLX_SWAP_EXCHANGE_OML"/>
+                <enum name="GLX_SWAP_COPY_OML"/>
+                <enum name="GLX_SWAP_UNDEFINED_OML"/>
             </require>
         </extension>
-        <extension name="GLX_NV_video_capture" supported="glx">
+        <extension name="GLX_OML_sync_control" supported="glx">
             <require>
-                <enum name="GLX_DEVICE_ID_NV"/>
-                <enum name="GLX_UNIQUE_ID_NV"/>
-                <enum name="GLX_NUM_VIDEO_CAPTURE_SLOTS_NV"/>
-                <command name="glXBindVideoCaptureDeviceNV"/>
-                <command name="glXEnumerateVideoCaptureDevicesNV"/>
-                <command name="glXLockVideoCaptureDeviceNV"/>
-                <command name="glXQueryVideoCaptureDeviceNV"/>
-                <command name="glXReleaseVideoCaptureDeviceNV"/>
+                <command name="glXGetSyncValuesOML"/>
+                <command name="glXGetMscRateOML"/>
+                <command name="glXSwapBuffersMscOML"/>
+                <command name="glXWaitForMscOML"/>
+                <command name="glXWaitForSbcOML"/>
             </require>
         </extension>
-        <extension name="GLX_EXT_swap_control" supported="glx">
+        <extension name="GLX_SGI_cushion" supported="glx">
             <require>
-                <enum name="GLX_SWAP_INTERVAL_EXT"/>
-                <enum name="GLX_MAX_SWAP_INTERVAL_EXT"/>
-                <command name="glXSwapIntervalEXT"/>
+                <command name="glXCushionSGI"/>
             </require>
         </extension>
-        <extension name="GLX_NV_copy_image" supported="glx">
+        <extension name="GLX_SGI_make_current_read" supported="glx">
             <require>
-                <command name="glXCopyImageSubDataNV"/>
+                <command name="glXMakeCurrentReadSGI"/>
+                <command name="glXGetCurrentReadDrawableSGI"/>
             </require>
         </extension>
-        <extension name="GLX_INTEL_swap_event" supported="glx">
+        <extension name="GLX_SGI_swap_control" supported="glx">
             <require>
-                <enum name="GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK"/>
-                <enum name="GLX_EXCHANGE_COMPLETE_INTEL"/>
-                <enum name="GLX_COPY_COMPLETE_INTEL"/>
-                <enum name="GLX_FLIP_COMPLETE_INTEL"/>
+                <command name="glXSwapIntervalSGI"/>
             </require>
         </extension>
-        <extension name="GLX_NV_multisample_coverage" supported="glx">
+        <extension name="GLX_SGI_video_sync" supported="glx">
             <require>
-                <enum name="GLX_COVERAGE_SAMPLES_NV"/>
-                <enum name="GLX_COLOR_SAMPLES_NV"/>
+                <command name="glXGetVideoSyncSGI"/>
+                <command name="glXWaitVideoSyncSGI"/>
             </require>
         </extension>
-        <extension name="GLX_AMD_gpu_association" supported="glx">
+        <extension name="GLX_SGIS_blended_overlay" supported="glx">
             <require>
-                <enum name="GLX_GPU_VENDOR_AMD"/>
-                <enum name="GLX_GPU_RENDERER_STRING_AMD"/>
-                <enum name="GLX_GPU_OPENGL_VERSION_STRING_AMD"/>
-                <enum name="GLX_GPU_FASTEST_TARGET_GPUS_AMD"/>
-                <enum name="GLX_GPU_RAM_AMD"/>
-                <enum name="GLX_GPU_CLOCK_AMD"/>
-                <enum name="GLX_GPU_NUM_PIPES_AMD"/>
-                <enum name="GLX_GPU_NUM_SIMD_AMD"/>
-                <enum name="GLX_GPU_NUM_RB_AMD"/>
-                <enum name="GLX_GPU_NUM_SPI_AMD"/>
+                <enum name="GLX_BLENDED_RGBA_SGIS"/>
             </require>
         </extension>
-        <extension name="GLX_EXT_create_context_es_profile" supported="glx">
+        <extension name="GLX_SGIS_multisample" supported="glx">
             <require>
-                <enum name="GLX_CONTEXT_ES_PROFILE_BIT_EXT"/>
+                <enum name="GLX_SAMPLE_BUFFERS_SGIS"/>
+                <enum name="GLX_SAMPLES_SGIS"/>
             </require>
         </extension>
-        <extension name="GLX_EXT_create_context_es2_profile" supported="glx">
+        <extension name="GLX_SGIS_shared_multisample" supported="glx">
             <require>
-                <enum name="GLX_CONTEXT_ES2_PROFILE_BIT_EXT"/>
+                <enum name="GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS"/>
+                <enum name="GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS"/>
             </require>
         </extension>
-        <extension name="GLX_EXT_swap_control_tear" supported="glx">
+        <extension name="GLX_SGIX_dmbuffer" supported="glx" protect="_DM_BUFFER_H_">
             <require>
-                <enum name="GLX_LATE_SWAPS_TEAR_EXT"/>
+                <enum name="GLX_DIGITAL_MEDIA_PBUFFER_SGIX"/>
+                <command name="glXAssociateDMPbufferSGIX"/>
             </require>
         </extension>
-        <extension name="GLX_EXT_buffer_age" supported="glx">
+        <extension name="GLX_SGIX_fbconfig" supported="glx">
             <require>
-                <enum name="GLX_BACK_BUFFER_AGE_EXT"/>
+                <enum name="GLX_WINDOW_BIT_SGIX"/>
+                <enum name="GLX_PIXMAP_BIT_SGIX"/>
+                <enum name="GLX_RGBA_BIT_SGIX"/>
+                <enum name="GLX_COLOR_INDEX_BIT_SGIX"/>
+                <enum name="GLX_DRAWABLE_TYPE_SGIX"/>
+                <enum name="GLX_RENDER_TYPE_SGIX"/>
+                <enum name="GLX_X_RENDERABLE_SGIX"/>
+                <enum name="GLX_FBCONFIG_ID_SGIX"/>
+                <enum name="GLX_RGBA_TYPE_SGIX"/>
+                <enum name="GLX_COLOR_INDEX_TYPE_SGIX"/>
+                <enum name="GLX_SCREEN_EXT"/>
+                <command name="glXGetFBConfigAttribSGIX"/>
+                <command name="glXChooseFBConfigSGIX"/>
+                <command name="glXCreateGLXPixmapWithConfigSGIX"/>
+                <command name="glXCreateContextWithConfigSGIX"/>
+                <command name="glXGetVisualFromFBConfigSGIX"/>
+                <command name="glXGetFBConfigFromVisualSGIX"/>
             </require>
         </extension>
-        <extension name="GLX_MESA_query_renderer" supported="glx">
+        <extension name="GLX_SGIX_hyperpipe" supported="glx">
             <require>
-                <enum name="GLX_RENDERER_VENDOR_ID_MESA"/>                               
-                <enum name="GLX_RENDERER_DEVICE_ID_MESA"/>                               
-                <enum name="GLX_RENDERER_VERSION_MESA"/>                                 
-                <enum name="GLX_RENDERER_ACCELERATED_MESA"/>                             
-                <enum name="GLX_RENDERER_VIDEO_MEMORY_MESA"/>                            
-                <enum name="GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA"/>             
-                <enum name="GLX_RENDERER_PREFERRED_PROFILE_MESA"/>                       
-                <enum name="GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA"/>             
-                <enum name="GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA"/>    
-                <enum name="GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA"/>               
-                <enum name="GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA"/>              
-                <enum name="GLX_RENDERER_ID_MESA"/>                                      
-                <command name="glXQueryCurrentRendererIntegerMESA"/>
-                <command name="glXQueryCurrentRendererStringMESA"/>
-                <command name="glXQueryRendererIntegerMESA"/>
-                <command name="glXQueryRendererStringMESA"/>
+                <type name="GLXHyperpipeNetworkSGIX"/>
+                <type name="GLXHyperpipeConfigSGIX"/>
+                <type name="GLXPipeRect"/>
+                <type name="GLXPipeRectLimits"/>
+                <enum name="GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX"/>
+                <enum name="GLX_BAD_HYPERPIPE_CONFIG_SGIX"/>
+                <enum name="GLX_BAD_HYPERPIPE_SGIX"/>
+                <enum name="GLX_HYPERPIPE_DISPLAY_PIPE_SGIX"/>
+                <enum name="GLX_HYPERPIPE_RENDER_PIPE_SGIX"/>
+                <enum name="GLX_PIPE_RECT_SGIX"/>
+                <enum name="GLX_PIPE_RECT_LIMITS_SGIX"/>
+                <enum name="GLX_HYPERPIPE_STEREO_SGIX"/>
+                <enum name="GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX"/>
+                <enum name="GLX_HYPERPIPE_ID_SGIX"/>
+                <command name="glXQueryHyperpipeNetworkSGIX"/>
+                <command name="glXHyperpipeConfigSGIX"/>
+                <command name="glXQueryHyperpipeConfigSGIX"/>
+                <command name="glXDestroyHyperpipeConfigSGIX"/>
+                <command name="glXBindHyperpipeSGIX"/>
+                <command name="glXQueryHyperpipeBestAttribSGIX"/>
+                <command name="glXHyperpipeAttribSGIX"/>
+                <command name="glXQueryHyperpipeAttribSGIX"/>
+            </require>
+        </extension>
+        <extension name="GLX_SGIX_pbuffer" supported="glx">
+            <require>
+                <enum name="GLX_PBUFFER_BIT_SGIX"/>
+                <enum name="GLX_BUFFER_CLOBBER_MASK_SGIX"/>
+                <enum name="GLX_FRONT_LEFT_BUFFER_BIT_SGIX"/>
+                <enum name="GLX_FRONT_RIGHT_BUFFER_BIT_SGIX"/>
+                <enum name="GLX_BACK_LEFT_BUFFER_BIT_SGIX"/>
+                <enum name="GLX_BACK_RIGHT_BUFFER_BIT_SGIX"/>
+                <enum name="GLX_AUX_BUFFERS_BIT_SGIX"/>
+                <enum name="GLX_DEPTH_BUFFER_BIT_SGIX"/>
+                <enum name="GLX_STENCIL_BUFFER_BIT_SGIX"/>
+                <enum name="GLX_ACCUM_BUFFER_BIT_SGIX"/>
+                <enum name="GLX_SAMPLE_BUFFERS_BIT_SGIX"/>
+                <enum name="GLX_MAX_PBUFFER_WIDTH_SGIX"/>
+                <enum name="GLX_MAX_PBUFFER_HEIGHT_SGIX"/>
+                <enum name="GLX_MAX_PBUFFER_PIXELS_SGIX"/>
+                <enum name="GLX_OPTIMAL_PBUFFER_WIDTH_SGIX"/>
+                <enum name="GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX"/>
+                <enum name="GLX_PRESERVED_CONTENTS_SGIX"/>
+                <enum name="GLX_LARGEST_PBUFFER_SGIX"/>
+                <enum name="GLX_WIDTH_SGIX"/>
+                <enum name="GLX_HEIGHT_SGIX"/>
+                <enum name="GLX_EVENT_MASK_SGIX"/>
+                <enum name="GLX_DAMAGED_SGIX"/>
+                <enum name="GLX_SAVED_SGIX"/>
+                <enum name="GLX_WINDOW_SGIX"/>
+                <enum name="GLX_PBUFFER_SGIX"/>
+                <command name="glXCreateGLXPbufferSGIX"/>
+                <command name="glXDestroyGLXPbufferSGIX"/>
+                <command name="glXQueryGLXPbufferSGIX"/>
+                <command name="glXSelectEventSGIX"/>
+                <command name="glXGetSelectedEventSGIX"/>
+            </require>
+        </extension>
+        <extension name="GLX_SGIX_swap_barrier" supported="glx">
+            <require>
+                <command name="glXBindSwapBarrierSGIX"/>
+                <command name="glXQueryMaxSwapBarriersSGIX"/>
+            </require>
+        </extension>
+        <extension name="GLX_SGIX_swap_group" supported="glx">
+            <require>
+                <command name="glXJoinSwapGroupSGIX"/>
+            </require>
+        </extension>
+        <extension name="GLX_SGIX_video_resize" supported="glx">
+            <require>
+                <enum name="GLX_SYNC_FRAME_SGIX"/>
+                <enum name="GLX_SYNC_SWAP_SGIX"/>
+                <command name="glXBindChannelToWindowSGIX"/>
+                <command name="glXChannelRectSGIX"/>
+                <command name="glXQueryChannelRectSGIX"/>
+                <command name="glXQueryChannelDeltasSGIX"/>
+                <command name="glXChannelRectSyncSGIX"/>
+            </require>
+        </extension>
+        <extension name="GLX_SGIX_video_source" supported="glx" protect="_VL_H">
+            <require>
+                <command name="glXCreateGLXVideoSourceSGIX"/>
+                <command name="glXDestroyGLXVideoSourceSGIX"/>
+            </require>
+        </extension>
+        <extension name="GLX_SGIX_visual_select_group" supported="glx">
+            <require>
+                <enum name="GLX_VISUAL_SELECT_GROUP_SGIX"/>
+            </require>
+        </extension>
+        <extension name="GLX_SUN_get_transparent_index" supported="glx">
+            <require>
+                <command name="glXGetTransparentIndexSUN"/>
             </require>
         </extension>
     </extensions>