Remove the ATI_envmap_bumpmap extension
[mesa.git] / src / mapi / glapi / gen / gl_API.xml
index 3ffa81787562416ff56f0f184363ca7497e91d46..882e66e0bbd0a5cc07550f91e164fca79b0db8d6 100644 (file)
         <param name="index" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="CompileShader" es2="2.0" offset="assign">
         <param name="shader" type="GLuint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="CreateProgram" offset="assign" es2="2.0">
         <param name="type" type="GLenum *" output="true"/>
         <param name="name" type="GLchar *" output="true"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="GetActiveUniform" es2="2.0" offset="assign">
         <param name="type" type="GLenum *" output="true"/>
         <param name="name" type="GLchar *" output="true"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="GetAttachedShaders" offset="assign" es2="2.0">
         <param name="name" type="const GLchar *"/>
         <return type="GLint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="GetProgramiv" offset="assign" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLint *"/>
+        <param name="params" type="GLint *" output="true"/>
         <glx ignore="true"/>
     </function>
 
         <param name="length" type="GLsizei *" output="true"/>
         <param name="source" type="GLchar *" output="true"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="GetUniformLocation"
         <param name="name" type="const GLchar *"/>
         <return type="GLint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="GetUniformfv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="params" type="GLfloat *" output="true"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="GetUniformiv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="params" type="GLint *" output="true"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="GetVertexAttribdv" offset="assign">
     <function name="LinkProgram" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="ShaderSource" es2="2.0" offset="assign">
         <param name="string" type="const GLchar * const *"/>
         <param name="length" type="const GLint *"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="UseProgram" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="Uniform1f" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform2f" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <param name="v1" type="GLfloat"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform3f" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v1" type="GLfloat"/>
         <param name="v2" type="GLfloat"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform4f" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v2" type="GLfloat"/>
         <param name="v3" type="GLfloat"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="Uniform1i" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform2i" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <param name="v1" type="GLint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform3i" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v1" type="GLint"/>
         <param name="v2" type="GLint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform4i" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v2" type="GLint"/>
         <param name="v3" type="GLint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="Uniform1fv" es2="2.0" offset="assign">
         <param name="count" type="GLsizei" counter="true"/>
         <param name="value" type="const GLfloat *" count="count"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform2fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei" counter="true"/>
         <param name="value" type="const GLfloat *" count="count" count_scale="2"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform3fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei" counter="true"/>
         <param name="value" type="const GLfloat *" count="count" count_scale="3"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform4fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei" counter="true"/>
         <param name="value" type="const GLfloat *" count="count" count_scale="4"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="Uniform1iv" es2="2.0" offset="assign">
         <param name="count" type="GLsizei" counter="true"/>
         <param name="value" type="const GLint *" count="count"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform2iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei" counter="true"/>
         <param name="value" type="const GLint *" count="count" count_scale="2"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform3iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei" counter="true"/>
         <param name="value" type="const GLint *" count="count" count_scale="3"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="Uniform4iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei" counter="true"/>
         <param name="value" type="const GLint *" count="count" count_scale="4"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="UniformMatrix2fv" es2="2.0" offset="assign">
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *" count="count" count_scale="4"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="UniformMatrix3fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *" count="count" count_scale="9"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
     <function name="UniformMatrix4fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *" count="count" count_scale="16"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="ValidateProgram" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="VertexAttrib1d" offset="assign">
 <xi:include href="ARB_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="AMD_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<!-- 70. GL_ARB_sample_shading -->
+<xi:include href="ARB_sample_shading.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="ARB_texture_cube_map_array.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="ARB_texture_gather.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <!-- 73. GL_ARB_texture_query_lod -->
 
 <!-- ARB extensions #86...#93 -->
 
+<xi:include href="ARB_draw_indirect.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_gpu_shader5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <category name="GL_ARB_transform_feedback3" number="94">
   <enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/>
   <enum name="MAX_VERTEX_STREAMS"             value="0x8E71"/>
   </function>
 </category>
 
-<!-- ARB extensions #95...#108 -->
+<!-- ARB extensions #95...#96 -->
+
+<xi:include href="ARB_separate_shader_objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #98...#108 -->
 
 <xi:include href="ARB_ES2_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   </function>
 </category>
 
-<!-- ARB extensions #110...#116 -->
+<xi:include href="ARB_compressed_texture_pixel_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #111...#116 -->
 
 <xi:include href="ARB_internalformat_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <enum name="MIN_MAP_BUFFER_ALIGNMENT" value="0x90BC" />
 </category>
 
+<xi:include href="ARB_shader_atomic_counters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_shader_image_load_store.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- ARB extension #118 -->
 
-<category name="GL_KHR_debug" number="119">
-  <enum name="DEBUG_OUTPUT"                               value="0x92E0"/>
-  <enum name="DEBUG_OUTPUT_SYNCHRONOUS"                   value="0x8242"/>
-
-  <enum name="CONTEXT_FLAG_DEBUG_BIT"                     value="0x00000002"/>
-
-  <enum name="MAX_DEBUG_MESSAGE_LENGTH" count="1"         value="0x9143">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="MAX_DEBUG_LOGGED_MESSAGES" count="1"        value="0x9144">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="DEBUG_LOGGED_MESSAGES" count="1"            value="0x9145">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="DEBUG_NEXT_LOGGED_MESSAGE_LENGTH" count="1" value="0x8243">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="MAX_DEBUG_GROUP_STACK_DEPTH" count="1"      value="0x826C">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="DEBUG_GROUP_STACK_DEPTH" count="1"          value="0x826D">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="MAX_LABEL_LENGTH" count="1"                 value="0x82E8">
-    <size name="Get" mode="get"/>
-  </enum>
-
-  <enum name="DEBUG_CALLBACK_FUNCTION" count="1"          value="0x8244">
-     <size name="GetPointerv" mode="get"/>
-  </enum>
-  <enum name="DEBUG_CALLBACK_USER_PARAM" count="1"        value="0x8245">
-    <size name="GetPointerv" mode="get"/>
-  </enum>
-
-  <enum name="DEBUG_SOURCE_API"                           value="0x8246"/>
-  <enum name="DEBUG_SOURCE_WINDOW_SYSTEM"                 value="0x8247"/>
-  <enum name="DEBUG_SOURCE_SHADER_COMPILER"               value="0x8248"/>
-  <enum name="DEBUG_SOURCE_THIRD_PARTY"                   value="0x8249"/>
-  <enum name="DEBUG_SOURCE_APPLICATION"                   value="0x824A"/>
-  <enum name="DEBUG_SOURCE_OTHER"                         value="0x824B"/>
-
-  <enum name="DEBUG_TYPE_ERROR"                           value="0x824C"/>
-  <enum name="DEBUG_TYPE_DEPRECATED_BEHAVIOR"             value="0x824D"/>
-  <enum name="DEBUG_TYPE_UNDEFINED_BEHAVIOR"              value="0x824E"/>
-  <enum name="DEBUG_TYPE_PORTABILITY"                     value="0x824F"/>
-  <enum name="DEBUG_TYPE_PERFORMANCE"                     value="0x8250"/>
-  <enum name="DEBUG_TYPE_OTHER"                           value="0x8251"/>
-  <enum name="DEBUG_TYPE_MARKER"                          value="0x8268"/>
-
-  <enum name="DEBUG_TYPE_PUSH_GROUP"                      value="0x8269"/>
-  <enum name="DEBUG_TYPE_POP_GROUP"                       value="0x826A"/>
-
-  <enum name="DEBUG_SEVERITY_HIGH"                        value="0x9146"/>
-  <enum name="DEBUG_SEVERITY_MEDIUM"                      value="0x9147"/>
-  <enum name="DEBUG_SEVERITY_LOW"                         value="0x9148"/>
-  <enum name="DEBUG_SEVERITY_NOTIFICATION"                value="0x826B"/>
-
-  <enum name="STACK_UNDERFLOW"                            value="0x0504"/>
-  <enum name="STACK_OVERFLOW"                             value="0x0503"/>
-
-  <enum name="BUFFER"                                     value="0x82E0"/>
-  <enum name="SHADER"                                     value="0x82E1"/>
-  <enum name="PROGRAM"                                    value="0x82E2"/>
-  <enum name="QUERY"                                      value="0x82E3"/>
-  <enum name="PROGRAM_PIPELINE"                           value="0x82E4"/>
-  <enum name="SAMPLER"                                    value="0x82E6"/>
-  <!-- Compatibility Profile -->
-  <enum name="DISPLAY_LIST"                               value="0x82E7"/>
-
-  <function name="DebugMessageControl" offset="assign">
-    <param name="source" type="GLenum"/>
-    <param name="type" type="GLenum"/>
-    <param name="severity" type="GLenum"/>
-    <param name="count" type="GLsizei" counter="true"/>
-    <param name="ids" type="const GLuint *" count="count"/>
-    <param name="enabled" type="GLboolean"/>
-  </function>
+<xi:include href="KHR_debug.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <function name="DebugMessageInsert" offset="assign">
-    <param name="source" type="GLenum"/>
-    <param name="type" type="GLenum"/>
-    <param name="id" type="GLuint"/>
-    <param name="severity" type="GLenum"/>
-    <param name="length" type="GLsizei"/>
-    <param name="buf" type="const GLchar *"/>
-  </function>
+<!-- ARB extension #120 -->
 
-  <function name="DebugMessageCallback" offset="assign">
-    <param name="callback" type="GLDEBUGPROC"/>
-    <param name="userParam" type="const GLvoid *"/>
-  </function>
+<xi:include href="ARB_clear_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <function name="GetDebugMessageLog" offset="assign">
-    <return type="GLuint"/>
-    <param name="count" type="GLuint"/>
-    <param name="bufsize" type="GLsizei"/>
-    <param name="sources" type="GLenum *" output="true"/>
-    <param name="types" type="GLenum *" output="true"/>
-    <param name="ids" type="GLuint *" output="true"/>
-    <param name="severities" type="GLenum *" output="true"/>
-    <param name="lengths" type="GLsizei *" output="true"/>
-    <param name="messageLog" type="GLchar *" output="true"/>
-  </function>
+<xi:include href="ARB_compute_shader.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <function name="PushDebugGroup" offset="assign">
-    <param name="source" type="GLenum"/>
-    <param name="id" type="GLuint"/>
-    <param name="length" type="GLsizei"/>
-    <param name="message" type="const GLchar *"/>
-  </function>
+<!-- ARB extension #123 -->
 
-  <function name="PopDebugGroup" offset="assign"/>
+<xi:include href="ARB_texture_view.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <function name="ObjectLabel" offset="assign">
-    <param name="identifier" type="GLenum"/>
-    <param name="name" type="GLuint"/>
-    <param name="length" type="GLsizei"/>
-    <param name="label" type="const GLchar *"/>
-  </function>
+<xi:include href="ARB_vertex_attrib_binding.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <function name="GetObjectLabel" offset="assign">
-    <param name="identifier" type="GLenum"/>
-    <param name="name" type="GLuint"/>
-    <param name="bufSize" type="GLsizei"/>
-    <param name="length" type="GLsizei *"/>
-    <param name="label" type="GLchar *"/>
-  </function>
+<!-- ARB extension #126 -->
 
-  <function name="ObjectPtrLabel" offset="assign">
-    <param name="ptr" type="const GLvoid *"/>
-    <param name="length" type="GLsizei"/>
-    <param name="label" type="const GLchar *"/>
-  </function>
+<xi:include href="ARB_ES3_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <function name="GetObjectPtrLabel" offset="assign">
-    <param name="ptr" type="const GLvoid *"/>
-    <param name="bufSize" type="GLsizei"/>
-    <param name="length" type="GLsizei *"/>
-    <param name="label" type="GLchar *"/>
-  </function>
+<!-- ARB extension #128 -->
 
+<category name="GL_ARB_fragment_layer_viewport" number="129">
+    <!-- No new functions, types, enums. -->
 </category>
 
-<!-- ARB extensions #120...#126 -->
-
-<xi:include href="ARB_ES3_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- ARB extensions #130..#131 -->
 
-<!-- ARB extensions #128...#131 -->
+<category name="GL_ARB_explicit_uniform_location" number="128">
+    <enum name="MAX_UNIFORM_LOCATIONS" count="1" value="0x826E" >
+        <size name="Get" mode="get"/>
+    </enum>
+</category>
 
 <xi:include href="ARB_invalidate_subdata.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<!-- ARB extensions #133...#138 -->
+<!-- ARB extension #133 is ARB_multi_draw_indirect, defined in the same
+     file as ARB_draw_indirect -->
+
+<!-- ARB extensions #134...#138 -->
 
 <xi:include href="ARB_texture_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 
 <xi:include href="ARB_texture_storage_multisample.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<!-- ARB extension 142 - 143. -->
+
+<category name="GL_ARB_buffer_storage" number="144">
+    <enum name="MAP_PERSISTENT_BIT" value="0x40" />
+    <enum name="MAP_COHERENT_BIT" value="0x80" />
+    <enum name="DYNAMIC_STORAGE_BIT" value="0x100" />
+    <enum name="CLIENT_STORAGE_BIT" value="0x200" />
+    <enum name="BUFFER_IMMUTABLE_STORAGE" value="0x821F" />
+    <enum name="BUFFER_STORAGE_FLAGS" value="0x8220" />
+    <enum name="CLIENT_MAPPED_BUFFER_BARRIER_BIT" value="0x4000" />
+
+    <function name="BufferStorage" offset="assign">
+        <param name="target" type="GLenum"/>
+        <param name="size" type="GLsizeiptr"/>
+        <param name="data" type="const GLvoid *"/>
+        <param name="flags" type="GLbitfield"/>
+    </function>
+</category>
+
+<!-- ARB extensions #145...#146 -->
+
+<xi:include href="ARB_multi_bind.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- Non-ARB extensions sorted by extension number. -->
 
 <category name="GL_EXT_blend_color" number="2">
 </category>
 
 <!-- Extension number 99 is not listed in the extension registry. -->
-<!-- Extension number 100 is a GLU extension. -->
+<xi:include href="ARB_viewport_array.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- Shouldn't this be EXT_fragment_lighting? -->
 <category name="GL_SGIX_fragment_lighting" number="102">
         <size name="GetTexEnviv" mode="get"/>
         <size name="GetTexEnvfv" mode="get"/>
     </enum>
-    <function name="TexBumpParameterfvATI" offset="assign" deprecated="3.1">
+    <function name="TexBumpParameterfvATI" offset="assign" deprecated="3.1" exec="skip">
       <param name="pname" type="GLenum"/>
       <param name="param" type="const GLfloat *" variable_param="pname"/>
       <glx ignore="true"/>
     </function>
-    <function name="TexBumpParameterivATI" offset="assign" deprecated="3.1">
+    <function name="TexBumpParameterivATI" offset="assign" deprecated="3.1" exec="skip">
       <param name="pname" type="GLenum"/>
       <param name="param" type="const GLint *" variable_param="pname"/>
       <glx ignore="true"/>
     </function>
-    <function name="GetTexBumpParameterfvATI" offset="assign" deprecated="3.1">
+    <function name="GetTexBumpParameterfvATI" offset="assign" deprecated="3.1" exec="skip">
       <param name="pname" type="GLenum"/>
       <param name="param" type="GLfloat *" variable_param="pname"/>
       <glx ignore="true"/>
     </function>
-    <function name="GetTexBumpParameterivATI" offset="assign" deprecated="3.1">
+    <function name="GetTexBumpParameterivATI" offset="assign" deprecated="3.1" exec="skip">
       <param name="pname" type="GLenum"/>
       <param name="param" type="GLint *" variable_param="pname"/>
       <glx ignore="true"/>
     <enum name="SKIP_DECODE_EXT"                      value="0x8A4A"/>
 </category>
 
+<xi:include href="INTEL_performance_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- Unnumbered extensions sorted by name. -->
 
 <category name="GL_ATI_blend_equation_separate">
     <enum name="RGBA8_SNORM"                              value="0x8F97"/>
 </category>
 
-<category name="GL_MESA_shader_debug">
-    <enum name="DEBUG_OBJECT_MESA"                        value="0x8759"/>
-    <enum name="DEBUG_PRINT_MESA"                         value="0x875A"/>
-    <enum name="DEBUG_ASSERT_MESA"                        value="0x875B"/>
-    <function name="CreateDebugObjectMESA" exec="skip">
-        <return type="GLhandleARB"/>
-        <glx ignore="true"/>
-    </function>
-    <function name="ClearDebugLogMESA" exec="skip">
-        <param name="obj" type="GLhandleARB"/>
-        <param name="logType" type="GLenum"/>
-        <param name="shaderType" type="GLenum"/>
-        <glx ignore="true"/>
-    </function>
-    <function name="GetDebugLogMESA" exec="skip">
-        <param name="obj" type="GLhandleARB"/>
-        <param name="logType" type="GLenum"/>
-        <param name="shaderType" type="GLenum"/>
-        <param name="maxLength" type="GLsizei"/>
-        <param name="length" type="GLsizei *" output="true"/>
-        <param name="debugLog" type="GLcharARB *" output="true"/>
-        <glx ignore="true"/>
-    </function>
-    <function name="GetDebugLogLengthMESA" exec="skip">
-        <return type="GLsizei"/>
-        <param name="obj" type="GLhandleARB"/>
-        <param name="logType" type="GLenum"/>
-        <param name="shaderType" type="GLenum"/>
-        <glx ignore="true"/>
-    </function>
-</category>
-
 <category name="GL_SGIS_point_parameters">
     <enum name="POINT_SIZE_MIN_SGIS"           count="1"  value="0x8126">
         <size name="PointParameterfv"/>
 
 <xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="NV_vdpau_interop.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="GL4x.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 </OpenGLAPI>