From 46b21b8f9060faafdb838aa94f2aef35de03901a Mon Sep 17 00:00:00 2001
From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Sat, 10 Jun 2017 19:39:02 +0200
Subject: mesa: add GL_ARB_gl_spirv boilerplate

v2: * Add meson build bits (Eric Engestrom)
    * Return INVALID_OPERATION error on SpecializeShaderARB (Ian Romanick)

v3: Include boilerplate for the GL 4.6 alias of glSpecializeShaderARB
   (Neil Roberts)

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---
 src/mapi/glapi/gen/ARB_gl_spirv.xml | 21 +++++++++++++++++++++
 src/mapi/glapi/gen/GL4x.xml         | 11 +++++++++++
 src/mapi/glapi/gen/Makefile.am      |  1 +
 src/mapi/glapi/gen/gl_API.xml       |  4 ++++
 src/mapi/glapi/gen/gl_genexec.py    |  1 +
 src/mapi/glapi/gen/meson.build      |  1 +
 6 files changed, 39 insertions(+)
 create mode 100644 src/mapi/glapi/gen/ARB_gl_spirv.xml

(limited to 'src/mapi')

diff --git a/src/mapi/glapi/gen/ARB_gl_spirv.xml b/src/mapi/glapi/gen/ARB_gl_spirv.xml
new file mode 100644
index 00000000000..0dd615480f7
--- /dev/null
+++ b/src/mapi/glapi/gen/ARB_gl_spirv.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_gl_spirv" number="190">
+
+    <enum name="SHADER_BINARY_FORMAT_SPIR_V_ARB" value="0x9551"/>
+    <enum name="SPIR_V_BINARY_ARB" value="0x9552"/>
+
+    <function name="SpecializeShaderARB">
+        <param name="shader" type="GLuint"/>
+        <param name="pEntryPoint" type="const GLchar *"/>
+        <param name="numSpecializationConstants" type="GLuint"/>
+        <param name="pConstantIndex" type="const GLuint *"/>
+        <param name="pConstantValue" type="const GLuint *"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/src/mapi/glapi/gen/GL4x.xml b/src/mapi/glapi/gen/GL4x.xml
index 88dba5cd71a..0a8094166c8 100644
--- a/src/mapi/glapi/gen/GL4x.xml
+++ b/src/mapi/glapi/gen/GL4x.xml
@@ -73,6 +73,17 @@
     <param name="clamp" type="GLfloat"/>
   </function>
   <enum name="POLYGON_OFFSET_CLAMP" value="0x8E1B"/>
+
+  <enum name="SHADER_BINARY_FORMAT_SPIR_V" value="0x9551"/>
+  <enum name="SPIR_V_BINARY" value="0x9552"/>
+
+  <function name="SpecializeShader" alias="SpecializeShaderARB">
+    <param name="shader" type="GLuint"/>
+    <param name="pEntryPoint" type="const GLchar *"/>
+    <param name="numSpecializationConstants" type="GLuint"/>
+    <param name="pConstantIndex" type="const GLuint *"/>
+    <param name="pConstantValue" type="const GLuint *"/>
+  </function>
 </category>
 
 </OpenGLAPI>
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 87d8517b7ba..35e37e95a9f 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -144,6 +144,7 @@ API_XML = \
 	ARB_framebuffer_object.xml \
 	ARB_get_program_binary.xml \
 	ARB_get_texture_sub_image.xml \
+	ARB_gl_spirv.xml \
 	ARB_gpu_shader_fp64.xml \
 	ARB_gpu_shader_int64.xml \
 	ARB_gpu_shader5.xml \
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index eb1d9b83b27..d3594cfe195 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8400,6 +8400,10 @@
 
 <xi:include href="ARB_gpu_shader_int64.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<!-- ARB extension 179 - 189 -->
+
+<xi:include href="ARB_gl_spirv.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- Non-ARB extensions sorted by extension number. -->
 
 <category name="GL_EXT_blend_color" number="2">
diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
index b7b22328ff8..aaff9f230b3 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -77,6 +77,7 @@ header = """/**
 #include "main/eval.h"
 #include "main/externalobjects.h"
 #include "main/get.h"
+#include "main/glspirv.h"
 #include "main/feedback.h"
 #include "main/fog.h"
 #include "main/fbobject.h"
diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build
index 599f094e998..a6a93cc83be 100644
--- a/src/mapi/glapi/gen/meson.build
+++ b/src/mapi/glapi/gen/meson.build
@@ -52,6 +52,7 @@ api_xml_files = files(
   'ARB_framebuffer_object.xml',
   'ARB_get_program_binary.xml',
   'ARB_get_texture_sub_image.xml',
+  'ARB_gl_spirv.xml',
   'ARB_gpu_shader_fp64.xml',
   'ARB_gpu_shader_int64.xml',
   'ARB_gpu_shader5.xml',
-- 
cgit v1.2.3