From 4a44e69ab1741caedda0c0f3a1c5dabd19260bae Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Mon, 19 Apr 2021 09:42:00 +0200 Subject: [PATCH] Revert "r600: don't set an index_bias for indirect draw calls" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit acdf1a123436cb3fa7d4bbc9cfbb9566c7693de4. While this commit fixed the gles CTS regressions, it introduced regressions that made the driver unusable, hence the revert. Closes #4657 Signed-off-by: Gert Wollny Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 1b5851fadb268c03fa607a7dd422c3399c9d4840) --- .pick_status.json | 2 +- src/gallium/drivers/r600/r600_state_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 43717be72c0..0dd01a879fe 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -976,7 +976,7 @@ "description": "Revert \"r600: don't set an index_bias for indirect draw calls\"", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "acdf1a123436cb3fa7d4bbc9cfbb9566c7693de4" }, diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index b1b7936859f..6624a2af25d 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -2225,7 +2225,7 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info } index_bias = info->index_bias; } else { - index_bias = indirect ? 0 : draws[0].start; + index_bias = draws[0].start; } /* Set the index offset and primitive restart. */