Mesa (10.2): nv50,nvc0: set constbufs dirty on pipe context switch

[Ian Romanick]

Module: Mesa
Branch: 10.2
Commit: afe723ce5fe671e1d3aa18bcd8ee29598c49698b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=afe723ce5fe671e1d3aa18bcd8ee29598c49698b

Author: Christoph Bumiller <christoph.bumiller at speed.at>
Date:   Sun Jun  2 17:55:34 2013 +0200

nv50,nvc0: set constbufs dirty on pipe context switch

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 49eccef06b0b4ca7d7cef0d76c2c251dd679c3bc)

---

 src/gallium/drivers/nouveau/nv50/nv50_state_validate.c |    4 ++++
 src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c |    1 +
 2 files changed, 5 insertions(+)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c
index 18451c7..1dcb961 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c
@@ -400,6 +400,10 @@ nv50_switch_pipe_context(struct nv50_context *ctx_to)
    ctx_to->viewports_dirty = ~0;
    ctx_to->scissors_dirty = ~0;
 
+   ctx_to->constbuf_dirty[0] =
+   ctx_to->constbuf_dirty[1] =
+   ctx_to->constbuf_dirty[2] = (1 << NV50_MAX_PIPE_CONSTBUFS) - 1;
+
    if (!ctx_to->vertex)
       ctx_to->dirty &= ~(NV50_NEW_VERTEX | NV50_NEW_ARRAYS);
 
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
index 40016fc..dcec910 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
@@ -531,6 +531,7 @@ nvc0_switch_pipe_context(struct nvc0_context *ctx_to)
    for (s = 0; s < 5; ++s) {
       ctx_to->samplers_dirty[s] = ~0;
       ctx_to->textures_dirty[s] = ~0;
+      ctx_to->constbuf_dirty[s] = (1 << NVC0_MAX_PIPE_CONSTBUFS) - 1;
    }
 
    if (!ctx_to->vertex)