From 8f11c0553c3d65f1892c472dc7cd75f12f0eb072 Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Sat, 9 Jul 2022 19:14:17 -0700
Subject: [PATCH] mapi: Add more EXT_external_objects_win32 functions/enums
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17446>
---
 .../glapi/gen/EXT_external_objects_win32.xml   | 18 ++++++++++++++++++
 src/mapi/glapi/gen/static_data.py              |  2 ++
 src/mesa/main/externalobjects.c                | 15 +++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/src/mapi/glapi/gen/EXT_external_objects_win32.xml b/src/mapi/glapi/gen/EXT_external_objects_win32.xml
index 7fccee9284c..ae37eec0ccc 100644
--- a/src/mapi/glapi/gen/EXT_external_objects_win32.xml
+++ b/src/mapi/glapi/gen/EXT_external_objects_win32.xml
@@ -9,6 +9,11 @@
 <category name="EXT_external_objects_win32" number="505">
 
     <enum name="GL_HANDLE_TYPE_OPAQUE_WIN32_EXT"              value="0x9587"/>
+    <enum name="HANDLE_TYPE_D3D12_TILEPOOL_EXT"               value="0x9589"/>
+    <enum name="HANDLE_TYPE_D3D12_RESOURCE_EXT"               value="0x958A"/>
+    <enum name="HANDLE_TYPE_D3D11_IMAGE_EXT"                  value="0x958B"/>
+    <enum name="HANDLE_TYPE_D3D12_FENCE_EXT"                  value="0x9594"/>
+    <enum name="D3D12_FENCE_VALUE_EXT"                        value="0x9595"/>
     <enum name="DEVICE_LUID_EXT"                              value="0x9599"/>
     <enum name="DEVICE_NODE_MASK_EXT"                         value="0x959A"/>
 
@@ -19,12 +24,25 @@
         <param name="handle" type="GLvoid *"/>
     </function>
 
+    <function name="ImportMemoryWin32NameEXT" es2="3.2">
+        <param name="memory" type="GLuint"/>
+        <param name="size" type="GLuint64"/>
+        <param name="handleType" type="GLenum"/>
+        <param name="name" type="const GLvoid *"/>
+    </function>
+
     <function name="ImportSemaphoreWin32HandleEXT" es2="3.2">
         <param name="semaphore" type="GLuint"/>
         <param name="handleType" type="GLenum"/>
         <param name="handle" type="GLvoid *"/>
     </function>
 
+    <function name="ImportSemaphoreWin32NameEXT" es2="3.2">
+        <param name="semaphore" type="GLuint"/>
+        <param name="handleType" type="GLenum"/>
+        <param name="handle" type="const GLvoid *"/>
+    </function>
+
 </category>
 
 </OpenGLAPI>
diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py
index 88a51036729..95b6541a07c 100644
--- a/src/mapi/glapi/gen/static_data.py
+++ b/src/mapi/glapi/gen/static_data.py
@@ -1693,6 +1693,8 @@ offsets = {
     "TexturePageCommitmentEXT": 1657,
     "ImportMemoryWin32HandleEXT": 1658,
     "ImportSemaphoreWin32HandleEXT": 1659,
+    "ImportMemoryWin32NameEXT": 1660,
+    "ImportSemaphoreWin32NameEXT": 1661,
 }
 
 functions = [
diff --git a/src/mesa/main/externalobjects.c b/src/mesa/main/externalobjects.c
index a53b40d3fcc..14fa002326f 100644
--- a/src/mesa/main/externalobjects.c
+++ b/src/mesa/main/externalobjects.c
@@ -1060,6 +1060,14 @@ _mesa_ImportMemoryWin32HandleEXT(GLuint memory,
    memObj->Immutable = GL_TRUE;
 }
 
+void GLAPIENTRY
+_mesa_ImportMemoryWin32NameEXT(GLuint memory,
+                                 GLuint64 size,
+                                 GLenum handleType,
+                                 const void *name)
+{
+}
+
 void GLAPIENTRY
 _mesa_ImportSemaphoreFdEXT(GLuint semaphore,
                            GLenum handleType,
@@ -1131,3 +1139,10 @@ _mesa_ImportSemaphoreWin32HandleEXT(GLuint semaphore,
 
    import_semaphoreobj_win32(ctx, semObj, handle);
 }
+
+void GLAPIENTRY
+_mesa_ImportSemaphoreWin32NameEXT(GLuint semaphore,
+                                  GLenum handleType,
+                                  const void *name)
+{
+}