fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-14 09:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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@amd.com>
Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8753>
This commit is contained in:
Marek Olšák 2021-01-27 22:21:32 -05:00 • committed by Marge Bot
parent 76c322a48d
commit b5a0714aae
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mapi/glapi/gen/ARB_instanced_arrays.xml
View file

@ -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>

3
src/mapi/glapi/gen/GL3x.xml
View file

@ -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>