[Mesa-dev] [PATCH 2/3] glapi: add ARB_sample_shading and add to GL 4.0

[Jordan Justen]

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
 src/mapi/glapi/gen/ARB_sample_shading.xml |   19 +++++++++++++++++++
 src/mapi/glapi/gen/GL4x.xml               |    6 ++++++
 src/mapi/glapi/gen/Makefile.am            |    1 +
 src/mapi/glapi/gen/gl_API.xml             |    3 ++-
 src/mesa/main/tests/dispatch_sanity.cpp   |    4 ++--
 5 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/mapi/glapi/gen/ARB_sample_shading.xml

diff --git a/src/mapi/glapi/gen/ARB_sample_shading.xml b/src/mapi/glapi/gen/ARB_sample_shading.xml
new file mode 100644
index 0000000..4304dd3
--- /dev/null
+++ b/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/src/mapi/glapi/gen/GL4x.xml b/src/mapi/glapi/gen/GL4x.xml
index 4db195e..04170ed 100644
--- a/src/mapi/glapi/gen/GL4x.xml
+++ b/src/mapi/glapi/gen/GL4x.xml
@@ -7,6 +7,12 @@
 
 <category name="4.0">
 
+  <!-- These functions are unique to GL4.0 -->
+
+  <function name="MinSampleShading" offset="assign" exec="skip">
+    <param name="value" type="GLfloat"/>
+  </function>
+
 </category>
 
 <category name="4.3">
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 9acd03b..9dfc0a6 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -106,6 +106,7 @@ API_XML = \
 	ARB_instanced_arrays.xml \
 	ARB_map_buffer_range.xml \
 	ARB_robustness.xml \
+	ARB_sample_shading.xml \
 	ARB_sampler_objects.xml \
 	ARB_seamless_cube_map.xml \
 	ARB_sync.xml \
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 71971dd..ec5a364 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8173,7 +8173,8 @@
 <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"/>
+
 <!-- 71. GL_ARB_texture_cube_map_array -->
 <!-- 72. GL_ARB_texture_gather -->
 <!-- 73. GL_ARB_texture_query_lod -->
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index b0475da..62a0ce3 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -539,7 +539,7 @@ const struct function gl_core_functions_possible[] = {
    { "glVertexAttribDivisor", 33, -1 },
 
    /* GL 4.0 */
-// { "glMinSampleShading", 40, -1 },                    // XXX: Add to xml
+   { "glMinSampleShading", 40, -1 },
 // { "glBlendEquationi", 40, -1 },                      // XXX: Add to xml
 // { "glBlendEquationSeparatei", 40, -1 },              // XXX: Add to xml
 // { "glBlendFunci", 40, -1 },                          // XXX: Add to xml
@@ -600,7 +600,7 @@ const struct function gl_core_functions_possible[] = {
    { "glBlendEquationSeparateiARB", 43, -1 },
    { "glBlendFunciARB", 43, -1 },
    { "glBlendFuncSeparateiARB", 43, -1 },
-// { "glMinSampleShadingARB", 43, -1 },                 // XXX: Add to xml
+   { "glMinSampleShadingARB", 43, -1 },
 // { "glNamedStringARB", 43, -1 },                      // XXX: Add to xml
 // { "glDeleteNamedStringARB", 43, -1 },                // XXX: Add to xml
 // { "glCompileShaderIncludeARB", 43, -1 },             // XXX: Add to xml
-- 
1.7.9.5