Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013

Conflicts:
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/.gitignore
	mesalib/src/mesa/program/.gitignore

5 files changed, 46 insertions, 17 deletions

diff --git a/mesalib/src/mapi/glapi/gen/.gitignore b/mesalib/src/mapi/glapi/gen/.gitignore
index 906ce45d9..023e2856d 100644
--- a/mesalib/src/mapi/glapi/gen/.gitignore
+++ b/mesalib/src/mapi/glapi/gen/.gitignore
@@ -1,11 +1,5 @@
-enums.c
-glapi_mapi_tmp.h
-mapi_abi.py
-remap_helper.h
 dispatch.h
-glapitable.h
-glapitemp.h
-glprocs.h
+enums.c
 indirect.c
 indirect.h
 indirect_dispatch.c
@@ -19,5 +13,5 @@ indirect_size.h
 indirect_size_get.c
 indirect_size_get.h
 indirect_table.c
-glapi_gentable.c
-/Makefile
+mapi_abi.py
+remap_helper.h
diff --git a/mesalib/src/mapi/glapi/gen/ARB_ES3_compatibility.xml b/mesalib/src/mapi/glapi/gen/ARB_ES3_compatibility.xml
new file mode 100644
index 000000000..3944bc7d8
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_ES3_compatibility.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_ES3_compatibility" number="127">
+    <enum name="COMPRESSED_RGB8_ETC2"				value="0x9274"/>
+    <enum name="COMPRESSED_SRGB8_ETC2"				value="0x9275"/>
+    <enum name="COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"	value="0x9276"/>
+    <enum name="COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"	value="0x9277"/>
+    <enum name="COMPRESSED_RGBA8_ETC2_EAC"			value="0x9278"/>
+    <enum name="COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"		value="0x9279"/>
+    <enum name="COMPRESSED_R11_EAC"				value="0x9270"/>
+    <enum name="COMPRESSED_SIGNED_R11_EAC"			value="0x9271"/>
+    <enum name="COMPRESSED_RG11_EAC"				value="0x9272"/>
+    <enum name="COMPRESSED_SIGNED_RG11_EAC"			value="0x9273"/>
+    <enum name="PRIMITIVE_RESTART_FIXED_INDEX"			value="0x8D69"/>
+    <enum name="ANY_SAMPLES_PASSED_CONSERVATIVE"		value="0x8D6A"/>
+    <enum name="MAX_ELEMENT_INDEX"				value="0x8D6B"/>
+    <enum name="TEXTURE_IMMUTABLE_LEVELS"			value="0x82DF"/>
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index 9ca3bbacb..1e959cc2b 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -599,7 +599,7 @@
   <enum name="MAX_FRAGMENT_INPUT_COMPONENTS"        value="0x9125"/>
   <enum name="CONTEXT_PROFILE_MASK"                 value="0x9126"/>
 
-  <function name="GetInteger64i_v" offset="assign" es2="3.0" exec="skip">
+  <function name="GetInteger64i_v" offset="assign" es2="3.0">
     <param name="cap" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="data" type="GLint64 *"/>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 13943e839..ff22c8e0d 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -51,7 +51,7 @@ if HAVE_SPARC_ASM
 MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_sparc.S
 endif
 
-MESA_OUTPUTS = \
+BUILT_SOURCES = \
 	$(MESA_GLAPI_OUTPUTS) \
 	$(MESA_GLAPI_ASM_OUTPUTS) \
 	$(MESA_DIR)/main/enums.c \
@@ -63,6 +63,11 @@ MESA_OUTPUTS = \
 	$(MESA_GLX_DIR)/indirect_init.c \
 	$(MESA_GLX_DIR)/indirect_size.h \
 	$(MESA_GLX_DIR)/indirect_size.c
+EXTRA_DIST= \
+	$(BUILT_SOURCES) \
+	$(MESA_GLAPI_DIR)/glapi_x86.S \
+	$(MESA_GLAPI_DIR)/glapi_x86-64.S \
+	$(MESA_GLAPI_DIR)/glapi_sparc.S
 
 ######################################################################
 
@@ -101,6 +106,7 @@ API_XML = \
 	ARB_draw_elements_base_vertex.xml \
 	ARB_draw_instanced.xml \
 	ARB_ES2_compatibility.xml \
+	ARB_ES3_compatibility.xml \
 	ARB_framebuffer_object.xml \
 	ARB_geometry_shader4.xml \
 	ARB_instanced_arrays.xml \
@@ -144,6 +150,7 @@ COMMON = $(API_XML) \
 	gl_and_es_API.xml \
 	es_EXT.xml \
 	ARB_ES2_compatibility.xml \
+	ARB_ES3_compatibility.xml \
 	ARB_get_program_binary.xml \
 	OES_fixed_point.xml \
 	OES_single_precision.xml
@@ -154,8 +161,6 @@ PYTHON_GEN = $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS)
 
 ######################################################################
 
-all-local: $(MESA_OUTPUTS)
-
 xorg: check-xorg-source $(XORG_OUTPUTS)
 
 check-xorg-source:
@@ -169,7 +174,6 @@ check-xorg-source:
 
 clean-local:
 	-rm -f *~ *.pyo
-	-rm -f $(MESA_OUTPUTS)
 
 ######################################################################
 
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index cf973bbcd..4aa8b15e3 100755
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8277,7 +8277,11 @@
 
 <xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<!-- ARB extensions #106...#108 -->
+<!-- ARB extensions #106 -->
+
+<xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #108 -->
 
 <category name="GL_ARB_transform_feedback_instanced" number="109">
   <function name="DrawTransformFeedbackInstanced" offset="assign"
@@ -8304,10 +8308,14 @@
 
 <!-- ARB extensions #114...#116 -->
 
-<xi:include href="ARB_base_instance.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 extensions #118...#126 -->
+
+<xi:include href="ARB_ES3_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #128...#131 -->
+
 <xi:include href="ARB_invalidate_subdata.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- Non-ARB extensions sorted by extension number. -->