mapi: added EXT_external_objects_win32 definitions

Includes implementation stubs

Acked-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15504>

diff --git a/src/mapi/glapi/gen/EXT_external_objects_win32.xml b/src/mapi/glapi/gen/EXT_external_objects_win32.xml
new file mode 100644 (file)
index 0000000..7fccee9
--- /dev/null
+++ b/src/mapi/glapi/gen/EXT_external_objects_win32.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="EXT_external_objects_win32" number="505">
+
+    <enum name="GL_HANDLE_TYPE_OPAQUE_WIN32_EXT"              value="0x9587"/>
+    <enum name="DEVICE_LUID_EXT"                              value="0x9599"/>
+    <enum name="DEVICE_NODE_MASK_EXT"                         value="0x959A"/>
+
+    <function name="ImportMemoryWin32HandleEXT" es2="3.2">
+        <param name="memory" type="GLuint"/>
+        <param name="size" type="GLuint64"/>
+        <param name="handleType" type="GLenum"/>
+        <param name="handle" type="GLvoid *"/>
+    </function>
+
+    <function name="ImportSemaphoreWin32HandleEXT" es2="3.2">
+        <param name="semaphore" type="GLuint"/>
+        <param name="handleType" type="GLenum"/>
+        <param name="handle" type="GLvoid *"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index cc5d948..ebef7be 100644 (file)
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -12898,6 +12898,7 @@
 
 <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="EXT_external_objects_win32.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="NV_viewport_swizzle.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 

diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build
index 1b80758..d825893 100644 (file)
--- a/src/mapi/glapi/gen/meson.build
+++ b/src/mapi/glapi/gen/meson.build
@@ -115,6 +115,7 @@ api_xml_files = files(
   'EXT_draw_buffers2.xml',
   'EXT_external_objects.xml',
   'EXT_external_objects_fd.xml',
+  'EXT_external_objects_win32.xml',
   'EXT_framebuffer_object.xml',
   'EXT_gpu_shader4.xml',
   'EXT_multisampled_render_to_texture.xml',

diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py
index c634304..88a5103 100644 (file)
--- a/src/mapi/glapi/gen/static_data.py
+++ b/src/mapi/glapi/gen/static_data.py
@@ -1691,6 +1691,8 @@ offsets = {
     "VertexAttribs4hvNV": 1655,
     "TexPageCommitmentARB": 1656,
     "TexturePageCommitmentEXT": 1657,
+    "ImportMemoryWin32HandleEXT": 1658,
+    "ImportSemaphoreWin32HandleEXT": 1659,
 }
 
 functions = [

diff --git a/src/mesa/main/consts_exts.h b/src/mesa/main/consts_exts.h
index 8af55ad..ac43638 100644 (file)
--- a/src/mesa/main/consts_exts.h
+++ b/src/mesa/main/consts_exts.h
@@ -176,6 +176,7 @@ struct gl_extensions
    GLboolean EXT_gpu_shader4;
    GLboolean EXT_memory_object;
    GLboolean EXT_memory_object_fd;
+   GLboolean EXT_memory_object_win32;
    GLboolean EXT_multisampled_render_to_texture;
    GLboolean EXT_packed_float;
    GLboolean EXT_pixel_buffer_object;
@@ -183,6 +184,7 @@ struct gl_extensions
    GLboolean EXT_render_snorm;
    GLboolean EXT_semaphore;
    GLboolean EXT_semaphore_fd;
+   GLboolean EXT_semaphore_win32;
    GLboolean EXT_shader_image_load_formatted;
    GLboolean EXT_shader_image_load_store;
    GLboolean EXT_shader_integer_mix;

diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index e1a242a..696a9aa 100644 (file)
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -261,6 +261,7 @@ EXT(EXT_gpu_shader5                         , ARB_gpu_shader5
 EXT(EXT_map_buffer_range                    , ARB_map_buffer_range                   ,  x ,  x , ES1, ES2, 2012)
 EXT(EXT_memory_object                       , EXT_memory_object                      , GLL, GLC,  x , ES2, 2017)
 EXT(EXT_memory_object_fd                    , EXT_memory_object_fd                   , GLL, GLC,  x , ES2, 2017)
+EXT(EXT_memory_object_win32                 , EXT_memory_object_win32                , GLL, GLC,  x , ES2, 2017)
 EXT(EXT_multi_draw_arrays                   , dummy_true                             , GLL,  x , ES1, ES2, 1999)
 EXT(EXT_multisampled_render_to_texture      , EXT_multisampled_render_to_texture     ,  x ,  x ,  x , ES2, 2016)
 EXT(EXT_multisampled_render_to_texture2     , EXT_multisampled_render_to_texture     ,  x ,  x ,  x , ES2, 2016)
@@ -281,6 +282,7 @@ EXT(EXT_sRGB_write_control                  , EXT_framebuffer_sRGB
 EXT(EXT_secondary_color                     , dummy_true                             , GLL,  x ,  x ,  x , 1999)
 EXT(EXT_semaphore                           , EXT_semaphore                          , GLL, GLC,  x , ES2, 2017)
 EXT(EXT_semaphore_fd                        , EXT_semaphore_fd                       , GLL, GLC,  x , ES2, 2017)
+EXT(EXT_semaphore_win32                     , EXT_semaphore_win32                    , GLL, GLC,  x , ES2, 2017)
 EXT(EXT_separate_shader_objects             , dummy_true                             ,  x ,  x ,  x , ES2, 2013)
 EXT(EXT_separate_specular_color             , dummy_true                             , GLL,  x ,  x ,  x , 1997)
 EXT(EXT_shader_framebuffer_fetch            , EXT_shader_framebuffer_fetch           , GLL, GLC,  x , ES2, 2013)

diff --git a/src/mesa/main/externalobjects.c b/src/mesa/main/externalobjects.c
index 0462df4..960db73 100644 (file)
--- a/src/mesa/main/externalobjects.c
+++ b/src/mesa/main/externalobjects.c
@@ -996,6 +996,14 @@ _mesa_ImportMemoryFdEXT(GLuint memory,
 }
 
 void GLAPIENTRY
+_mesa_ImportMemoryWin32HandleEXT(GLuint memory,
+                                 GLuint64 size,
+                                 GLenum handleType,
+                                 void *handle)
+{
+}
+
+void GLAPIENTRY
 _mesa_ImportSemaphoreFdEXT(GLuint semaphore,
                            GLenum handleType,
                            GLint fd)
@@ -1030,3 +1038,10 @@ _mesa_ImportSemaphoreFdEXT(GLuint semaphore,
 
    import_semaphoreobj_fd(ctx, semObj, fd);
 }
+
+void GLAPIENTRY
+_mesa_ImportSemaphoreWin32HandleEXT(GLuint semaphore,
+                           GLenum handleType,
+                           void *handle)
+{
+}
\ No newline at end of file