mapi: Add support for ARB_gpu_shader_int64.

Just add the boilerplate xml code.

v2 (idr): Update dispatch_sanity.  Only add extension functions in core
profile.

v3 (idr): Remove comment line from gl_API.xml.  Suggested by Matt.

Signed-off-by: Dave Airlie <[email protected]>
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Ian Romanick <[email protected]> [v1]
Reviewed-by: Matt Turner <[email protected]>

4 files changed, 304 insertions, 0 deletions

diff --git a/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml b/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml
new file mode 100644
index 00000000000..d0e4c546e33
--- /dev/null
+++ b/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_gpu_shader_int64" number="178">
+
+    <function name="Uniform1i64ARB">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLint64"/>
+    </function>
+
+    <function name="Uniform2i64ARB">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLint64"/>
+        <param name="y" type="GLint64"/>
+    </function>
+
+    <function name="Uniform3i64ARB">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLint64"/>
+        <param name="y" type="GLint64"/>
+        <param name="z" type="GLint64"/>
+    </function>
+
+    <function name="Uniform4i64ARB">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLint64"/>
+        <param name="y" type="GLint64"/>
+        <param name="z" type="GLint64"/>
+        <param name="w" type="GLint64"/>
+    </function>
+
+    <function name="Uniform1i64vARB">
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLint64 *"/>
+    </function>
+
+    <function name="Uniform2i64vARB">
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLint64 *"/>
+    </function>
+
+    <function name="Uniform3i64vARB">
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLint64 *"/>
+    </function>
+
+    <function name="Uniform4i64vARB">
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLint64 *"/>
+    </function>
+
+    <function name="Uniform1ui64ARB">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint64"/>
+    </function>
+
+    <function name="Uniform2ui64ARB">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint64"/>
+        <param name="y" type="GLuint64"/>
+    </function>
+
+    <function name="Uniform3ui64ARB">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint64"/>
+        <param name="y" type="GLuint64"/>
+        <param name="z" type="GLuint64"/>
+    </function>
+
+    <function name="Uniform4ui64ARB">
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint64"/>
+        <param name="y" type="GLuint64"/>
+        <param name="z" type="GLuint64"/>
+        <param name="w" type="GLuint64"/>
+    </function>
+
+    <function name="Uniform1ui64vARB">
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint64 *"/>
+    </function>
+
+    <function name="Uniform2ui64vARB">
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint64 *"/>
+    </function>
+
+    <function name="Uniform3ui64vARB">
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint64 *"/>
+    </function>
+
+    <function name="Uniform4ui64vARB">
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint64 *"/>
+    </function>
+
+    <function name="GetUniformi64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="params" type="GLint64 *"/>
+    </function>
+
+    <function name="GetUniformui64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="params" type="GLuint64 *"/>
+    </function>
+
+    <function name="GetnUniformi64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+	<param name="bufSize" type="GLsizei"/>
+        <param name="params" type="GLint64 *"/>
+    </function>
+
+    <function name="GetnUniformui64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+	<param name="bufSize" type="GLsizei"/>
+        <param name="params" type="GLuint64 *"/>
+    </function>
+
+    <function name="ProgramUniform1i64ARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLint64"/>
+    </function>
+
+    <function name="ProgramUniform2i64ARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLint64"/>
+        <param name="y" type="GLint64"/>
+    </function>
+
+    <function name="ProgramUniform3i64ARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLint64"/>
+        <param name="y" type="GLint64"/>
+        <param name="z" type="GLint64"/>
+    </function>
+
+    <function name="ProgramUniform4i64ARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLint64"/>
+        <param name="y" type="GLint64"/>
+        <param name="z" type="GLint64"/>
+        <param name="w" type="GLint64"/>
+    </function>
+
+    <function name="ProgramUniform1i64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLint64 *"/>
+    </function>
+
+    <function name="ProgramUniform2i64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLint64 *"/>
+    </function>
+
+    <function name="ProgramUniform3i64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLint64 *"/>
+    </function>
+
+    <function name="ProgramUniform4i64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLint64 *"/>
+    </function>
+
+    <function name="ProgramUniform1ui64ARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint64"/>
+    </function>
+
+    <function name="ProgramUniform2ui64ARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint64"/>
+        <param name="y" type="GLuint64"/>
+    </function>
+
+    <function name="ProgramUniform3ui64ARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint64"/>
+        <param name="y" type="GLuint64"/>
+        <param name="z" type="GLuint64"/>
+    </function>
+
+    <function name="ProgramUniform4ui64ARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="x" type="GLuint64"/>
+        <param name="y" type="GLuint64"/>
+        <param name="z" type="GLuint64"/>
+        <param name="w" type="GLuint64"/>
+    </function>
+
+    <function name="ProgramUniform1ui64vARB">
+        <param name="program" type="GLuint"/>
+	<param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint64 *"/>
+    </function>
+
+    <function name="ProgramUniform2ui64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint64 *"/>
+    </function>
+
+    <function name="ProgramUniform3ui64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint64 *"/>
+    </function>
+
+    <function name="ProgramUniform4ui64vARB">
+        <param name="program" type="GLuint"/>
+        <param name="location" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="value" type="const GLuint64 *"/>
+    </function>
+
+    <enum name="INT64_ARB"   value="0x140E"/>
+    <enum name="UNSIGNED_INT64_ARB"   value="0x140F"/>
+    <enum name="INT64_VEC2_ARB"   value="0x8FE9"/>
+    <enum name="INT64_VEC3_ARB"   value="0x8FEA"/>
+    <enum name="INT64_VEC4_ARB"   value="0x8FEB"/>
+    <enum name="UNSIGNED_INT64_VEC2_ARB"   value="0x8FF5"/>
+    <enum name="UNSIGNED_INT64_VEC3_ARB"   value="0x8FF6"/>
+    <enum name="UNSIGNED_INT64_VEC4_ARB"   value="0x8FF7"/>
+
+</category>
+
+</OpenGLAPI>
+
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index bd5115798cb..079b1bb225e 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -139,6 +139,7 @@ API_XML = \
 	ARB_get_program_binary.xml \
 	ARB_get_texture_sub_image.xml \
 	ARB_gpu_shader_fp64.xml \
+	ARB_gpu_shader_int64.xml \
 	ARB_gpu_shader5.xml \
 	ARB_indirect_parameters.xml \
 	ARB_instanced_arrays.xml \
diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mapi/glapi/gen/apiexec.py
index 4bdc95d68e2..e5e1b7d78cb 100644
--- a/src/mapi/glapi/gen/apiexec.py
+++ b/src/mapi/glapi/gen/apiexec.py
@@ -252,4 +252,43 @@ functions = {
     "GetQueryBufferObjectuiv": exec_info(core=31),
     "GetQueryBufferObjecti64v": exec_info(core=31),
     "GetQueryBufferObjectui64v": exec_info(core=31),
+
+    # GL_ARB_gpu_shader_int64 - nominally requires OpenGL 4.0, and Mesa
+    # only supports 4.0 in core profile.
+    "Uniform1i64ARB": exec_info(core=31),
+    "Uniform2i64ARB": exec_info(core=31),
+    "Uniform3i64ARB": exec_info(core=31),
+    "Uniform4i64ARB": exec_info(core=31),
+    "Uniform1i64vARB": exec_info(core=31),
+    "Uniform2i64vARB": exec_info(core=31),
+    "Uniform3i64vARB": exec_info(core=31),
+    "Uniform4i64vARB": exec_info(core=31),
+    "Uniform1ui64ARB": exec_info(core=31),
+    "Uniform2ui64ARB": exec_info(core=31),
+    "Uniform3ui64ARB": exec_info(core=31),
+    "Uniform4ui64ARB": exec_info(core=31),
+    "Uniform1ui64vARB": exec_info(core=31),
+    "Uniform2ui64vARB": exec_info(core=31),
+    "Uniform3ui64vARB": exec_info(core=31),
+    "Uniform4ui64vARB": exec_info(core=31),
+    "GetUniformi64vARB": exec_info(core=31),
+    "GetUniformui64vARB": exec_info(core=31),
+    "GetnUniformi64vARB": exec_info(core=31),
+    "GetnUniformui64vARB": exec_info(core=31),
+    "ProgramUniform1i64ARB": exec_info(core=31),
+    "ProgramUniform2i64ARB": exec_info(core=31),
+    "ProgramUniform3i64ARB": exec_info(core=31),
+    "ProgramUniform4i64ARB": exec_info(core=31),
+    "ProgramUniform1i64vARB": exec_info(core=31),
+    "ProgramUniform2i64vARB": exec_info(core=31),
+    "ProgramUniform3i64vARB": exec_info(core=31),
+    "ProgramUniform4i64vARB": exec_info(core=31),
+    "ProgramUniform1ui64ARB": exec_info(core=31),
+    "ProgramUniform2ui64ARB": exec_info(core=31),
+    "ProgramUniform3ui64ARB": exec_info(core=31),
+    "ProgramUniform4ui64ARB": exec_info(core=31),
+    "ProgramUniform1ui64vARB": exec_info(core=31),
+    "ProgramUniform2ui64vARB": exec_info(core=31),
+    "ProgramUniform3ui64vARB": exec_info(core=31),
+    "ProgramUniform4ui64vARB": exec_info(core=31),
 }
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 6e00363b6f6..2f421f5a57d 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8361,6 +8361,8 @@
 
 </category>
 
+<xi:include href="ARB_gpu_shader_int64.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- Non-ARB extensions sorted by extension number. -->
 
 <category name="GL_EXT_blend_color" number="2">