Merge remote-tracking branch 'origin/released'

8 files changed, 229 insertions, 24 deletions

diff --git a/mesalib/src/mapi/glapi/gen/ARB_blend_func_extended.xml b/mesalib/src/mapi/glapi/gen/ARB_blend_func_extended.xml
new file mode 100644
index 000000000..32adcde77
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_blend_func_extended.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_ARB_blend_func_extended" number="78">
+
+    <function name="BindFragDataLocationIndexed" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="colorNumber" type="GLuint"/>
+        <param name="index" type="GLuint"/>
+        <param name="name" type="const GLchar *"/>
+    </function>
+
+    <function name="GetFragDataIndex" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="name" type="const GLchar *"/>
+	  <return type="GLint"/>
+    </function>
+
+    <enum name="SRC1_COLOR" value="0x88F9"/>
+    <!-- SRC1_ALPHA is defined in core GL -->
+    <enum name="ONE_MINUS_SRC1_COLOR" value="0x88FA"/>
+    <enum name="ONE_MINUS_SRC1_ALPHA" value="0x88FB"/>
+
+    <enum name="MAX_DUAL_SOURCE_DRAW_BUFFERS" value="0x88FC"/>
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_depth_buffer_float.xml b/mesalib/src/mapi/glapi/gen/ARB_depth_buffer_float.xml
new file mode 100644
index 000000000..7d25f6b0e
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_depth_buffer_float.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_depth_buffer_float" number="43">
+
+    <enum name="DEPTH_COMPONENT32F"        value = "0x8CAC"/>
+    <enum name="DEPTH32F_STENCIL8"         value = "0x8CAD"/>
+
+    <enum name="FLOAT_32_UNSIGNED_INT_24_8_REV" value = "0x8DAD"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_compression_rgtc.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_compression_rgtc.xml
new file mode 100644
index 000000000..714f09741
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_compression_rgtc.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_compression_rgtc" number="52">
+
+    <enum name="COMPRESSED_RED_RGTC1"        value = "0x8DBB"/>
+    <enum name="COMPRESSED_SIGNED_RED_RGTC1" value = "0x8DBC"/>
+    <enum name="COMPRESSED_RG_RGTC2"         value = "0x8DBD"/>
+    <enum name="COMPRESSED_SIGNED_RG_RGTC2"  value = "0x8DBE"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_float.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_float.xml
new file mode 100644
index 000000000..5db7691c8
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_float.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_float" number="41">
+
+    <enum name="TEXTURE_RED_TYPE_ARB"      value="0x8C10"/>
+    <enum name="TEXTURE_GREEN_TYPE_ARB"    value="0x8C11"/>
+    <enum name="TEXTURE_BLUE_TYPE_ARB"     value="0x8C12"/>
+    <enum name="TEXTURE_ALPHA_TYPE_ARB"    value="0x8C13"/>
+    <enum name="TEXTURE_LUMINANCE_TYPE_ARB" value="0x8C14"/>
+    <enum name="TEXTURE_INTENSITY_TYPE_ARB" value="0x8C15"/>
+    <enum name="TEXTURE_DEPTH_TYPE_ARB"    value="0x8C16"/>
+
+    <!-- The unsuffixed version of this is in ARB_framebuffer_object.xml -->
+    <enum name="UNSIGNED_NORMALIZED_ARB"   value="0x8C17"/>
+
+    <!-- Note only the RGBA/RGB formats have unsuffixed core GL equivalents,
+         since LUMINANCE/INTENSITY/ALPHA formats were deprecated. -->
+    <enum name="RGBA32F_ARB"               value="0x8814"/>
+    <enum name="RGB32F_ARB"                value="0x8815"/>
+    <enum name="ALPHA32F_ARB"              value="0x8816"/>
+    <enum name="INTENSITY32F_ARB"          value="0x8817"/>
+    <enum name="LUMINANCE32F_ARB"          value="0x8818"/>
+    <enum name="LUMINANCE_ALPHA32F_ARB"    value="0x8819"/>
+    <enum name="RGBA16F_ARB"               value="0x881A"/>
+    <enum name="RGB16F_ARB"                value="0x881B"/>
+    <enum name="ALPHA16F_ARB"              value="0x881C"/>
+    <enum name="INTENSITY16F_ARB"          value="0x881D"/>
+    <enum name="LUMINANCE16F_ARB"          value="0x881E"/>
+    <enum name="LUMINANCE_ALPHA16F_ARB"    value="0x881F"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_rg.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_rg.xml
new file mode 100644
index 000000000..40c0ebf05
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_rg.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_rg" number="53">
+
+    <enum name="COMPRESSED_RED"            value = "0x8225"/>
+    <enum name="COMPRESSED_RG"             value = "0x8226"/>
+
+    <enum name="RG"                        value = "0x8227"/>
+    <enum name="RG_INTEGER"                value = "0x8228"/>
+
+    <enum name="R8"                        value = "0x8229"/>
+    <enum name="R16"                       value = "0x822A"/>
+
+    <enum name="RG8"                       value = "0x822B"/>
+    <enum name="RG16"                      value = "0x822C"/>
+
+    <enum name="R16F"                      value = "0x822D"/>
+    <enum name="R32F"                      value = "0x822E"/>
+
+    <enum name="RG16F"                     value = "0x822F"/>
+    <enum name="RG32F"                     value = "0x8230"/>
+
+    <enum name="R8I"                       value = "0x8231"/>
+    <enum name="R8UI"                      value = "0x8232"/>
+    <enum name="R16I"                      value = "0x8233"/>
+    <enum name="R16UI"                     value = "0x8234"/>
+    <enum name="R32I"                      value = "0x8235"/>
+    <enum name="R32UI"                     value = "0x8236"/>
+
+    <enum name="RG8I"                      value = "0x8237"/>
+    <enum name="RG8UI"                     value = "0x8238"/>
+    <enum name="RG16I"                     value = "0x8239"/>
+    <enum name="RG16UI"                    value = "0x823A"/>
+    <enum name="RG32I"                     value = "0x823B"/>
+    <enum name="RG32UI"                    value = "0x823C"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index 6c7b14bf3..1dae44052 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -23,8 +23,6 @@
   <enum name="CONTEXT_FLAGS"                    value="0x821E"/>
   <enum name="DEPTH_BUFFER"                     value="0x8223"/>
   <enum name="STENCIL_BUFFER"                   value="0x8224"/>
-  <enum name="COMPRESSED_RED"                   value="0x8225"/>
-  <enum name="COMPRESSED_RG"                    value="0x8226"/>
   <enum name="CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT"  value="0x0001"/>
   <enum name="RGBA32F"                          value="0x8814"/>
   <enum name="RGB32F"                           value="0x8815"/>
@@ -41,6 +39,13 @@
   <enum name="CLAMP_READ_COLOR"                 value="0x891C"/>
   <enum name="FIXED_ONLY"                       value="0x891D"/>
   <enum name="MAX_VARYING_COMPONENTS"           value="0x8B4B"/>
+  <enum name="TEXTURE_RED_TYPE"                 value="0x8C10"/>
+  <enum name="TEXTURE_GREEN_TYPE"               value="0x8C11"/>
+  <enum name="TEXTURE_BLUE_TYPE"                value="0x8C12"/>
+  <enum name="TEXTURE_ALPHA_TYPE"               value="0x8C13"/>
+  <enum name="TEXTURE_LUMINANCE_TYPE"           value="0x8C14"/>
+  <enum name="TEXTURE_INTENSITY_TYPE"           value="0x8C15"/>
+  <enum name="TEXTURE_DEPTH_TYPE"               value="0x8C16"/>
   <enum name="TEXTURE_1D_ARRAY"                 value="0x8C18"/>
   <enum name="PROXY_TEXTURE_1D_ARRAY"           value="0x8C19"/>
   <enum name="TEXTURE_2D_ARRAY"                 value="0x8C1A"/>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 44939e354..49dfd75bf 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -66,6 +66,7 @@ API_XML = \
 	ARB_color_buffer_float.xml \
 	ARB_copy_buffer.xml \
 	ARB_debug_output.xml \
+	ARB_depth_buffer_float.xml \
 	ARB_depth_clamp.xml \
 	ARB_draw_buffers_blend.xml \
 	ARB_draw_elements_base_vertex.xml \
@@ -80,6 +81,9 @@ API_XML = \
 	ARB_seamless_cube_map.xml \
 	ARB_sync.xml \
 	ARB_texture_buffer_object.xml \
+	ARB_texture_compression_rgtc.xml \
+	ARB_texture_float.xml \
+	ARB_texture_rg.xml \
 	ARB_texture_storage.xml \
 	ARB_vertex_array_object.xml \
 	AMD_draw_buffers_blend.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index b6d4a1d59..f06e60718 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -7893,44 +7893,106 @@
     </enum>
 </category>
 
-<xi:include href="ARB_ES2_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_color_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 40. GL_ARB_half_float_pixel -->
+
+<xi:include href="ARB_texture_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 42. GL_ARB_pixel_buffer_object -->
+
+<xi:include href="ARB_depth_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_framebuffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_copy_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- 46. GL_ARB_framebuffer_sRGB -->
 
-<xi:include href="ARB_depth_clamp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_geometry_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 48. GL_ARB_half_float_vertex -->
+
+<xi:include href="ARB_instanced_arrays.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_map_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="ARB_texture_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_texture_compression_rgtc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_texture_rg.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="ARB_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_sync.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- ARB extension number 55 is a GLX extension. -->
+<!-- ARB extension number 56 is a WGL extension. -->
+<!-- 57. GL_ARB_uniform_buffer_object -->
+<!-- 58. GL_ARB_compatibility -->
 
-<xi:include href="ARB_seamless_cube_map.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_copy_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 60. GL_ARB_shader_texture_lod -->
+
+<xi:include href="ARB_depth_clamp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_draw_elements_base_vertex.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="NV_conditional_render.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- 63. GL_ARB_fragment_coord_conventions -->
+<!-- 64. GL_ARB_provoking_vertex -->
 
-<xi:include href="NV_primitive_restart.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_seamless_cube_map.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="NV_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_sync.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 67. GL_ARB_texture_multisample -->
+<!-- 68. GL_ARB_vertex_array_bgra -->
+
+<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 -->
+<!-- 71. GL_ARB_texture_cube_map_array -->
+<!-- 72. GL_ARB_texture_gather -->
+<!-- 73. GL_ARB_texture_query_lod -->
+
+<!-- ARB extension number 74 is a WGL extension. -->
+<!-- ARB extension number 75 is a GLX extension. -->
+
+<!-- 76. GL_ARB_shading_language_include -->
+<!-- 77. GL_ARB_texture_compression_bptc -->
+
+<xi:include href="ARB_blend_func_extended.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 79. GL_ARB_explicit_attrib_location -->
+<!-- 80. GL_ARB_occlusion_query2 -->
 
 <xi:include href="ARB_sampler_objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- 82. GL_ARB_shader_bit_encoding -->
 
-<xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_texture_rgb10_a2ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_geometry_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- 84. GL_ARB_texture_swizzle -->
+<!-- 85. GL_ARB_timer_query -->
 
-<xi:include href="ARB_color_buffer_float.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"/>
+
+<!-- ARB extensions #86...#94 -->
+
+<xi:include href="ARB_ES2_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #96...#103 -->
 
 <xi:include href="ARB_debug_output.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<!-- ARB extensions #106...#116 -->
+
+<xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+
 <!-- Non-ARB extensions sorted by extension number. -->
 
 <category name="GL_EXT_blend_color" number="2">
@@ -12417,17 +12479,11 @@
 <xi:include href="EXT_gpu_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="GL3x.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_instanced_arrays.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
-<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"/>
-
-<xi:include href="ARB_texture_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
-<xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="NV_conditional_render.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"/>
+<xi:include href="NV_primitive_restart.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_texture_rgb10_a2ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="NV_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </OpenGLAPI>