Mesa (master): nvc0: index_bias is now only set for indexed draws

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 087ef91c85c82546af879b6ce0ba371b393e1e13
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=087ef91c85c82546af879b6ce0ba371b393e1e13

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat Jan 16 18:08:44 2021 -0500

nvc0: index_bias is now only set for indexed draws

Fixes: cbdc00ac3a6 ("nouveau: fix handling draw info")
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8539>

---

 src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c
index 4f9fa89cb66..2be35e99b01 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c
@@ -561,13 +561,14 @@ nvc0_push_vbo(struct nvc0_context *nvc0, const struct pipe_draw_info *info,
 {
    struct push_context ctx;
    unsigned i, index_size;
+   unsigned index_bias = info->index_size ? info->index_bias : 0;
    unsigned inst_count = info->instance_count;
    unsigned vert_count = draw->count;
    unsigned prim;
 
    nvc0_push_context_init(nvc0, &ctx);
 
-   nvc0_vertex_configure_translate(nvc0, info->index_bias);
+   nvc0_vertex_configure_translate(nvc0, index_bias);
 
    if (nvc0->state.index_bias) {
       /* this is already taken care of by translate */
@@ -576,7 +577,7 @@ nvc0_push_vbo(struct nvc0_context *nvc0, const struct pipe_draw_info *info,
    }
 
    if (unlikely(ctx.edgeflag.enabled))
-      nvc0_push_map_edgeflag(&ctx, nvc0, info->index_bias);
+      nvc0_push_map_edgeflag(&ctx, nvc0, index_bias);
 
    ctx.prim_restart = info->primitive_restart;
    ctx.restart_index = info->restart_index;