From 31fd4c5654595a4763e492e4ec26f66ca3a8a405 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 4 Nov 2013 12:08:23 +0100
Subject: libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov
 2013

xserver          commit 33c85beed521c9db140cadd8c5aa9992398ee1fe
xkbcomp          commit e3e6e938535532bfad175c1635256ab7fb3ac943
pixman           commit 8cbc7da4e525c96a8e089e4c1baee75dc8315218
libxtrans        commit 1fb0fd555a16dd8fce4abc6d3fd22b315f46762a
fontconfig       commit 767108aa1327cf0156dfc6f024dbc8fb783ae067
mesa             commit 2f896627175384fd5943f21804700a155ba4e8a0
---
 mesalib/src/mapi/glapi/gen/ARB_sample_shading.xml | 19 +++++++++++++++++++
 mesalib/src/mapi/glapi/gen/GL4x.xml               | 21 +++++++++++++++++++++
 mesalib/src/mapi/glapi/gen/Makefile.am            |  5 ++++-
 mesalib/src/mapi/glapi/gen/gl_API.xml             |  4 +++-
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 mesalib/src/mapi/glapi/gen/ARB_sample_shading.xml
 create mode 100644 mesalib/src/mapi/glapi/gen/GL4x.xml

(limited to 'mesalib/src/mapi/glapi')

diff --git a/mesalib/src/mapi/glapi/gen/ARB_sample_shading.xml b/mesalib/src/mapi/glapi/gen/ARB_sample_shading.xml
new file mode 100644
index 000000000..cc8296a47
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_sample_shading.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+<OpenGLAPI>
+
+<category name="GL_ARB_sample_shading" number="70">
+
+   <enum name="SAMPLE_SHADING_ARB"                          value="0x8C36"/>
+   <enum name="MIN_SAMPLE_SHADING_VALUE_ARB"                value="0x8C37"/>
+
+   <function name="MinSampleShadingARB" alias="MinSampleShading">
+      <param name="value" type="GLfloat"/>
+   </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/GL4x.xml b/mesalib/src/mapi/glapi/gen/GL4x.xml
new file mode 100644
index 000000000..6706278ce
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/GL4x.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+<OpenGLAPI>
+
+<category name="4.0">
+  <enum name="SAMPLE_SHADING"                          value="0x8C36"/>
+  <enum name="MIN_SAMPLE_SHADING_VALUE"                value="0x8C37"/>
+
+  <function name="MinSampleShading" offset="assign">
+    <param name="value" type="GLfloat"/>
+  </function>
+</category>
+
+<category name="4.3">
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 390245216..cbbf659dd 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -108,6 +108,7 @@ API_XML = \
 	ARB_invalidate_subdata.xml \
 	ARB_map_buffer_range.xml \
 	ARB_robustness.xml \
+	ARB_sample_shading.xml \
 	ARB_sampler_objects.xml \
 	ARB_seamless_cube_map.xml \
 	ARB_shader_atomic_counters.xml \
@@ -144,7 +145,9 @@ API_XML = \
 	NV_texture_barrier.xml \
 	NV_vdpau_interop.xml \
 	OES_EGL_image.xml \
-	GL3x.xml
+	GL3x.xml \
+	GL4x.xml
+
 
 
 COMMON = $(API_XML) \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 45d69b40a..69014c5d2 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8187,7 +8187,7 @@
 <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 -->
+<xi:include href="ARB_sample_shading.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="ARB_texture_cube_map_array.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="ARB_texture_gather.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <!-- 73. GL_ARB_texture_query_lod -->
@@ -13122,4 +13122,6 @@
 
 <xi:include href="NV_vdpau_interop.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="GL4x.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 </OpenGLAPI>
-- 
cgit v1.2.3