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

draw: handle resetting draw_id between instances.

Browse source 
If we have a multi draw then the draw_id needs to get reset
between each instance.

Fixes the rest of the VK CTS multidraw tests

Fixes: ce0b1f23c3 ("aux/draw: track increment_draw_id value from draw info")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11899>
This commit is contained in:
Dave Airlie 2021-07-15 15:25:24 +10:00
parent 5447330a25
commit b3d2642ca4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/auxiliary/draw/draw_pt.c
View file

@ -455,6 +455,7 @@ resolve_draw_info(const struct pipe_draw_info *raw_info,
*/
static void
draw_instances(struct draw_context *draw,
unsigned drawid_offset,
const struct pipe_draw_info *info,
const struct pipe_draw_start_count_bias *draws,
unsigned num_draws)
@ -473,6 +474,7 @@ draw_instances(struct draw_context *draw,
draw->instance_id = 0xffffffff;
}
draw->pt.user.drawid = drawid_offset;
draw_new_instance(draw);
if (info->primitive_restart) {
@ -601,10 +603,10 @@ draw_vbo(struct draw_context *draw,
if (use_info->view_mask) {
u_foreach_bit(i, use_info->view_mask) {
draw->pt.user.viewid = i;
draw_instances(draw, use_info, use_draws, num_draws);
draw_instances(draw, drawid_offset, use_info, use_draws, num_draws);
}
} else
draw_instances(draw, use_info, use_draws, num_draws);
draw_instances(draw, drawid_offset, use_info, use_draws, num_draws);
/* If requested emit the pipeline statistics for this run */
if (draw->collect_statistics) {