libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014

xserver          commit b634e909895f6001e7d9543e1350b20c82c8c01c
libxcb           commit 4ffa6f83b92763eb901c7ddb7c20775e24d507ca
libxcb/xcb-proto commit 4270141a7cb3c68f50251be19a5a628aa18553e6
xkeyboard-config commit d9e3d0ec1a48a5f61ea6dd6d20b8682eeecf3a39
libX11           commit d6bd988bc00494914b38b95ee5df77ac4f32f19f
libXdmcp         commit 089081dca4ba3598c6f9bf401c029378943b5854
libXext          commit d5447c0156f556114dbf97d6064c0c7b0fcd5f70
libfontenc       commit 0037a42107b952c9d903719615747e760e4e7247
libXinerama      commit edd95182b26eb5d576d4878c559e0f17dddaa909
libXau           commit 1e4635be11154dd8262f37b379511bd627defa2a
xkbcomp          commit 31b90ee4ffc774e0da540277907fc5540c0b012c
pixman           commit 82d094654a46bd97d47f1f132a01ae0a74b986f3
xextproto        commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7
randrproto       commit a4a6694c059d74247c16527eef4a0ec9f56bbef6
glproto          commit f84853d97d5749308992412a215fa518b6536eb3
mkfontscale      commit eac564e0fc9052a39981ea47b271f7f3d2821944
xwininfo         commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13
libXft           commit 4acfdaf95adb0a05c2a25550bdde036c865902f4
libXmu           commit 22d9c590901e121936f50dee97dc60c4f7defb63
libxtrans        commit 3f0de269abe59353acbd7a5587d68ce0da91db67
fontconfig       commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d
mesa             commit 1a568e0f2b65e4e1e1d19a6dece3a792a33da825

13 files changed, 430 insertions, 41 deletions

diff --git a/mesalib/src/mapi/glapi/Makefile.am b/mesalib/src/mapi/glapi/Makefile.am
index bf653a305..e425bacea 100644
--- a/mesalib/src/mapi/glapi/Makefile.am
+++ b/mesalib/src/mapi/glapi/Makefile.am
@@ -27,6 +27,7 @@ include ../Makefile.sources
 
 AM_CPPFLAGS = \
         $(DEFINES) \
+        $(SELINUX_CFLAGS) \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/mapi \
         -I$(top_builddir)/src/mapi \
diff --git a/mesalib/src/mapi/glapi/Makefile.sources b/mesalib/src/mapi/glapi/Makefile.sources
index 58d28c52c..100e6347e 100644
--- a/mesalib/src/mapi/glapi/Makefile.sources
+++ b/mesalib/src/mapi/glapi/Makefile.sources
@@ -6,7 +6,6 @@ GLAPI_SOURCES = \
 	glapi_gentable.c \
 	glapi_getproc.c \
 	glapi_nop.c \
-	glthread.c \
 	glapi.c
 
 X86_API =			\
diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index 152818d22..bc1c43aa8 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -34,7 +34,6 @@ glapi_sources = [
     'glapi_entrypoint.c',
     'glapi_getproc.c',
     'glapi_nop.c',
-    'glthread.c',
     'glapi.c',
 ]
 
diff --git a/mesalib/src/mapi/glapi/gen/ARB_separate_shader_objects.xml b/mesalib/src/mapi/glapi/gen/ARB_separate_shader_objects.xml
new file mode 100644
index 000000000..80234ea5e
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_separate_shader_objects.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+<OpenGLAPI>
+   <category name="ARB_separate_shader_objects" number="97">
+      <enum   name="ACTIVE_PROGRAM"                               value="0x8259"/>
+      <enum   name="PROGRAM_PIPELINE_BINDING"                     value="0x825A"/>
+      <enum   name="VERTEX_SHADER_BIT"                            value="0x00000001"/>
+      <enum   name="FRAGMENT_SHADER_BIT"                          value="0x00000002"/>
+      <enum   name="GEOMETRY_SHADER_BIT"                          value="0x00000004"/>
+      <enum   name="TESS_CONTROL_SHADER_BIT"                      value="0x00000008"/>
+      <enum   name="TESS_EVALUATION_SHADER_BIT"                   value="0x00000010"/>
+      <enum   name="ALL_SHADER_BITS"                              value="0xFFFFFFFF"/>
+      <enum   name="PROGRAM_SEPARABLE"                            value="0x8258"/>
+
+      <function name="UseProgramStages" offset="assign">
+         <param name="pipeline" type="GLuint" />
+         <param name="stages" type="GLbitfield" />
+         <param name="program" type="GLuint" />
+      </function>
+      <function name="ActiveShaderProgram" offset="assign">
+         <param name="pipeline" type="GLuint" />
+         <param name="program" type="GLuint" />
+      </function>
+      <function name="CreateShaderProgramv" offset="assign">
+         <param name="type" type="GLenum" />
+         <param name="count" type="GLsizei" />
+         <param name="strings" type="const GLchar * const *" />
+         <return type="GLuint"/>
+      </function>
+      <function name="BindProgramPipeline" offset="assign">
+         <param name="pipeline" type="GLuint" />
+      </function>
+      <function name="DeleteProgramPipelines" offset="assign">
+         <param name="n" type="GLsizei" />
+         <param name="pipelines" type="const GLuint *" />
+      </function>
+      <function name="GenProgramPipelines" offset="assign">
+         <param name="n" type="GLsizei" />
+         <param name="pipelines" type="GLuint *" />
+      </function>
+      <function name="IsProgramPipeline" offset="assign">
+         <param name="pipeline" type="GLuint" />
+         <return type="GLboolean"/>
+      </function>
+      <!-- Function already included on ARB_get_program_binary.xml. Keep a commented
+      version here for completeness -->
+      <!--
+      <function name="ProgramParameteri" offset="assign" es2="3.0">
+         <param name="program" type="GLuint"/>
+         <param name="pname" type="GLenum"/>
+         <param name="value" type="GLint"/>
+      </function>
+      -->
+      <function name="GetProgramPipelineiv" offset="assign">
+         <param name="pipeline" type="GLuint" />
+         <param name="pname" type="GLenum" />
+         <param name="params" type="GLint *" />
+      </function>
+      <function name="ProgramUniform1i" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLint" />
+      </function>
+      <function name="ProgramUniform2i" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLint" />
+         <param name="y" type="GLint" />
+      </function>
+      <function name="ProgramUniform3i" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLint" />
+         <param name="y" type="GLint" />
+         <param name="z" type="GLint" />
+      </function>
+      <function name="ProgramUniform4i" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLint" />
+         <param name="y" type="GLint" />
+         <param name="z" type="GLint" />
+         <param name="w" type="GLint" />
+      </function>
+      <function name="ProgramUniform1ui" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLuint" />
+      </function>
+      <function name="ProgramUniform2ui" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLuint" />
+         <param name="y" type="GLuint" />
+      </function>
+      <function name="ProgramUniform3ui" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLuint" />
+         <param name="y" type="GLuint" />
+         <param name="z" type="GLuint" />
+      </function>
+      <function name="ProgramUniform4ui" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLuint" />
+         <param name="y" type="GLuint" />
+         <param name="z" type="GLuint" />
+         <param name="w" type="GLuint" />
+      </function>
+      <function name="ProgramUniform1f" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLfloat" />
+      </function>
+      <function name="ProgramUniform2f" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLfloat" />
+         <param name="y" type="GLfloat" />
+      </function>
+      <function name="ProgramUniform3f" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLfloat" />
+         <param name="y" type="GLfloat" />
+         <param name="z" type="GLfloat" />
+      </function>
+      <function name="ProgramUniform4f" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLfloat" />
+         <param name="y" type="GLfloat" />
+         <param name="z" type="GLfloat" />
+         <param name="w" type="GLfloat" />
+      </function>
+      <function name="ProgramUniform1iv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLint *" />
+      </function>
+      <function name="ProgramUniform2iv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLint *" />
+      </function>
+      <function name="ProgramUniform3iv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLint *" />
+      </function>
+      <function name="ProgramUniform4iv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLint *" />
+      </function>
+      <function name="ProgramUniform1uiv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLuint *" />
+      </function>
+      <function name="ProgramUniform2uiv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLuint *" />
+      </function>
+      <function name="ProgramUniform3uiv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLuint *" />
+      </function>
+      <function name="ProgramUniform4uiv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLuint *" />
+      </function>
+      <function name="ProgramUniform1fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniform2fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniform3fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniform4fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniformMatrix2fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniformMatrix3fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniformMatrix4fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniformMatrix2x3fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniformMatrix3x2fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniformMatrix2x4fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniformMatrix4x2fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniformMatrix3x4fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ProgramUniformMatrix4x3fv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLfloat *" />
+      </function>
+      <function name="ValidateProgramPipeline" offset="assign">
+         <param name="pipeline" type="GLuint" />
+      </function>
+      <function name="GetProgramPipelineInfoLog" offset="assign">
+         <param name="pipeline" type="GLuint" />
+         <param name="bufSize" type="GLsizei" />
+         <param name="length" type="GLsizei *" />
+         <param name="infoLog" type="GLchar *" />
+      </function>
+
+      <!-- depends on GL_ARB_gpu_shader_fp64
+      <function name="ProgramUniform1d" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLdouble" />
+      </function>
+      <function name="ProgramUniform2d" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLdouble" />
+         <param name="y" type="GLdouble" />
+      </function>
+      <function name="ProgramUniform3d" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLdouble" />
+         <param name="y" type="GLdouble" />
+         <param name="z" type="GLdouble" />
+      </function>
+      <function name="ProgramUniform4d" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="x" type="GLdouble" />
+         <param name="y" type="GLdouble" />
+         <param name="z" type="GLdouble" />
+         <param name="w" type="GLdouble" />
+      </function>
+      <function name="ProgramUniformMatrix2x3dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniformMatrix3x2dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniformMatrix2x4dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniformMatrix4x2dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniformMatrix3x4dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniformMatrix4x3dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniformMatrix2dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniformMatrix3dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniformMatrix4dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="transpose" type="GLboolean" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniform1dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniform2dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniform3dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      <function name="ProgramUniform4dv" offset="assign">
+         <param name="program" type="GLuint" />
+         <param name="location" type="GLint" />
+         <param name="count" type="GLsizei" />
+         <param name="value" type="const GLdouble *" />
+      </function>
+      -->
+   </category>
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 9e6fe5261..7b3c118f0 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -113,6 +113,7 @@ API_XML = \
 	ARB_sample_shading.xml \
 	ARB_sampler_objects.xml \
 	ARB_seamless_cube_map.xml \
+	ARB_separate_shader_objects.xml \
 	ARB_shader_atomic_counters.xml \
 	ARB_shader_image_load_store.xml \
 	ARB_sync.xml \
diff --git a/mesalib/src/mapi/glapi/gen/NV_vdpau_interop.xml b/mesalib/src/mapi/glapi/gen/NV_vdpau_interop.xml
index cf5f0eddd..0b19e1a85 100644
--- a/mesalib/src/mapi/glapi/gen/NV_vdpau_interop.xml
+++ b/mesalib/src/mapi/glapi/gen/NV_vdpau_interop.xml
@@ -29,6 +29,7 @@
     </function>
 
     <function name="VDPAUIsSurfaceNV" offset="assign">
+        <return type="GLboolean"/>
 	<param name="surface" type="GLintptr"/>
     </function>
 
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
index 42b85a525..d076409c2 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
@@ -92,7 +92,6 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
         print '#include "singlesize.h"'
         print '#include "glapi.h"'
         print '#include "glapitable.h"'
-        print '#include "glthread.h"'
         print '#include "dispatch.h"'
         print ''
         print '#define __GLX_PAD(x)  (((x) + 3) & ~3)'
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
index 8b804418b..a98f63e99 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
@@ -167,7 +167,6 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto):
         print '#include "glxclient.h"'
         print '#include "indirect_size.h"'
         print '#include "glapi.h"'
-        print '#include "glthread.h"'
         print '#include <GL/glxproto.h>'
         print '#include <X11/Xlib-xcb.h>'
         print '#include <xcb/xcb.h>'
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 4ef754d5c..7e1946e22 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8275,7 +8275,11 @@
   </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"/>
 
@@ -8492,6 +8496,25 @@
 
 <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>
+
 <!-- Non-ARB extensions sorted by extension number. -->
 
 <category name="GL_EXT_blend_color" number="2">
diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py
index 1765a51ad..460919397 100644
--- a/mesalib/src/mapi/glapi/gen/gl_genexec.py
+++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py
@@ -86,6 +86,7 @@ header = """/**
 #include "main/multisample.h"
 #include "main/objectlabel.h"
 #include "main/performance_monitor.h"
+#include "main/pipelineobj.h"
 #include "main/pixel.h"
 #include "main/pixelstore.h"
 #include "main/points.h"
diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h
index c764271b0..dcf91a7f3 100644
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
@@ -44,7 +44,7 @@
 #ifndef _GLAPI_H
 #define _GLAPI_H
 
-#include "glapi/glthread.h"
+#include "u_thread.h"
 
 
 #ifdef __cplusplus
diff --git a/mesalib/src/mapi/glapi/glthread.c b/mesalib/src/mapi/glapi/glthread.c
deleted file mode 100644
index 00915380f..000000000
--- a/mesalib/src/mapi/glapi/glthread.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "glapi/glapi.h"
-
-unsigned long
-_glthread_GetID(void)
-{
-   return u_thread_self();
-}
diff --git a/mesalib/src/mapi/glapi/glthread.h b/mesalib/src/mapi/glapi/glthread.h
deleted file mode 100644
index 2399abb2b..000000000
--- a/mesalib/src/mapi/glapi/glthread.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef GLTHREAD_H
-#define GLTHREAD_H
-
-#include "u_thread.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define _glthread_DECLARE_STATIC_MUTEX(name) u_mutex_declare_static(name)
-#define _glthread_INIT_MUTEX(name)           u_mutex_init(name)
-#define _glthread_DESTROY_MUTEX(name)        u_mutex_destroy(name)
-#define _glthread_LOCK_MUTEX(name)           u_mutex_lock(name)
-#define _glthread_UNLOCK_MUTEX(name)         u_mutex_unlock(name)
-
-#define _glthread_InitTSD(tsd)               u_tsd_init(tsd);
-#define _glthread_DestroyTSD(tsd)            u_tsd_destroy(tsd);
-#define _glthread_GetTSD(tsd)                u_tsd_get(tsd);
-#define _glthread_SetTSD(tsd, ptr)           u_tsd_set(tsd, ptr);
-
-typedef struct u_tsd _glthread_TSD;
-typedef u_mutex _glthread_Mutex;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GLTHREAD_H */