Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/docs/GL3.txt
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/gen/gl_API.xml
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitable.h
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/enums.c
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_draw.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/vbo/vbo_attrib_tmp.h
	mesalib/src/mesa/vbo/vbo_save_api.c

3 files changed, 229 insertions, 0 deletions

diff --git a/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml b/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml
new file mode 100644
index 000000000..7d12d9774
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_vertex_type_2_10_10_10_rev" number="86">
+
+    <enum name="INT_2_10_10_10_REV"                value = "0x8D9F"/>
+
+    <function name="VertexP2ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="value" type="GLuint"/>
+    </function>
+
+    <function name="VertexP3ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="value" type="GLuint"/>
+    </function>
+
+    <function name="VertexP4ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="value" type="GLuint"/>
+    </function>
+
+    <function name="VertexP2uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexP3uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexP4uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="TexCoordP1ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="GLuint"/>
+    </function>
+
+    <function name="TexCoordP2ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="GLuint"/>
+    </function>
+
+    <function name="TexCoordP3ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="GLuint"/>
+    </function>
+
+    <function name="TexCoordP4ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="GLuint"/>
+    </function>
+
+    <function name="TexCoordP1uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="const GLuint *"/>
+    </function>
+
+    <function name="TexCoordP2uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="const GLuint *"/>
+    </function>
+
+    <function name="TexCoordP3uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="const GLuint *"/>
+    </function>
+
+    <function name="TexCoordP4uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="const GLuint *"/>
+    </function>
+
+    <function name="MultiTexCoordP1ui" offset="assign">
+        <param name="texture" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="GLuint"/>
+    </function>
+
+    <function name="MultiTexCoordP2ui" offset="assign">
+        <param name="texture" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="GLuint"/>
+    </function>
+
+    <function name="MultiTexCoordP3ui" offset="assign">
+        <param name="texture" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="GLuint"/>
+    </function>
+
+    <function name="MultiTexCoordP4ui" offset="assign">
+        <param name="texture" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="GLuint"/>
+    </function>
+
+    <function name="MultiTexCoordP1uiv" offset="assign">
+        <param name="texture" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="const GLuint *"/>
+    </function>
+
+    <function name="MultiTexCoordP2uiv" offset="assign">
+        <param name="texture" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="const GLuint *"/>
+    </function>
+
+    <function name="MultiTexCoordP3uiv" offset="assign">
+        <param name="texture" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="const GLuint *"/>
+    </function>
+
+    <function name="MultiTexCoordP4uiv" offset="assign">
+        <param name="texture" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="const GLuint *"/>
+    </function>
+
+    <function name="NormalP3ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="GLuint"/>
+    </function>
+
+    <function name="NormalP3uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="coords" type="const GLuint *"/>
+    </function>
+
+    <function name="ColorP3ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="color" type="GLuint"/>
+    </function>
+
+    <function name="ColorP4ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="color" type="GLuint"/>
+    </function>
+
+    <function name="ColorP3uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="color" type="const GLuint *"/>
+    </function>
+
+    <function name="ColorP4uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="color" type="const GLuint *"/>
+    </function>
+
+    <function name="SecondaryColorP3ui" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="color" type="GLuint"/>
+    </function>
+
+    <function name="SecondaryColorP3uiv" offset="assign">
+        <param name="type" type="GLenum"/>
+        <param name="color" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexAttribP1ui" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="type" type="GLenum"/>
+        <param name="normalized" type="GLboolean"/>
+        <param name="value" type="GLuint"/>
+    </function>
+
+    <function name="VertexAttribP2ui" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="type" type="GLenum"/>
+        <param name="normalized" type="GLboolean"/>
+        <param name="value" type="GLuint"/>
+    </function>
+
+    <function name="VertexAttribP3ui" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="type" type="GLenum"/>
+        <param name="normalized" type="GLboolean"/>
+        <param name="value" type="GLuint"/>
+    </function>
+
+    <function name="VertexAttribP4ui" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="type" type="GLenum"/>
+        <param name="normalized" type="GLboolean"/>
+        <param name="value" type="GLuint"/>
+    </function>
+
+    <function name="VertexAttribP1uiv" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="type" type="GLenum"/>
+        <param name="normalized" type="GLboolean"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexAttribP2uiv" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="type" type="GLenum"/>
+        <param name="normalized" type="GLboolean"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexAttribP3uiv" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="type" type="GLenum"/>
+        <param name="normalized" type="GLboolean"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+    <function name="VertexAttribP4uiv" offset="assign">
+        <param name="index" type="GLuint"/>
+        <param name="type" type="GLenum"/>
+        <param name="normalized" type="GLboolean"/>
+        <param name="value" type="const GLuint *"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 14733f162..3e76f9249 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -89,6 +89,7 @@ API_XML = \
 	ARB_texture_buffer_object.xml \

 	ARB_vertex_array_object.xml \

 	AMD_draw_buffers_blend.xml \

+	ARB_vertex_type_2_10_10_10_rev.xml \

 	APPLE_object_purgeable.xml \

 	APPLE_vertex_array_object.xml \

 	EXT_draw_buffers2.xml \

diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index a4d3f160b..920994435 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -12537,4 +12537,6 @@
 

 <xi:include href="ARB_texture_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

 

+<xi:include href="ARB_vertex_type_2_10_10_10_rev.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

+

 </OpenGLAPI>