From 7fbea74c231e2d1cae4df39cd6b7999616488caf Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 14 Jul 2021 09:43:39 -0400 Subject: [PATCH] lavapipe: increment drawid for multidraws Fixes: f99f7c06 ("lavapipe: implement multidraw ext") Reviewed-by: Joshua Ashton Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 6689c3917e876bf1719b5808e2c0832ee4d50aed) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_execute.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index ea99f442156..5e68b7ab60f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -229,7 +229,7 @@ "description": "lavapipe: increment drawid for multidraws", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "f99f7c06e71d6194d4206bde58a8acb5a42d90ed" }, diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index dc403b8a6c9..84b0511ce6e 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -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.instance_count = cmd->u.draw.instance_count; state->info.view_mask = subpass->view_mask; + 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); } @@ -2207,6 +2208,7 @@ 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 (state->info.primitive_restart) state->info.restart_index = util_prim_restart_index_from_size(state->info.index_size);