From ee0d869d6696f49baad9cee04dedb9d946f4fc77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Mon, 8 Jan 2024 18:18:46 -0500
Subject: [PATCH] glapi: fix type names for glthread and handle all types

glthread will compare the whole type string, so the string must not have
trailing spaces.

No functional change.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27350>
---
 src/mapi/glapi/gen/ARB_program_interface_query.xml | 6 +++---
 src/mapi/glapi/gen/gl_API.xml                      | 2 +-
 src/mapi/glapi/gen/marshal_XML.py                  | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_program_interface_query.xml b/src/mapi/glapi/gen/ARB_program_interface_query.xml
index c3162f5ed16..c14cb6ba767 100644
--- a/src/mapi/glapi/gen/ARB_program_interface_query.xml
+++ b/src/mapi/glapi/gen/ARB_program_interface_query.xml
@@ -74,7 +74,7 @@
         <param name="program" type="GLuint"/>
         <param name="programInterface" type="GLenum"/>
         <param name="index" type="GLuint"/>
-        <param name="bufSize" type="GLsizei "/>
+        <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *" output="true"/>
         <param name="name" type="GLchar *" output="true"/>
     </function>
@@ -83,9 +83,9 @@
         <param name="program" type="GLuint"/>
         <param name="programInterface" type="GLenum"/>
         <param name="index" type="GLuint"/>
-        <param name="propCount" type="GLsizei "/>
+        <param name="propCount" type="GLsizei"/>
         <param name="props" type="const GLenum *" output="true"/>
-        <param name="bufSize" type="GLsizei "/>
+        <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *" output="true"/>
         <param name="params" type="GLint *" output="true"/>
     </function>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index b2e91ff7b7f..7dbcced8caa 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -5410,7 +5410,7 @@
     <function name="GetActiveAttrib" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="index" type="GLuint"/>
-        <param name="bufSize" type="GLsizei "/>
+        <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *" output="true"/>
         <param name="size" type="GLint *" output="true"/>
         <param name="type" type="GLenum *" output="true"/>
diff --git a/src/mapi/glapi/gen/marshal_XML.py b/src/mapi/glapi/gen/marshal_XML.py
index f6025743052..b2465438710 100644
--- a/src/mapi/glapi/gen/marshal_XML.py
+++ b/src/mapi/glapi/gen/marshal_XML.py
@@ -24,6 +24,7 @@
 # building thread marshalling code.
 
 import gl_XML
+import sys
 
 # We decrease the type size when it's safe, such as when the maximum value
 # and all greater values are invalid.
@@ -95,10 +96,11 @@ def get_type_size(func_name, param):
         'GLuint64': 8,
         'GLuint64EXT': 8,
         'GLsync': 8,
+        'GLDEBUGPROC': 8,
     }
     val = mapping.get(type, 9999)
     if val == 9999:
-        print('Unhandled type in marshal_XML.get_type_size: ' + type, file=sys.stderr)
+        print('Unhandled type in marshal_XML.get_type_size: "{0}"'.format(type), file=sys.stderr)
         assert False
     return val