diff options
| author | Ilia Mirkin <[email protected]> | 2017-05-20 04:18:20 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2017-05-20 04:20:11 -0400 |
| commit | 61d8f3387d1f2b724c833418968ba407fc294032 (patch) | |
| tree | 1099babdff9d86cb17b83fc4934a8ec112bb5224 | |
| parent | 85d21863266ce192a3368ef58f5a17a26ef79c3b (diff) | |
nv50,nvc0: clear index buffer bufctx bin unconditionally
The previous condition was to clear it out if it had previously been
set, not what's in the current draw. That information is gone now, so
just clear it unconditionally.
Fixes: 330d0607e ("gallium: remove pipe_index_buffer and set_index_buffer")
Signed-off-by: Ilia Mirkin <[email protected]>
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_vbo.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_vbo.c b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c index 37dca97c870..ac7d8267861 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_vbo.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c @@ -770,10 +770,9 @@ nv50_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) bool tex_dirty = false; int s; - if (info->index_size && !info->has_user_indices) { - nouveau_bufctx_reset(nv50->bufctx_3d, NV50_BIND_3D_INDEX); + nouveau_bufctx_reset(nv50->bufctx_3d, NV50_BIND_3D_INDEX); + if (info->index_size && !info->has_user_indices) BCTX_REFN(nv50->bufctx_3d, 3D_INDEX, nv04_resource(info->index.resource), RD); - } /* NOTE: caller must ensure that (min_index + index_bias) is >= 0 */ nv50->vb_elt_first = info->min_index + info->index_bias; diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c index 86c5e8bf955..406a17e51d6 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c @@ -921,8 +921,7 @@ nvc0_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) struct nvc0_screen *screen = nvc0->screen; int s; - if (info->index_size) - nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_IDX); + nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_IDX); /* NOTE: caller must ensure that (min_index + index_bias) is >= 0 */ nvc0->vb_elt_first = info->min_index + info->index_bias; |