lavapipe: fix multi-draw regression in shader parameters test

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

View file

@ -1642,7 +1642,8 @@ static void handle_draw(struct lvp_cmd_buffer_entry *cmd,
state->info.start_instance = cmd->u.draw.first_instance;
state->info.instance_count = cmd->u.draw.instance_count;
state->info.view_mask = subpass->view_mask;
state->info.increment_draw_id = true;
if (cmd->u.draw.draw_count > 1)
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);
}
@ -2208,7 +2209,8 @@ static void handle_draw_indexed(struct lvp_cmd_buffer_entry *cmd,
state->info.start_instance = cmd->u.draw_indexed.first_instance;
state->info.instance_count = cmd->u.draw_indexed.instance_count;
state->info.view_mask = subpass->view_mask;
state->info.increment_draw_id = true;
if (cmd->u.draw.draw_count > 1)
state->info.increment_draw_id = true;
if (state->info.primitive_restart)
state->info.restart_index = util_prim_restart_index_from_size(state->info.index_size);