From b9eef27920ca7b670225cdc529f200b30140dc39 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 19 Feb 2020 22:15:51 -0500
Subject: [PATCH] glthread: add support for glMemoryObjectParameteriv,
 glSemaphoreParameterui64v

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3948>
---
 src/mapi/glapi/gen/EXT_external_objects.xml |  4 ++--
 src/mesa/main/marshal.h                     | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/gen/EXT_external_objects.xml b/src/mapi/glapi/gen/EXT_external_objects.xml
index ebcf6d7a4ac..d8e4f9a57f6 100644
--- a/src/mapi/glapi/gen/EXT_external_objects.xml
+++ b/src/mapi/glapi/gen/EXT_external_objects.xml
@@ -55,7 +55,7 @@
     <function name="MemoryObjectParameterivEXT" es2="3.2">
         <param name="memoryObject" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLint *"/>
+        <param name="params" type="const GLint *" count="_mesa_memobj_enum_to_count(pname)"/>
     </function>
 
     <function name="GetMemoryObjectParameterivEXT" es2="3.2">
@@ -202,7 +202,7 @@
     <function name="SemaphoreParameterui64vEXT" es2="3.2">
         <param name="semaphore" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLuint64 *"/>
+        <param name="params" type="const GLuint64 *" count="_mesa_semaphore_enum_to_count(pname)"/>
     </function>
 
     <function name="GetSemaphoreParameterui64vEXT" es2="3.2">
diff --git a/src/mesa/main/marshal.h b/src/mesa/main/marshal.h
index 350e7c47d30..5754d66f6e6 100644
--- a/src/mesa/main/marshal.h
+++ b/src/mesa/main/marshal.h
@@ -476,4 +476,25 @@ _mesa_patch_param_enum_to_count(GLenum pname)
    }
 }
 
+static inline unsigned
+_mesa_memobj_enum_to_count(GLenum pname)
+{
+   switch (pname) {
+   case GL_DEDICATED_MEMORY_OBJECT_EXT:
+      return 1;
+   default:
+      return 0;
+   }
+}
+
+static inline unsigned
+_mesa_semaphore_enum_to_count(GLenum pname)
+{
+   switch (pname) {
+   /* EXT_semaphore and EXT_semaphore_fd define no parameters */
+   default:
+      return 0;
+   }
+}
+
 #endif /* MARSHAL_H */
-- 
2.30.2