Mesa (staging/21.0): r600: don't set an index_bias for indirect draw calls

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 540172fa43f0cee266a7bef6ce135cd314854346
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=540172fa43f0cee266a7bef6ce135cd314854346

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Sun Mar 28 10:27:20 2021 +0200

r600: don't set an index_bias for indirect draw calls

The indirect draw call already encodes the index bias so that no
additional encoding in the hardware is needed in this case.

This fixes a regression with a number of tests from
   dEQP-GLES31.functional.draw_indirect.random.*

Fixes: c6c532faa8cf172715b38783ec7175b626a63944
  "gallium/u_vbuf: use updated pipe_draw_start_count while using draw_vbo"

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9877>
(cherry picked from commit acdf1a123436cb3fa7d4bbc9cfbb9566c7693de4)

---

 .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 c94a47430c7..1a075e082da 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -517,7 +517,7 @@
         "description": "r600: don't set an index_bias for indirect draw calls",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "c6c532faa8cf172715b38783ec7175b626a63944"
     },
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 4810abe2272..c4157df959d 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -2210,7 +2210,7 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
 		}
 		index_bias = info->index_bias;
 	} else {
-		index_bias = draws[0].start;
+		index_bias = indirect ? 0 : draws[0].start;
 	}
 
 	/* Set the index offset and primitive restart. */