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

lavapipe: fix multi-draw regression in shader parameters test

Browse source 
dEQP-VK.draw.shader_draw_parameters.base_instance.draw,Fail
dEQP-VK.draw.shader_draw_parameters.base_instance.draw_indexed,Fail

Fixes: 6b6dda56b5 ("lavapipe: increment drawid for multidraws")
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
This commit is contained in:
Dave Airlie 2021-07-15 08:05:03 +10:00
parent 1744372714
commit cc8f7dbf2a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/frontends/lavapipe/lvp_execute.c
View file

@ -1642,6 +1642,7 @@ static void handle_draw(struct lvp_cmd_buffer_entry *cmd,
state->info.start_instance = cmd->u.draw.first_instance; state->info.start_instance = cmd->u.draw.first_instance;
state->info.instance_count = cmd->u.draw.instance_count; state->info.instance_count = cmd->u.draw.instance_count;
state->info.view_mask = subpass->view_mask; state->info.view_mask = subpass->view_mask;
if (cmd->u.draw.draw_count > 1)
state->info.increment_draw_id = true; state->info.increment_draw_id = true;
state->pctx->draw_vbo(state->pctx, &state->info, 0, NULL, cmd->u.draw.draws, cmd->u.draw.draw_count); state->pctx->draw_vbo(state->pctx, &state->info, 0, NULL, cmd->u.draw.draws, cmd->u.draw.draw_count);
@ -2208,6 +2209,7 @@ static void handle_draw_indexed(struct lvp_cmd_buffer_entry *cmd,
state->info.start_instance = cmd->u.draw_indexed.first_instance; state->info.start_instance = cmd->u.draw_indexed.first_instance;
state->info.instance_count = cmd->u.draw_indexed.instance_count; state->info.instance_count = cmd->u.draw_indexed.instance_count;
state->info.view_mask = subpass->view_mask; state->info.view_mask = subpass->view_mask;
if (cmd->u.draw.draw_count > 1)
state->info.increment_draw_id = true; state->info.increment_draw_id = true;
if (state->info.primitive_restart) if (state->info.primitive_restart)