Mesa (master): glthread: fix glVertexAttribDivisor calls not being tracked by non-VBO uploads

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b5a0714aaeb207d1601dae3b23efd3587c159ef5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5a0714aaeb207d1601dae3b23efd3587c159ef5

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Jan 27 22:21:32 2021 -0500

glthread: fix glVertexAttribDivisor calls not being tracked by non-VBO uploads

marshal_call_after is ignored if the function is an alias of another
function. Move it to the right place.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Reviewed-by: Zoltán Böszörményi <zboszor at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8753>

---

 src/mapi/glapi/gen/ARB_instanced_arrays.xml | 3 +--
 src/mapi/glapi/gen/GL3x.xml                 | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/src/mapi/glapi/gen/ARB_instanced_arrays.xml
index feeeeabeb1c..49f92cfe8ec 100644
--- a/src/mapi/glapi/gen/ARB_instanced_arrays.xml
+++ b/src/mapi/glapi/gen/ARB_instanced_arrays.xml
@@ -10,8 +10,7 @@
 
   <enum name="VERTEX_ATTRIB_ARRAY_DIVISOR_ARB" value="0x88FE"/>
 
-  <function name="VertexAttribDivisorARB" alias="VertexAttribDivisor"
-            marshal_call_after="if (COMPAT) _mesa_glthread_AttribDivisor(ctx, NULL, VERT_ATTRIB_GENERIC(index), divisor);">
+  <function name="VertexAttribDivisorARB" alias="VertexAttribDivisor">
     <param name="index" type="GLuint"/>
     <param name="divisor" type="GLuint"/>
   </function>
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index f9506466cc5..c44245964af 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -626,7 +626,8 @@
   <enum name="TEXTURE_SWIZZLE_A"                value="0x8E45"/>
   <enum name="TEXTURE_SWIZZLE_RGBA"             value="0x8E46"/>
 
-  <function name="VertexAttribDivisor" es2="3.0" no_error="true">
+  <function name="VertexAttribDivisor" es2="3.0" no_error="true"
+            marshal_call_after="if (COMPAT) _mesa_glthread_AttribDivisor(ctx, NULL, VERT_ATTRIB_GENERIC(index), divisor);">
     <param name="index" type="GLuint"/>
     <param name="divisor" type="GLuint"/>
   </function>