fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vbo: fix current attribs not updating gallium vertex elements

Browse source 
An initial workaround that helped discover this was written by:
Illia Polishchuk illia.a.polishchuk@globallogic.com

Closes: #8440
Fixes: a18b9d07 ("st/mesa: optimize uploading zero-stride vertex attribs")

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21805>
(cherry picked from commit 3bc374ca93)
This commit is contained in:
Marek Olšák 2023-03-08 21:59:35 -05:00 • committed by Dylan Baker
parent 9bfe45edbe
commit 45c7e3b416
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -5548,7 +5548,7 @@
"description": "vbo: fix current attribs not updating gallium vertex elements",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "a18b9d071df60d5335b69fca793a743dd0a9d8cc"
},

5
src/mesa/vbo/vbo_exec_api.c
View file

@ -230,6 +230,11 @@ vbo_exec_copy_to_current(struct vbo_exec_context *exec)
vbo_set_vertex_format(&vbo->current[i].Format,
exec->vtx.attr[i].size >> dmul_shift,
exec->vtx.attr[i].type);
/* The format changed. We need to update gallium vertex elements.
* Material attributes don't need this because they don't have formats.
*/
if (i <= VBO_ATTRIB_EDGEFLAG)
ctx->NewState |= _NEW_CURRENT_ATTRIB;
}
}

6
src/mesa/vbo/vbo_save_draw.c
View file

@ -86,8 +86,12 @@ copy_vao(struct gl_context *ctx, const struct gl_vertex_array_object *vao,
}
if (type != currval->Format.User.Type ||
(size >> dmul_shift) != currval->Format.User.Size)
(size >> dmul_shift) != currval->Format.User.Size) {
vbo_set_vertex_format(&currval->Format, size >> dmul_shift, type);
/* The format changed. We need to update gallium vertex elements. */
if (state == _NEW_CURRENT_ATTRIB)
ctx->NewState |= state;
}
*data += size;
}