diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 0be8db19b66..21bf9acfea6 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -222,21 +222,21 @@
       <param name="framebuffer" type="GLuint" />
       <param name="buffer" type="GLenum" />
       <param name="drawbuffer" type="GLint" />
-      <param name="value" type="const GLint *" count="_mesa_buffer_enum_to_count(buffer)"/>
+      <param name="value" type="const GLint *" marshal_count="_mesa_buffer_enum_to_count(buffer)"/>
    </function>
 
    <function name="ClearNamedFramebufferuiv">
       <param name="framebuffer" type="GLuint" />
       <param name="buffer" type="GLenum" />
       <param name="drawbuffer" type="GLint" />
-      <param name="value" type="const GLuint *" count="_mesa_buffer_enum_to_count(buffer)"/>
+      <param name="value" type="const GLuint *" marshal_count="_mesa_buffer_enum_to_count(buffer)"/>
    </function>
 
    <function name="ClearNamedFramebufferfv">
       <param name="framebuffer" type="GLuint" />
       <param name="buffer" type="GLenum" />
       <param name="drawbuffer" type="GLint" />
-      <param name="value" type="const GLfloat *" count="_mesa_buffer_enum_to_count(buffer)"/>
+      <param name="value" type="const GLfloat *" marshal_count="_mesa_buffer_enum_to_count(buffer)"/>
    </function>
 
    <function name="ClearNamedFramebufferfi">
@@ -493,7 +493,7 @@
    <function name="TextureParameterfv">
       <param name="texture" type="GLuint" />
       <param name="pname" type="GLenum" />
-      <param name="param" type="const GLfloat *" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="param" type="const GLfloat *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="TextureParameteri">
@@ -505,19 +505,19 @@
    <function name="TextureParameterIiv">
       <param name="texture" type="GLuint" />
       <param name="pname" type="GLenum" />
-      <param name="params" type="const GLint *" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLint *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="TextureParameterIuiv">
       <param name="texture" type="GLuint" />
       <param name="pname" type="GLenum" />
-      <param name="params" type="const GLuint *" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLuint *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="TextureParameteriv">
       <param name="texture" type="GLuint" />
       <param name="pname" type="GLenum" />
-      <param name="param" type="const GLint *" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="param" type="const GLint *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="GenerateTextureMipmap" no_error="true">
diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml
index e4dc0f6241c..f4b2ad7a50b 100644
--- a/src/mapi/glapi/gen/ARB_sampler_objects.xml
+++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml
@@ -42,25 +42,25 @@
     <function name="SamplerParameteriv" es2="2.0" exec="dlist">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
-      <param name="params" type="const GLint *" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLint *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
     </function>
 
     <function name="SamplerParameterfv" es2="2.0" exec="dlist">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
-      <param name="params" type="const GLfloat *" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLfloat *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
     </function>
 
     <function name="SamplerParameterIiv" es2="3.2" exec="dlist">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
-      <param name="params" type="const GLint *" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLint *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
     </function>
 
     <function name="SamplerParameterIuiv" es2="3.2" exec="dlist">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
-      <param name="params" type="const GLuint *" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLuint *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
     </function>
 
     <function name="GetSamplerParameteriv" es2="2.0">
diff --git a/src/mapi/glapi/gen/ARB_tessellation_shader.xml b/src/mapi/glapi/gen/ARB_tessellation_shader.xml
index 88d47851c65..674988af4a1 100644
--- a/src/mapi/glapi/gen/ARB_tessellation_shader.xml
+++ b/src/mapi/glapi/gen/ARB_tessellation_shader.xml
@@ -56,7 +56,7 @@
     </function>
     <function name="PatchParameterfv" exec="dlist">
         <param name="pname" type="GLenum"/>
-        <param name="values" type="const GLfloat *" count="_mesa_patch_param_enum_to_count(pname)"/>
+        <param name="values" type="const GLfloat *" marshal_count="_mesa_patch_param_enum_to_count(pname)"/>
     </function>
 
     <function name="PatchParameteriEXT" es2="3.1" alias="PatchParameteri">
diff --git a/src/mapi/glapi/gen/EXT_direct_state_access.xml b/src/mapi/glapi/gen/EXT_direct_state_access.xml
index db9d9af7608..0f1055c80d2 100644
--- a/src/mapi/glapi/gen/EXT_direct_state_access.xml
+++ b/src/mapi/glapi/gen/EXT_direct_state_access.xml
@@ -156,7 +156,7 @@
        <param name="texture" type="GLuint" />
        <param name="target" type="GLenum" />
        <param name="pname" type="GLenum" />
-       <param name="params" type="const GLint *" count="_mesa_tex_param_enum_to_count(pname)"/>
+       <param name="params" type="const GLint *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
     </function>
 
     <function name="TextureParameterfEXT" deprecated="3.1" exec="dlist">
@@ -170,7 +170,7 @@
        <param name="texture" type="GLuint" />
        <param name="target" type="GLenum" />
        <param name="pname" type="GLenum" />
-       <param name="params" type="const float *" count="_mesa_tex_param_enum_to_count(pname)"/>
+       <param name="params" type="const float *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
     </function>
 
    <function name="TextureImage1DEXT" deprecated="3.1" exec="dlist"
@@ -372,7 +372,7 @@
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="param" type="const GLint *" count="_mesa_texenv_enum_to_count(pname)"/>
+      <param name="param" type="const GLint *" marshal_count="_mesa_texenv_enum_to_count(pname)"/>
    </function>
 
    <function name="MultiTexEnvfEXT" deprecated="3.1" exec="dlist">
@@ -386,7 +386,7 @@
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="param" type="const GLfloat *" count="_mesa_texenv_enum_to_count(pname)"/>
+      <param name="param" type="const GLfloat *" marshal_count="_mesa_texenv_enum_to_count(pname)"/>
    </function>
 
    <function name="GetMultiTexEnvivEXT" deprecated="3.1">
@@ -414,7 +414,7 @@
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="param" type="const GLint*" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="param" type="const GLint*" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="MultiTexParameterfEXT" deprecated="3.1" exec="dlist">
@@ -428,7 +428,7 @@
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="param" type="const GLfloat*" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="param" type="const GLfloat*" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="GetMultiTexParameterivEXT" deprecated="3.1">
@@ -624,7 +624,7 @@
       <param name="texunit" type="GLenum" />
       <param name="coord" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="param" type="const GLdouble*" count="_mesa_texgen_enum_to_count(pname)"/>
+      <param name="param" type="const GLdouble*" marshal_count="_mesa_texgen_enum_to_count(pname)"/>
    </function>
 
    <function name="MultiTexGenfEXT" deprecated="3.1">
@@ -638,7 +638,7 @@
       <param name="texunit" type="GLenum" />
       <param name="coord" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="param" type="const GLfloat *" count="_mesa_texgen_enum_to_count(pname)"/>
+      <param name="param" type="const GLfloat *" marshal_count="_mesa_texgen_enum_to_count(pname)"/>
    </function>
 
    <function name="MultiTexGeniEXT" deprecated="3.1">
@@ -652,7 +652,7 @@
       <param name="texunit" type="GLenum" />
       <param name="coord" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="param" type="const GLint *" count="_mesa_texgen_enum_to_count(pname)"/>
+      <param name="param" type="const GLint *" marshal_count="_mesa_texgen_enum_to_count(pname)"/>
    </function>
 
    <function name="GetMultiTexGendvEXT" deprecated="3.1">
@@ -1342,14 +1342,14 @@
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="params" type="const GLint*" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLint*" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="TextureParameterIuivEXT" deprecated="3.1" exec="dlist">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="params" type="const GLuint*" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLuint*" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="GetTextureParameterIivEXT" deprecated="3.1">
@@ -1370,14 +1370,14 @@
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="params" type="const GLint*" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLint*" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="MultiTexParameterIuivEXT" deprecated="3.1" exec="dlist">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="pname" type="GLenum" />
-      <param name="params" type="const GLuint*" count="_mesa_tex_param_enum_to_count(pname)"/>
+      <param name="params" type="const GLuint*" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
    </function>
 
    <function name="GetMultiTexParameterIivEXT" deprecated="3.1">
diff --git a/src/mapi/glapi/gen/EXT_external_objects.xml b/src/mapi/glapi/gen/EXT_external_objects.xml
index 89bd98946d9..297b5f4e7b4 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 *" count="_mesa_memobj_enum_to_count(pname)"/>
+        <param name="params" type="const GLint *" marshal_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 *" count="_mesa_semaphore_enum_to_count(pname)"/>
+        <param name="params" type="const GLuint64 *" marshal_count="_mesa_semaphore_enum_to_count(pname)"/>
     </function>
 
     <function name="GetSemaphoreParameterui64vEXT" es2="3.2">
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index 8aae7f85a12..1c38e7723d2 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -120,19 +120,19 @@
   <function name="ClearBufferiv" es2="3.0" no_error="true" exec="dlist">
     <param name="buffer" type="GLenum"/>
     <param name="drawbuffer" type="GLint"/>
-    <param name="value" type="const GLint *" count="_mesa_buffer_enum_to_count(buffer)"/>
+    <param name="value" type="const GLint *" marshal_count="_mesa_buffer_enum_to_count(buffer)"/>
   </function>
 
   <function name="ClearBufferuiv" es2="3.0" no_error="true" exec="dlist">
     <param name="buffer" type="GLenum"/>
     <param name="drawbuffer" type="GLint"/>
-    <param name="value" type="const GLuint *" count="_mesa_buffer_enum_to_count(buffer)"/>
+    <param name="value" type="const GLuint *" marshal_count="_mesa_buffer_enum_to_count(buffer)"/>
   </function>
 
   <function name="ClearBufferfv" es2="3.0" no_error="true" exec="dlist">
     <param name="buffer" type="GLenum"/>
     <param name="drawbuffer" type="GLint"/>
-    <param name="value" type="const GLfloat *" count="_mesa_buffer_enum_to_count(buffer)"/>
+    <param name="value" type="const GLfloat *" marshal_count="_mesa_buffer_enum_to_count(buffer)"/>
   </function>
 
   <function name="ClearBufferfi" es2="3.0" no_error="true" exec="dlist">
@@ -451,13 +451,13 @@
   <function name="TexParameterIiv" es2="3.2" exec="dlist">
     <param name="target" type="GLenum"/>
     <param name="pname" type="GLenum"/>
-    <param name="params" type="const GLint *" count="_mesa_tex_param_enum_to_count(pname)"/>
+    <param name="params" type="const GLint *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
   </function>
 
   <function name="TexParameterIuiv" es2="3.2" exec="dlist">
     <param name="target" type="GLenum"/>
     <param name="pname" type="GLenum"/>
-    <param name="params" type="const GLuint *" count="_mesa_tex_param_enum_to_count(pname)"/>
+    <param name="params" type="const GLuint *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
   </function>
 
   <function name="GetTexParameterIiv" es2="3.2">
diff --git a/src/mapi/glapi/gen/OES_fixed_point.xml b/src/mapi/glapi/gen/OES_fixed_point.xml
index 73293346ca1..355d730add8 100644
--- a/src/mapi/glapi/gen/OES_fixed_point.xml
+++ b/src/mapi/glapi/gen/OES_fixed_point.xml
@@ -234,7 +234,7 @@
     <function name="TexParameterxvOES" es1="1.0" alias="TexParameterxv">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLfixed *" count="_mesa_tex_param_enum_to_count(pname)"/>
+        <param name="params" type="const GLfixed *" marshal_count="_mesa_tex_param_enum_to_count(pname)"/>
     </function>
 
     <!-- texgen -->
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index f3b31996825..6c51618c3cd 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -5321,7 +5321,7 @@
 
     <function name="DrawBuffers" es2="3.0" no_error="true" exec="dlist">
         <param name="n" type="GLsizei" counter="true"/>
-        <param name="bufs" type="const GLenum *" count="n"/>
+        <param name="bufs" type="const GLenum *" count="n" marshal_count="CLAMP(n, 0, MAX_DRAW_BUFFERS)"/>
         <glx rop="233" large="true"/>
     </function>
 
diff --git a/src/mapi/glapi/gen/gl_and_es_API.xml b/src/mapi/glapi/gen/gl_and_es_API.xml
index 0c8a1d5a9d1..5adfbd35194 100644
--- a/src/mapi/glapi/gen/gl_and_es_API.xml
+++ b/src/mapi/glapi/gen/gl_and_es_API.xml
@@ -259,7 +259,7 @@
     <function name="PointParameterxv" es1="1.1" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *"
-               count="_mesa_point_param_enum_to_count(pname)"/>
+               marshal_count="_mesa_point_param_enum_to_count(pname)"/>
     </function>
 
     <function name="TexParameterxv" es1="1.1" deprecated="3.1">