mapi: add EXT_external_objects and EXT_external_objects_fd

Includes implementation stubs.

Signed-off-by: Andres Rodriguez <[email protected]>
Acked-by: Timothy Arceri <[email protected]>
Acked-by: Samuel Pitoiset <[email protected]>

5 files changed, 268 insertions, 0 deletions

diff --git a/src/mapi/glapi/gen/EXT_external_objects.xml b/src/mapi/glapi/gen/EXT_external_objects.xml
new file mode 100644
index 00000000000..25e6879ec7b
--- /dev/null
+++ b/src/mapi/glapi/gen/EXT_external_objects.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="EXT_external_objects" number="503">
+
+    <enum name="TEXTURE_TILING_EXT"                     value="0x9580"/>
+    <enum name="DEDICATED_MEMORY_OBJECT_EXT"            value="0x9581"/>
+    <enum name="PROTECTED_MEMORY_OBJECT_EXT"            value="0x959B"/>
+    <enum name="NUM_TILING_TYPES_EXT"                   value="0x9582"/>
+    <enum name="TILING_TYPES_EXT"                       value="0x9583"/>
+    <enum name="OPTIMAL_TILING_EXT"                     value="0x9584"/>
+    <enum name="LINEAR_TILING_EXT"                      value="0x9585"/>
+    <enum name="NUM_DEVICE_UUIDS_EXT"                   value="0x9596"/>
+    <enum name="DEVICE_UUID_EXT"                        value="0x9597"/>
+    <enum name="DRIVER_UUID_EXT"                        value="0x9598"/>
+    <enum name="LAYOUT_GENERAL_EXT"                     value="0x958D"/>
+    <enum name="LAYOUT_COLOR_ATTACHMENT_EXT"            value="0x958E"/>
+    <enum name="LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT"    value="0x958F"/>
+    <enum name="LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT"     value="0x9590"/>
+    <enum name="LAYOUT_SHADER_READ_ONLY_EXT"            value="0x9591"/>
+    <enum name="LAYOUT_TRANSFER_SRC_EXT"                value="0x9592"/>
+    <enum name="LAYOUT_TRANSFER_DST_EXT"                value="0x9593"/>
+
+    <function name="GetUnsignedBytevEXT" es2="3.2">
+        <param name="pname" type="GLenum"/>
+        <param name="data" type="GLubyte *"/>
+    </function>
+
+    <function name="GetUnsignedBytei_vEXT" es2="3.2">
+        <param name="target" type="GLenum"/>
+        <param name="index" type="GLuint"/>
+        <param name="data" type="GLubyte *"/>
+    </function>
+
+    <function name="DeleteMemoryObjectsEXT" es2="3.2">
+        <param name="n" type="GLsizei"/>
+        <param name="memoryObjects" type="const GLuint *"/>
+    </function>
+
+    <function name="IsMemoryObjectEXT" es2="3.2">
+        <param name="memoryObject" type="GLuint"/>
+        <return type="GLboolean"/>
+    </function>
+
+    <function name="CreateMemoryObjectsEXT" es2="3.2">
+        <param name="n" type="GLsizei"/>
+        <param name="memoryObjects" type="GLuint *"/>
+    </function>
+
+    <function name="MemoryObjectParameterivEXT" es2="3.2">
+        <param name="memoryObject" type="GLuint"/>
+        <param name="pname" type="GLenum"/>
+        <param name="params" type="const GLint *"/>
+    </function>
+
+    <function name="GetMemoryObjectParameterivEXT" es2="3.2">
+        <param name="memoryObject" type="GLuint"/>
+        <param name="pname" type="GLenum"/>
+        <param name="params" type="GLint *"/>
+    </function>
+
+    <function name="TexStorageMem2DEXT" es2="3.2">
+        <param name="target" type="GLenum"/>
+        <param name="levels" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="height" type="GLsizei"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="TexStorageMem2DMultisampleEXT" es2="3.2">
+        <param name="target" type="GLenum"/>
+        <param name="samples" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="height" type="GLsizei"/>
+        <param name="fixedSampleLocations" type="GLboolean"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="TexStorageMem3DEXT" es2="3.2">
+        <param name="target" type="GLenum"/>
+        <param name="levels" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="height" type="GLsizei"/>
+        <param name="depth" type="GLsizei"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="TexStorageMem3DMultisampleEXT" es2="3.2">
+        <param name="target" type="GLenum"/>
+        <param name="samples" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="height" type="GLsizei"/>
+        <param name="depth" type="GLsizei"/>
+        <param name="fixedSampleLocations" type="GLboolean"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="BufferStorageMemEXT" es2="3.2" no_error="true">
+        <param name="target" type="GLenum"/>
+        <param name="size" type="GLsizeiptr"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+     </function>
+
+    <function name="TextureStorageMem2DEXT" es2="3.2">
+        <param name="texture" type="GLenum"/>
+        <param name="levels" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="height" type="GLsizei"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="TextureStorageMem2DMultisampleEXT" es2="3.2">
+        <param name="texture" type="GLuint"/>
+        <param name="samples" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="height" type="GLsizei"/>
+        <param name="fixedSampleLocations" type="GLboolean"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="TextureStorageMem3DEXT" es2="3.2">
+        <param name="texture" type="GLuint"/>
+        <param name="levels" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="height" type="GLsizei"/>
+        <param name="depth" type="GLsizei"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="TextureStorageMem3DMultisampleEXT" es2="3.2">
+        <param name="texture" type="GLuint"/>
+        <param name="samples" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="height" type="GLsizei"/>
+        <param name="depth" type="GLsizei"/>
+        <param name="fixedSampleLocations" type="GLboolean"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="NamedBufferStorageMemEXT" es2="3.2" no_error="true">
+        <param name="buffer" type="GLuint"/>
+        <param name="size" type="GLsizeiptr"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="TexStorageMem1DEXT">
+        <param name="target" type="GLenum"/>
+        <param name="levels" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="TextureStorageMem1DEXT">
+        <param name="texture" type="GLuint"/>
+        <param name="levels" type="GLsizei"/>
+        <param name="internalFormat" type="GLenum"/>
+        <param name="width" type="GLsizei"/>
+        <param name="memory" type="GLuint"/>
+        <param name="offset" type="GLuint64"/>
+    </function>
+
+    <function name="GenSemaphoresEXT" es2="3.2">
+        <param name="n" type="GLsizei"/>
+        <param name="semaphores" type="GLuint *"/>
+    </function>
+
+    <function name="DeleteSemaphoresEXT" es2="3.2">
+        <param name="n" type="GLsizei"/>
+        <param name="semaphores" type="const GLuint *"/>
+    </function>
+
+    <function name="IsSemaphoreEXT" es2="3.2">
+        <param name="semaphore" type="GLuint"/>
+        <return type="GLboolean"/>
+    </function>
+
+    <function name="SemaphoreParameterui64vEXT" es2="3.2">
+        <param name="semaphore" type="GLuint"/>
+        <param name="pname" type="GLenum"/>
+        <param name="params" type="const GLuint64 *"/>
+    </function>
+
+    <function name="GetSemaphoreParameterui64vEXT" es2="3.2">
+        <param name="semaphore" type="GLuint"/>
+        <param name="pname" type="GLenum"/>
+        <param name="params" type="GLuint64 *"/>
+    </function>
+
+    <function name="WaitSemaphoreEXT" es2="3.2">
+        <param name="semaphore" type="GLuint"/>
+        <param name="numBufferBarriers" type="GLuint"/>
+        <param name="buffers" type="const GLuint *"/>
+        <param name="numTextureBarriers" type="GLuint"/>
+        <param name="textures" type="const GLuint *"/>
+        <param name="srcLayouts" type="const GLenum *"/>
+    </function>
+
+    <function name="SignalSemaphoreEXT" es2="3.2">
+        <param name="semaphore" type="GLuint"/>
+        <param name="numBufferBarriers" type="GLuint"/>
+        <param name="buffers" type="const GLuint *"/>
+        <param name="numTextureBarriers" type="GLuint"/>
+        <param name="textures" type="const GLuint *"/>
+        <param name="dstLayouts" type="const GLenum *"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/src/mapi/glapi/gen/EXT_external_objects_fd.xml b/src/mapi/glapi/gen/EXT_external_objects_fd.xml
new file mode 100644
index 00000000000..6eaa3f5b0cc
--- /dev/null
+++ b/src/mapi/glapi/gen/EXT_external_objects_fd.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="EXT_external_objects_fd" number="504">
+
+    <enum name="HANDLE_TYPE_OPAQUE_FD_EXT"              value="0x9586"/>
+
+    <function name="ImportMemoryFdEXT" es2="3.2">
+        <param name="memory" type="GLuint"/>
+        <param name="size" type="GLuint64"/>
+        <param name="handleType" type="GLenum"/>
+        <param name="fd" type="GLint"/>
+    </function>
+
+    <function name="ImportSemaphoreFdEXT" es2="3.2">
+        <param name="semaphore" type="GLuint"/>
+        <param name="handleType" type="GLenum"/>
+        <param name="fd" type="GLint"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index bd04519f804..7f4a4693030 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -192,6 +192,8 @@ API_XML = \
 	APPLE_object_purgeable.xml \
 	APPLE_vertex_array_object.xml \
 	EXT_draw_buffers2.xml \
+	EXT_external_objects.xml \
+	EXT_external_objects_fd.xml \
 	EXT_framebuffer_object.xml \
 	EXT_gpu_shader4.xml \
 	EXT_packed_depth_stencil.xml \
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 8e50a015069..eb1d9b83b27 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -13060,6 +13060,9 @@
 
 <xi:include href="NV_vdpau_interop.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="EXT_external_objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="EXT_external_objects_fd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="GL4x.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 </OpenGLAPI>
diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
index 57e155bd1fa..b7b22328ff8 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -75,6 +75,7 @@ header = """/**
 #include "main/errors.h"
 #include "main/es1_conversion.h"
 #include "main/eval.h"
+#include "main/externalobjects.h"
 #include "main/get.h"
 #include "main/feedback.h"
 #include "main/fog.h"