fontconfig mesa xserver git update 9 Mar 2014

xserver          commit 1c61d38528a573caadee2468ee59ea558c822e09
fontconfig       commit f8ccf379eb1092592ae0b65deb563c5491f69de9
mesa             commit 897f40f25d21af678b1b67c1a68c4a6722d19983

6 files changed, 158 insertions, 154 deletions

diff --git a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
index 11f268dc6..0468d570c 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
@@ -52,7 +52,7 @@
     <enum name="DEBUG_SEVERITY_LOW_ARB"                    value="0x9148"/>
 
 
-    <function name="DebugMessageControlARB" offset="assign">
+    <function name="DebugMessageControlARB" alias="DebugMessageControl">
         <param name="source" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="severity" type="GLenum"/>
@@ -61,7 +61,7 @@
         <param name="enabled" type="GLboolean"/>
     </function>
 
-    <function name="DebugMessageInsertARB" offset="assign">
+    <function name="DebugMessageInsertARB" alias="DebugMessageInsert">
         <param name="source" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="id" type="GLuint"/>
@@ -70,12 +70,12 @@
         <param name="buf" type="const GLcharARB *"/>
     </function>
 
-    <function name="DebugMessageCallbackARB" offset="assign">
+    <function name="DebugMessageCallbackARB" alias="DebugMessageCallback">
         <param name="callback" type="GLDEBUGPROCARB"/>
         <param name="userParam" type="const GLvoid *"/>
     </function>
 
-    <function name="GetDebugMessageLogARB" offset="assign">
+    <function name="GetDebugMessageLogARB" alias="GetDebugMessageLog">
         <return type="GLuint"/>
         <param name="count" type="GLuint"/>
         <param name="bufsize" type="GLsizei"/>
diff --git a/mesalib/src/mapi/glapi/gen/GL4x.xml b/mesalib/src/mapi/glapi/gen/GL4x.xml
index 6706278ce..8efef0b91 100644
--- a/mesalib/src/mapi/glapi/gen/GL4x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL4x.xml
@@ -15,7 +15,7 @@
 </category>
 
 <category name="4.3">
-
+  <enum name="DEPTH_STENCIL_TEXTURE_MODE"              value="0x90EA"/>
 </category>
 
 </OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/KHR_debug.xml b/mesalib/src/mapi/glapi/gen/KHR_debug.xml
new file mode 100644
index 000000000..48f7fa762
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/KHR_debug.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<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>
+
+  <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>
+
+  <function name="DebugMessageCallback" offset="assign">
+    <param name="callback" type="GLDEBUGPROC"/>
+    <param name="userParam" type="const GLvoid *"/>
+  </function>
+
+  <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>
+
+  <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>
+
+  <function name="PopDebugGroup" offset="assign"/>
+
+  <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>
+
+  <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>
+
+  <function name="ObjectPtrLabel" offset="assign">
+    <param name="ptr" type="const GLvoid *"/>
+    <param name="length" type="GLsizei"/>
+    <param name="label" type="const GLchar *"/>
+  </function>
+
+  <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>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 7e1946e22..9129d5790 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8324,149 +8324,7 @@
 
 <!-- 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>
-
-  <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>
-
-  <function name="DebugMessageCallback" offset="assign">
-    <param name="callback" type="GLDEBUGPROC"/>
-    <param name="userParam" type="const GLvoid *"/>
-  </function>
-
-  <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>
-
-  <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>
-
-  <function name="PopDebugGroup" offset="assign"/>
-
-  <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>
-
-  <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>
-
-  <function name="ObjectPtrLabel" offset="assign">
-    <param name="ptr" type="const GLvoid *"/>
-    <param name="length" type="GLsizei"/>
-    <param name="label" type="const GLchar *"/>
-  </function>
-
-  <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>
-
-</category>
+<xi:include href="KHR_debug.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- ARB extension #120 -->
 
diff --git a/mesalib/src/mapi/glapi/glapi.c b/mesalib/src/mapi/glapi/glapi.c
index 3a0b638f7..194b9ee86 100644
--- a/mesalib/src/mapi/glapi/glapi.c
+++ b/mesalib/src/mapi/glapi/glapi.c
@@ -54,11 +54,11 @@ _glapi_check_multithread(void)
 void
 _glapi_set_context(void *context)
 {
-   u_current_set_user((const void *) context);
+   u_current_set_context((const void *) context);
 }
 
 void
 _glapi_set_dispatch(struct _glapi_table *dispatch)
 {
-   u_current_set((const struct mapi_table *) dispatch);
+   u_current_set_table((const struct mapi_table *) dispatch);
 }
diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h
index dcf91a7f3..7c22985ec 100644
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
@@ -168,10 +168,6 @@ _GLAPI_EXPORT struct _glapi_table *
 _glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
 
 
-_GLAPI_EXPORT unsigned long
-_glthread_GetID(void);
-
-
 /*
  * These stubs are kept so that the old DRI drivers still load.
  */