diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-10-13 23:50:17 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-11-23 15:43:27 -0500 |
| commit | e80a0a7d9a02fe12dedfb2e221358af620759c28 (patch) | |
| tree | 673fabd57a6adfd0581c1f6ae79a5a5729ec3771 | |
| parent | 7d07083cfdff4bdbeca9ac36c2127cb6a26be207 (diff) | |
nv50,nvc0: actually check constbufs for invalidation
The number of vertex buffers has nothing to do with the number of bound
constbufs.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "10.4 10.3" <mesa-stable@lists.freedesktop.org>
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_context.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_context.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_context.c b/src/gallium/drivers/nouveau/nv50/nv50_context.c index 07f6378c6ae..5e907d73b9a 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_context.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_context.c @@ -214,8 +214,9 @@ nv50_invalidate_resource_storage(struct nouveau_context *ctx, if (res->bind & PIPE_BIND_CONSTANT_BUFFER) { for (s = 0; s < 3; ++s) { - assert(nv50->num_vtxbufs <= NV50_MAX_PIPE_CONSTBUFS); - for (i = 0; i < nv50->num_vtxbufs; ++i) { + for (i = 0; i < NV50_MAX_PIPE_CONSTBUFS; ++i) { + if (!(nv50->constbuf_valid[s] & (1 << i))) + continue; if (!nv50->constbuf[s][i].user && nv50->constbuf[s][i].u.buf == res) { nv50->dirty |= NV50_NEW_CONSTBUF; diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.c b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c index b33a6731a1c..49a46eac87e 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c @@ -232,7 +232,9 @@ nvc0_invalidate_resource_storage(struct nouveau_context *ctx, if (res->bind & PIPE_BIND_CONSTANT_BUFFER) { for (s = 0; s < 5; ++s) { - for (i = 0; i < nvc0->num_vtxbufs; ++i) { + for (i = 0; i < NVC0_MAX_PIPE_CONSTBUFS; ++i) { + if (!(nvc0->constbuf_valid[s] & (1 << i))) + continue; if (!nvc0->constbuf[s][i].user && nvc0->constbuf[s][i].u.buf == res) { nvc0->dirty |= NVC0_NEW_CONSTBUF; |