nvc0: rename 3d dirty flags to NVC0_NEW_3D_XXX

Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>

8 files changed, 133 insertions, 133 deletions

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
index 112f1c4d077..0f1265f5db5 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
@@ -239,7 +239,7 @@ nvc0_compute_validate_driverconst(struct nvc0_context *nvc0)
    BEGIN_NVC0(push, NVC0_CP(CB_BIND), 1);
    PUSH_DATA (push, (15 << 8) | 1);
 
-   nvc0->dirty_3d |= NVC0_NEW_DRIVERCONST;
+   nvc0->dirty_3d |= NVC0_NEW_3D_DRIVERCONST;
 }
 
 static void
@@ -403,7 +403,7 @@ nvc0_launch_grid(struct pipe_context *pipe, const struct pipe_grid_info *info)
    }
 
    /* Invalidate all 3D constbufs because they are aliased with COMPUTE. */
-   nvc0->dirty_3d |= NVC0_NEW_CONSTBUF;
+   nvc0->dirty_3d |= NVC0_NEW_3D_CONSTBUF;
    for (s = 0; s < 5; s++) {
       nvc0->constbuf_dirty[s] |= nvc0->constbuf_valid[s];
       nvc0->state.uniform_buffer_bound[s] = 0;
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.c b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c
index 16c08358f65..9860e2d8544 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c
@@ -194,7 +194,7 @@ nvc0_invalidate_resource_storage(struct nouveau_context *ctx,
       for (i = 0; i < nvc0->framebuffer.nr_cbufs; ++i) {
          if (nvc0->framebuffer.cbufs[i] &&
              nvc0->framebuffer.cbufs[i]->texture == res) {
-            nvc0->dirty_3d |= NVC0_NEW_FRAMEBUFFER;
+            nvc0->dirty_3d |= NVC0_NEW_3D_FRAMEBUFFER;
             nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_FB);
             if (!--ref)
                return ref;
@@ -204,7 +204,7 @@ nvc0_invalidate_resource_storage(struct nouveau_context *ctx,
    if (res->bind & PIPE_BIND_DEPTH_STENCIL) {
       if (nvc0->framebuffer.zsbuf &&
           nvc0->framebuffer.zsbuf->texture == res) {
-         nvc0->dirty_3d |= NVC0_NEW_FRAMEBUFFER;
+         nvc0->dirty_3d |= NVC0_NEW_3D_FRAMEBUFFER;
          nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_FB);
          if (!--ref)
             return ref;
@@ -214,7 +214,7 @@ nvc0_invalidate_resource_storage(struct nouveau_context *ctx,
    if (res->target == PIPE_BUFFER) {
       for (i = 0; i < nvc0->num_vtxbufs; ++i) {
          if (nvc0->vtxbuf[i].buffer == res) {
-            nvc0->dirty_3d |= NVC0_NEW_ARRAYS;
+            nvc0->dirty_3d |= NVC0_NEW_3D_ARRAYS;
             nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_VTX);
             if (!--ref)
                return ref;
@@ -222,7 +222,7 @@ nvc0_invalidate_resource_storage(struct nouveau_context *ctx,
       }
 
       if (nvc0->idxbuf.buffer == res) {
-         nvc0->dirty_3d |= NVC0_NEW_IDXBUF;
+         nvc0->dirty_3d |= NVC0_NEW_3D_IDXBUF;
          nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_IDX);
          if (!--ref)
             return ref;
@@ -233,7 +233,7 @@ nvc0_invalidate_resource_storage(struct nouveau_context *ctx,
          if (nvc0->textures[s][i] &&
              nvc0->textures[s][i]->texture == res) {
             nvc0->textures_dirty[s] |= 1 << i;
-            nvc0->dirty_3d |= NVC0_NEW_TEXTURES;
+            nvc0->dirty_3d |= NVC0_NEW_3D_TEXTURES;
             nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_TEX(s, i));
             if (!--ref)
                return ref;
@@ -252,7 +252,7 @@ nvc0_invalidate_resource_storage(struct nouveau_context *ctx,
                nvc0->dirty_cp |= NVC0_NEW_CP_CONSTBUF;
                nouveau_bufctx_reset(nvc0->bufctx_cp, NVC0_BIND_CP_CB(i));
             } else {
-               nvc0->dirty_3d |= NVC0_NEW_CONSTBUF;
+               nvc0->dirty_3d |= NVC0_NEW_3D_CONSTBUF;
                nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_CB(s, i));
             }
             if (!--ref)
@@ -269,7 +269,7 @@ nvc0_invalidate_resource_storage(struct nouveau_context *ctx,
                nvc0->dirty_cp |= NVC0_NEW_CP_BUFFERS;
                nouveau_bufctx_reset(nvc0->bufctx_cp, NVC0_BIND_CP_BUF);
             } else {
-               nvc0->dirty_3d |= NVC0_NEW_BUFFERS;
+               nvc0->dirty_3d |= NVC0_NEW_3D_BUFFERS;
                nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_BUF);
             }
             if (!--ref)
@@ -352,12 +352,12 @@ nvc0_create(struct pipe_screen *pscreen, void *priv, unsigned ctxflags)
    if (!nvc0->tcp_empty)
       goto out_err;
    /* set the empty tctl prog on next draw in case one is never set */
-   nvc0->dirty_3d |= NVC0_NEW_TCTLPROG;
+   nvc0->dirty_3d |= NVC0_NEW_3D_TCTLPROG;
 
    /* Do not bind the COMPUTE driver constbuf at screen initialization because
     * CBs are aliased between 3D and COMPUTE, but make sure it will be bound if
     * a grid is launched later. */
-   nvc0->dirty_cp |= NVC0_NEW_CP_DRIVERCONST;
+   nvc0->dirty_cp |= NVC0_NEW_3D_DRIVERCONST;
 
    /* now that there are no more opportunities for errors, set the current
     * context if there isn't already one.
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
index f70391d575a..b77632c6b43 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
@@ -29,35 +29,35 @@
 #include "nvc0/nve4_p2mf.xml.h"
 #include "nvc0/nvc0_macros.h"
 
-/* NOTE: must keep NVC0_NEW_...PROG in consecutive bits in this order */
-#define NVC0_NEW_BLEND        (1 << 0)
-#define NVC0_NEW_RASTERIZER   (1 << 1)
-#define NVC0_NEW_ZSA          (1 << 2)
-#define NVC0_NEW_VERTPROG     (1 << 3)
-#define NVC0_NEW_TCTLPROG     (1 << 4)
-#define NVC0_NEW_TEVLPROG     (1 << 5)
-#define NVC0_NEW_GMTYPROG     (1 << 6)
-#define NVC0_NEW_FRAGPROG     (1 << 7)
-#define NVC0_NEW_BLEND_COLOUR (1 << 8)
-#define NVC0_NEW_STENCIL_REF  (1 << 9)
-#define NVC0_NEW_CLIP         (1 << 10)
-#define NVC0_NEW_SAMPLE_MASK  (1 << 11)
-#define NVC0_NEW_FRAMEBUFFER  (1 << 12)
-#define NVC0_NEW_STIPPLE      (1 << 13)
-#define NVC0_NEW_SCISSOR      (1 << 14)
-#define NVC0_NEW_VIEWPORT     (1 << 15)
-#define NVC0_NEW_ARRAYS       (1 << 16)
-#define NVC0_NEW_VERTEX       (1 << 17)
-#define NVC0_NEW_CONSTBUF     (1 << 18)
-#define NVC0_NEW_TEXTURES     (1 << 19)
-#define NVC0_NEW_SAMPLERS     (1 << 20)
-#define NVC0_NEW_TFB_TARGETS  (1 << 21)
-#define NVC0_NEW_IDXBUF       (1 << 22)
-#define NVC0_NEW_SURFACES     (1 << 23)
-#define NVC0_NEW_MIN_SAMPLES  (1 << 24)
-#define NVC0_NEW_TESSFACTOR   (1 << 25)
-#define NVC0_NEW_BUFFERS      (1 << 26)
-#define NVC0_NEW_DRIVERCONST  (1 << 27)
+/* NOTE: must keep NVC0_NEW_3D_...PROG in consecutive bits in this order */
+#define NVC0_NEW_3D_BLEND        (1 << 0)
+#define NVC0_NEW_3D_RASTERIZER   (1 << 1)
+#define NVC0_NEW_3D_ZSA          (1 << 2)
+#define NVC0_NEW_3D_VERTPROG     (1 << 3)
+#define NVC0_NEW_3D_TCTLPROG     (1 << 4)
+#define NVC0_NEW_3D_TEVLPROG     (1 << 5)
+#define NVC0_NEW_3D_GMTYPROG     (1 << 6)
+#define NVC0_NEW_3D_FRAGPROG     (1 << 7)
+#define NVC0_NEW_3D_BLEND_COLOUR (1 << 8)
+#define NVC0_NEW_3D_STENCIL_REF  (1 << 9)
+#define NVC0_NEW_3D_CLIP         (1 << 10)
+#define NVC0_NEW_3D_SAMPLE_MASK  (1 << 11)
+#define NVC0_NEW_3D_FRAMEBUFFER  (1 << 12)
+#define NVC0_NEW_3D_STIPPLE      (1 << 13)
+#define NVC0_NEW_3D_SCISSOR      (1 << 14)
+#define NVC0_NEW_3D_VIEWPORT     (1 << 15)
+#define NVC0_NEW_3D_ARRAYS       (1 << 16)
+#define NVC0_NEW_3D_VERTEX       (1 << 17)
+#define NVC0_NEW_3D_CONSTBUF     (1 << 18)
+#define NVC0_NEW_3D_TEXTURES     (1 << 19)
+#define NVC0_NEW_3D_SAMPLERS     (1 << 20)
+#define NVC0_NEW_3D_TFB_TARGETS  (1 << 21)
+#define NVC0_NEW_3D_IDXBUF       (1 << 22)
+#define NVC0_NEW_3D_SURFACES     (1 << 23)
+#define NVC0_NEW_3D_MIN_SAMPLES  (1 << 24)
+#define NVC0_NEW_3D_TESSFACTOR   (1 << 25)
+#define NVC0_NEW_3D_BUFFERS      (1 << 26)
+#define NVC0_NEW_3D_DRIVERCONST  (1 << 27)
 
 #define NVC0_NEW_CP_PROGRAM   (1 << 0)
 #define NVC0_NEW_CP_SURFACES  (1 << 1)
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c
index e4494dc8f0e..064fd36f3fb 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c
@@ -152,7 +152,7 @@ nvc0_fragprog_validate(struct nvc0_context *nvc0)
                                      NVC0_3D_SHADE_MODEL_SMOOTH);
    }
 
-   if (fp->mem && !(nvc0->dirty_3d & NVC0_NEW_FRAGPROG)) {
+   if (fp->mem && !(nvc0->dirty_3d & NVC0_NEW_3D_FRAGPROG)) {
       return;
    }
 
@@ -292,7 +292,7 @@ nvc0_tfb_validate(struct nvc0_context *nvc0)
    }
    nvc0->state.tfb = tfb;
 
-   if (!(nvc0->dirty_3d & NVC0_NEW_TFB_TARGETS))
+   if (!(nvc0->dirty_3d & NVC0_NEW_3D_TFB_TARGETS))
       return;
    nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_TFB);
 
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
index a9a05c9dff3..5397e5c5380 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
@@ -186,7 +186,7 @@ nvc0_blend_state_bind(struct pipe_context *pipe, void *hwcso)
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->blend = hwcso;
-    nvc0->dirty_3d |= NVC0_NEW_BLEND;
+    nvc0->dirty_3d |= NVC0_NEW_3D_BLEND;
 }
 
 static void
@@ -315,7 +315,7 @@ nvc0_rasterizer_state_bind(struct pipe_context *pipe, void *hwcso)
    struct nvc0_context *nvc0 = nvc0_context(pipe);
 
    nvc0->rast = hwcso;
-   nvc0->dirty_3d |= NVC0_NEW_RASTERIZER;
+   nvc0->dirty_3d |= NVC0_NEW_3D_RASTERIZER;
 }
 
 static void
@@ -393,7 +393,7 @@ nvc0_zsa_state_bind(struct pipe_context *pipe, void *hwcso)
    struct nvc0_context *nvc0 = nvc0_context(pipe);
 
    nvc0->zsa = hwcso;
-   nvc0->dirty_3d |= NVC0_NEW_ZSA;
+   nvc0->dirty_3d |= NVC0_NEW_3D_ZSA;
 }
 
 static void
@@ -449,7 +449,7 @@ nvc0_stage_sampler_states_bind(struct nvc0_context *nvc0, int s,
 
    nvc0->num_samplers[s] = nr;
 
-   nvc0->dirty_3d |= NVC0_NEW_SAMPLERS;
+   nvc0->dirty_3d |= NVC0_NEW_3D_SAMPLERS;
 }
 
 static void
@@ -584,7 +584,7 @@ nvc0_stage_set_sampler_views(struct nvc0_context *nvc0, int s,
 
    nvc0->num_textures[s] = nr;
 
-   nvc0->dirty_3d |= NVC0_NEW_TEXTURES;
+   nvc0->dirty_3d |= NVC0_NEW_3D_TEXTURES;
 }
 
 static void
@@ -733,7 +733,7 @@ nvc0_vp_state_bind(struct pipe_context *pipe, void *hwcso)
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->vertprog = hwcso;
-    nvc0->dirty_3d |= NVC0_NEW_VERTPROG;
+    nvc0->dirty_3d |= NVC0_NEW_3D_VERTPROG;
 }
 
 static void *
@@ -749,7 +749,7 @@ nvc0_fp_state_bind(struct pipe_context *pipe, void *hwcso)
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->fragprog = hwcso;
-    nvc0->dirty_3d |= NVC0_NEW_FRAGPROG;
+    nvc0->dirty_3d |= NVC0_NEW_3D_FRAGPROG;
 }
 
 static void *
@@ -765,7 +765,7 @@ nvc0_gp_state_bind(struct pipe_context *pipe, void *hwcso)
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->gmtyprog = hwcso;
-    nvc0->dirty_3d |= NVC0_NEW_GMTYPROG;
+    nvc0->dirty_3d |= NVC0_NEW_3D_GMTYPROG;
 }
 
 static void *
@@ -781,7 +781,7 @@ nvc0_tcp_state_bind(struct pipe_context *pipe, void *hwcso)
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->tctlprog = hwcso;
-    nvc0->dirty_3d |= NVC0_NEW_TCTLPROG;
+    nvc0->dirty_3d |= NVC0_NEW_3D_TCTLPROG;
 }
 
 static void *
@@ -797,7 +797,7 @@ nvc0_tep_state_bind(struct pipe_context *pipe, void *hwcso)
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->tevlprog = hwcso;
-    nvc0->dirty_3d |= NVC0_NEW_TEVLPROG;
+    nvc0->dirty_3d |= NVC0_NEW_3D_TEVLPROG;
 }
 
 static void *
@@ -853,7 +853,7 @@ nvc0_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
       if (nvc0->constbuf[s][i].u.buf)
          nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_CB(s, i));
 
-      nvc0->dirty_3d |= NVC0_NEW_CONSTBUF;
+      nvc0->dirty_3d |= NVC0_NEW_3D_CONSTBUF;
    }
    nvc0->constbuf_dirty[s] |= 1 << i;
 
@@ -893,7 +893,7 @@ nvc0_set_blend_color(struct pipe_context *pipe,
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->blend_colour = *bcol;
-    nvc0->dirty_3d |= NVC0_NEW_BLEND_COLOUR;
+    nvc0->dirty_3d |= NVC0_NEW_3D_BLEND_COLOUR;
 }
 
 static void
@@ -903,7 +903,7 @@ nvc0_set_stencil_ref(struct pipe_context *pipe,
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->stencil_ref = *sr;
-    nvc0->dirty_3d |= NVC0_NEW_STENCIL_REF;
+    nvc0->dirty_3d |= NVC0_NEW_3D_STENCIL_REF;
 }
 
 static void
@@ -914,7 +914,7 @@ nvc0_set_clip_state(struct pipe_context *pipe,
 
     memcpy(nvc0->clip.ucp, clip->ucp, sizeof(clip->ucp));
 
-    nvc0->dirty_3d |= NVC0_NEW_CLIP;
+    nvc0->dirty_3d |= NVC0_NEW_3D_CLIP;
 }
 
 static void
@@ -923,7 +923,7 @@ nvc0_set_sample_mask(struct pipe_context *pipe, unsigned sample_mask)
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->sample_mask = sample_mask;
-    nvc0->dirty_3d |= NVC0_NEW_SAMPLE_MASK;
+    nvc0->dirty_3d |= NVC0_NEW_3D_SAMPLE_MASK;
 }
 
 static void
@@ -933,7 +933,7 @@ nvc0_set_min_samples(struct pipe_context *pipe, unsigned min_samples)
 
    if (nvc0->min_samples != min_samples) {
       nvc0->min_samples = min_samples;
-      nvc0->dirty_3d |= NVC0_NEW_MIN_SAMPLES;
+      nvc0->dirty_3d |= NVC0_NEW_3D_MIN_SAMPLES;
    }
 }
 
@@ -947,7 +947,7 @@ nvc0_set_framebuffer_state(struct pipe_context *pipe,
 
     util_copy_framebuffer_state(&nvc0->framebuffer, fb);
 
-    nvc0->dirty_3d |= NVC0_NEW_FRAMEBUFFER;
+    nvc0->dirty_3d |= NVC0_NEW_3D_FRAMEBUFFER;
 }
 
 static void
@@ -957,7 +957,7 @@ nvc0_set_polygon_stipple(struct pipe_context *pipe,
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->stipple = *stipple;
-    nvc0->dirty_3d |= NVC0_NEW_STIPPLE;
+    nvc0->dirty_3d |= NVC0_NEW_3D_STIPPLE;
 }
 
 static void
@@ -975,7 +975,7 @@ nvc0_set_scissor_states(struct pipe_context *pipe,
          continue;
       nvc0->scissors[start_slot + i] = scissor[i];
       nvc0->scissors_dirty |= 1 << (start_slot + i);
-      nvc0->dirty_3d |= NVC0_NEW_SCISSOR;
+      nvc0->dirty_3d |= NVC0_NEW_3D_SCISSOR;
    }
 }
 
@@ -994,7 +994,7 @@ nvc0_set_viewport_states(struct pipe_context *pipe,
          continue;
       nvc0->viewports[start_slot + i] = vpt[i];
       nvc0->viewports_dirty |= 1 << (start_slot + i);
-      nvc0->dirty_3d |= NVC0_NEW_VIEWPORT;
+      nvc0->dirty_3d |= NVC0_NEW_3D_VIEWPORT;
    }
 
 }
@@ -1008,7 +1008,7 @@ nvc0_set_tess_state(struct pipe_context *pipe,
 
    memcpy(nvc0->default_tess_outer, default_tess_outer, 4 * sizeof(float));
    memcpy(nvc0->default_tess_inner, default_tess_inner, 2 * sizeof(float));
-   nvc0->dirty_3d |= NVC0_NEW_TESSFACTOR;
+   nvc0->dirty_3d |= NVC0_NEW_3D_TESSFACTOR;
 }
 
 static void
@@ -1020,7 +1020,7 @@ nvc0_set_vertex_buffers(struct pipe_context *pipe,
     unsigned i;
 
     nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_VTX);
-    nvc0->dirty_3d |= NVC0_NEW_ARRAYS;
+    nvc0->dirty_3d |= NVC0_NEW_3D_ARRAYS;
 
     util_set_vertex_buffers_count(nvc0->vtxbuf, &nvc0->num_vtxbufs, vb,
                                   start_slot, count);
@@ -1069,13 +1069,13 @@ nvc0_set_index_buffer(struct pipe_context *pipe,
        nvc0->idxbuf.index_size = ib->index_size;
        if (ib->buffer) {
           nvc0->idxbuf.offset = ib->offset;
-          nvc0->dirty_3d |= NVC0_NEW_IDXBUF;
+          nvc0->dirty_3d |= NVC0_NEW_3D_IDXBUF;
        } else {
           nvc0->idxbuf.user_buffer = ib->user_buffer;
-          nvc0->dirty_3d &= ~NVC0_NEW_IDXBUF;
+          nvc0->dirty_3d &= ~NVC0_NEW_3D_IDXBUF;
        }
     } else {
-       nvc0->dirty_3d &= ~NVC0_NEW_IDXBUF;
+       nvc0->dirty_3d &= ~NVC0_NEW_3D_IDXBUF;
        pipe_resource_reference(&nvc0->idxbuf.buffer, NULL);
     }
 }
@@ -1086,7 +1086,7 @@ nvc0_vertex_state_bind(struct pipe_context *pipe, void *hwcso)
     struct nvc0_context *nvc0 = nvc0_context(pipe);
 
     nvc0->vertex = hwcso;
-    nvc0->dirty_3d |= NVC0_NEW_VERTEX;
+    nvc0->dirty_3d |= NVC0_NEW_3D_VERTEX;
 }
 
 static struct pipe_stream_output_target *
@@ -1185,7 +1185,7 @@ nvc0_set_transform_feedback_targets(struct pipe_context *pipe,
    nvc0->num_tfbbufs = num_targets;
 
    if (nvc0->tfbbuf_dirty)
-      nvc0->dirty_3d |= NVC0_NEW_TFB_TARGETS;
+      nvc0->dirty_3d |= NVC0_NEW_3D_TFB_TARGETS;
 }
 
 static void
@@ -1284,7 +1284,7 @@ nvc0_set_shader_buffers(struct pipe_context *pipe,
    if (s == 5)
       nvc0_context(pipe)->dirty_cp |= NVC0_NEW_CP_BUFFERS;
    else
-      nvc0_context(pipe)->dirty_3d |= NVC0_NEW_BUFFERS;
+      nvc0_context(pipe)->dirty_3d |= NVC0_NEW_3D_BUFFERS;
 }
 
 static inline void
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
index 6531d0ec156..b0bd8a06e49 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
@@ -239,7 +239,7 @@ nvc0_validate_scissor(struct nvc0_context *nvc0)
    int i;
    struct nouveau_pushbuf *push = nvc0->base.pushbuf;
 
-   if (!(nvc0->dirty_3d & NVC0_NEW_SCISSOR) &&
+   if (!(nvc0->dirty_3d & NVC0_NEW_3D_SCISSOR) &&
       nvc0->rast->pipe.scissor == nvc0->state.scissor)
       return;
 
@@ -367,7 +367,7 @@ nvc0_validate_clip(struct nvc0_context *nvc0)
    if (clip_enable && vp->vp.num_ucps < PIPE_MAX_CLIP_PLANES)
       nvc0_check_program_ucps(nvc0, vp, clip_enable);
 
-   if (nvc0->dirty_3d & (NVC0_NEW_CLIP | (NVC0_NEW_VERTPROG << stage)))
+   if (nvc0->dirty_3d & (NVC0_NEW_3D_CLIP | (NVC0_NEW_3D_VERTPROG << stage)))
       if (vp->vp.num_ucps > 0 && vp->vp.num_ucps <= PIPE_MAX_CLIP_PLANES)
          nvc0_upload_uclip_planes(nvc0, stage);
 
@@ -668,21 +668,21 @@ nvc0_switch_pipe_context(struct nvc0_context *ctx_to)
    ctx_to->state.tfb = NULL;
 
    if (!ctx_to->vertex)
-      ctx_to->dirty_3d &= ~(NVC0_NEW_VERTEX | NVC0_NEW_ARRAYS);
+      ctx_to->dirty_3d &= ~(NVC0_NEW_3D_VERTEX | NVC0_NEW_3D_ARRAYS);
    if (!ctx_to->idxbuf.buffer)
-      ctx_to->dirty_3d &= ~NVC0_NEW_IDXBUF;
+      ctx_to->dirty_3d &= ~NVC0_NEW_3D_IDXBUF;
 
    if (!ctx_to->vertprog)
-      ctx_to->dirty_3d &= ~NVC0_NEW_VERTPROG;
+      ctx_to->dirty_3d &= ~NVC0_NEW_3D_VERTPROG;
    if (!ctx_to->fragprog)
-      ctx_to->dirty_3d &= ~NVC0_NEW_FRAGPROG;
+      ctx_to->dirty_3d &= ~NVC0_NEW_3D_FRAGPROG;
 
    if (!ctx_to->blend)
-      ctx_to->dirty_3d &= ~NVC0_NEW_BLEND;
+      ctx_to->dirty_3d &= ~NVC0_NEW_3D_BLEND;
    if (!ctx_to->rast)
-      ctx_to->dirty_3d &= ~(NVC0_NEW_RASTERIZER | NVC0_NEW_SCISSOR);
+      ctx_to->dirty_3d &= ~(NVC0_NEW_3D_RASTERIZER | NVC0_NEW_3D_SCISSOR);
    if (!ctx_to->zsa)
-      ctx_to->dirty_3d &= ~NVC0_NEW_ZSA;
+      ctx_to->dirty_3d &= ~NVC0_NEW_3D_ZSA;
 
    ctx_to->screen->cur_ctx = ctx_to;
 }
@@ -691,41 +691,41 @@ static struct state_validate {
     void (*func)(struct nvc0_context *);
     uint32_t states;
 } validate_list[] = {
-    { nvc0_validate_fb,            NVC0_NEW_FRAMEBUFFER },
-    { nvc0_validate_blend,         NVC0_NEW_BLEND },
-    { nvc0_validate_zsa,           NVC0_NEW_ZSA },
-    { nvc0_validate_sample_mask,   NVC0_NEW_SAMPLE_MASK },
-    { nvc0_validate_rasterizer,    NVC0_NEW_RASTERIZER },
-    { nvc0_validate_blend_colour,  NVC0_NEW_BLEND_COLOUR },
-    { nvc0_validate_stencil_ref,   NVC0_NEW_STENCIL_REF },
-    { nvc0_validate_stipple,       NVC0_NEW_STIPPLE },
-    { nvc0_validate_scissor,       NVC0_NEW_SCISSOR | NVC0_NEW_RASTERIZER },
-    { nvc0_validate_viewport,      NVC0_NEW_VIEWPORT },
-    { nvc0_vertprog_validate,      NVC0_NEW_VERTPROG },
-    { nvc0_tctlprog_validate,      NVC0_NEW_TCTLPROG },
-    { nvc0_tevlprog_validate,      NVC0_NEW_TEVLPROG },
-    { nvc0_validate_tess_state,    NVC0_NEW_TESSFACTOR },
-    { nvc0_gmtyprog_validate,      NVC0_NEW_GMTYPROG },
-    { nvc0_fragprog_validate,      NVC0_NEW_FRAGPROG | NVC0_NEW_RASTERIZER },
-    { nvc0_validate_derived_1,     NVC0_NEW_FRAGPROG | NVC0_NEW_ZSA |
-                                   NVC0_NEW_RASTERIZER },
-    { nvc0_validate_derived_2,     NVC0_NEW_ZSA | NVC0_NEW_FRAMEBUFFER },
-    { nvc0_validate_derived_3,     NVC0_NEW_BLEND | NVC0_NEW_FRAMEBUFFER },
-    { nvc0_validate_clip,          NVC0_NEW_CLIP | NVC0_NEW_RASTERIZER |
-                                   NVC0_NEW_VERTPROG |
-                                   NVC0_NEW_TEVLPROG |
-                                   NVC0_NEW_GMTYPROG },
-    { nvc0_constbufs_validate,     NVC0_NEW_CONSTBUF },
-    { nvc0_validate_textures,      NVC0_NEW_TEXTURES },
-    { nvc0_validate_samplers,      NVC0_NEW_SAMPLERS },
-    { nve4_set_tex_handles,        NVC0_NEW_TEXTURES | NVC0_NEW_SAMPLERS },
-    { nvc0_vertex_arrays_validate, NVC0_NEW_VERTEX | NVC0_NEW_ARRAYS },
-    { nvc0_validate_surfaces,      NVC0_NEW_SURFACES },
-    { nvc0_validate_buffers,       NVC0_NEW_BUFFERS },
-    { nvc0_idxbuf_validate,        NVC0_NEW_IDXBUF },
-    { nvc0_tfb_validate,           NVC0_NEW_TFB_TARGETS | NVC0_NEW_GMTYPROG },
-    { nvc0_validate_min_samples,   NVC0_NEW_MIN_SAMPLES },
-    { nvc0_validate_driverconst,   NVC0_NEW_DRIVERCONST },
+    { nvc0_validate_fb,            NVC0_NEW_3D_FRAMEBUFFER },
+    { nvc0_validate_blend,         NVC0_NEW_3D_BLEND },
+    { nvc0_validate_zsa,           NVC0_NEW_3D_ZSA },
+    { nvc0_validate_sample_mask,   NVC0_NEW_3D_SAMPLE_MASK },
+    { nvc0_validate_rasterizer,    NVC0_NEW_3D_RASTERIZER },
+    { nvc0_validate_blend_colour,  NVC0_NEW_3D_BLEND_COLOUR },
+    { nvc0_validate_stencil_ref,   NVC0_NEW_3D_STENCIL_REF },
+    { nvc0_validate_stipple,       NVC0_NEW_3D_STIPPLE },
+    { nvc0_validate_scissor,       NVC0_NEW_3D_SCISSOR | NVC0_NEW_3D_RASTERIZER },
+    { nvc0_validate_viewport,      NVC0_NEW_3D_VIEWPORT },
+    { nvc0_vertprog_validate,      NVC0_NEW_3D_VERTPROG },
+    { nvc0_tctlprog_validate,      NVC0_NEW_3D_TCTLPROG },
+    { nvc0_tevlprog_validate,      NVC0_NEW_3D_TEVLPROG },
+    { nvc0_validate_tess_state,    NVC0_NEW_3D_TESSFACTOR },
+    { nvc0_gmtyprog_validate,      NVC0_NEW_3D_GMTYPROG },
+    { nvc0_fragprog_validate,      NVC0_NEW_3D_FRAGPROG | NVC0_NEW_3D_RASTERIZER },
+    { nvc0_validate_derived_1,     NVC0_NEW_3D_FRAGPROG | NVC0_NEW_3D_ZSA |
+                                   NVC0_NEW_3D_RASTERIZER },
+    { nvc0_validate_derived_2,     NVC0_NEW_3D_ZSA | NVC0_NEW_3D_FRAMEBUFFER },
+    { nvc0_validate_derived_3,     NVC0_NEW_3D_BLEND | NVC0_NEW_3D_FRAMEBUFFER },
+    { nvc0_validate_clip,          NVC0_NEW_3D_CLIP | NVC0_NEW_3D_RASTERIZER |
+                                   NVC0_NEW_3D_VERTPROG |
+                                   NVC0_NEW_3D_TEVLPROG |
+                                   NVC0_NEW_3D_GMTYPROG },
+    { nvc0_constbufs_validate,     NVC0_NEW_3D_CONSTBUF },
+    { nvc0_validate_textures,      NVC0_NEW_3D_TEXTURES },
+    { nvc0_validate_samplers,      NVC0_NEW_3D_SAMPLERS },
+    { nve4_set_tex_handles,        NVC0_NEW_3D_TEXTURES | NVC0_NEW_3D_SAMPLERS },
+    { nvc0_vertex_arrays_validate, NVC0_NEW_3D_VERTEX | NVC0_NEW_3D_ARRAYS },
+    { nvc0_validate_surfaces,      NVC0_NEW_3D_SURFACES },
+    { nvc0_validate_buffers,       NVC0_NEW_3D_BUFFERS },
+    { nvc0_idxbuf_validate,        NVC0_NEW_3D_IDXBUF },
+    { nvc0_tfb_validate,           NVC0_NEW_3D_TFB_TARGETS | NVC0_NEW_3D_GMTYPROG },
+    { nvc0_validate_min_samples,   NVC0_NEW_3D_MIN_SAMPLES },
+    { nvc0_validate_driverconst,   NVC0_NEW_3D_DRIVERCONST },
 };
 
 bool
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
index ffa87fef65c..d2da58be5d4 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
@@ -353,7 +353,7 @@ nvc0_clear_render_target(struct pipe_context *pipe,
 
    IMMED_NVC0(push, NVC0_3D(COND_MODE), nvc0->cond_condmode);
 
-   nvc0->dirty_3d |= NVC0_NEW_FRAMEBUFFER;
+   nvc0->dirty_3d |= NVC0_NEW_3D_FRAMEBUFFER;
 }
 
 static void
@@ -609,7 +609,7 @@ nvc0_clear_buffer(struct pipe_context *pipe,
                              data, data_size);
    }
 
-   nvc0->dirty_3d |= NVC0_NEW_FRAMEBUFFER;
+   nvc0->dirty_3d |= NVC0_NEW_3D_FRAMEBUFFER;
 }
 
 static void
@@ -678,7 +678,7 @@ nvc0_clear_depth_stencil(struct pipe_context *pipe,
 
    IMMED_NVC0(push, NVC0_3D(COND_MODE), nvc0->cond_condmode);
 
-   nvc0->dirty_3d |= NVC0_NEW_FRAMEBUFFER;
+   nvc0->dirty_3d |= NVC0_NEW_3D_FRAMEBUFFER;
 }
 
 void
@@ -693,7 +693,7 @@ nvc0_clear(struct pipe_context *pipe, unsigned buffers,
    uint32_t mode = 0;
 
    /* don't need NEW_BLEND, COLOR_MASK doesn't affect CLEAR_BUFFERS */
-   if (!nvc0_state_validate(nvc0, NVC0_NEW_FRAMEBUFFER))
+   if (!nvc0_state_validate(nvc0, NVC0_NEW_3D_FRAMEBUFFER))
       return;
 
    if (buffers & PIPE_CLEAR_COLOR && fb->nr_cbufs) {
@@ -1094,10 +1094,10 @@ nvc0_blitctx_pre_blit(struct nvc0_blitctx *ctx)
    nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_TEX(4, 0));
    nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_TEX(4, 1));
 
-   nvc0->dirty_3d = NVC0_NEW_FRAMEBUFFER | NVC0_NEW_MIN_SAMPLES |
-      NVC0_NEW_VERTPROG | NVC0_NEW_FRAGPROG |
-      NVC0_NEW_TCTLPROG | NVC0_NEW_TEVLPROG | NVC0_NEW_GMTYPROG |
-      NVC0_NEW_TEXTURES | NVC0_NEW_SAMPLERS;
+   nvc0->dirty_3d = NVC0_NEW_3D_FRAMEBUFFER | NVC0_NEW_3D_MIN_SAMPLES |
+      NVC0_NEW_3D_VERTPROG | NVC0_NEW_3D_FRAGPROG |
+      NVC0_NEW_3D_TCTLPROG | NVC0_NEW_3D_TEVLPROG | NVC0_NEW_3D_GMTYPROG |
+      NVC0_NEW_3D_TEXTURES | NVC0_NEW_3D_SAMPLERS;
 }
 
 static void
@@ -1152,13 +1152,13 @@ nvc0_blitctx_post_blit(struct nvc0_blitctx *blit)
    nouveau_scratch_done(&nvc0->base);
 
    nvc0->dirty_3d = blit->saved.dirty_3d |
-      (NVC0_NEW_FRAMEBUFFER | NVC0_NEW_SCISSOR | NVC0_NEW_SAMPLE_MASK |
-       NVC0_NEW_RASTERIZER | NVC0_NEW_ZSA | NVC0_NEW_BLEND |
-       NVC0_NEW_VIEWPORT |
-       NVC0_NEW_TEXTURES | NVC0_NEW_SAMPLERS |
-       NVC0_NEW_VERTPROG | NVC0_NEW_FRAGPROG |
-       NVC0_NEW_TCTLPROG | NVC0_NEW_TEVLPROG | NVC0_NEW_GMTYPROG |
-       NVC0_NEW_TFB_TARGETS | NVC0_NEW_VERTEX | NVC0_NEW_ARRAYS);
+      (NVC0_NEW_3D_FRAMEBUFFER | NVC0_NEW_3D_SCISSOR | NVC0_NEW_3D_SAMPLE_MASK |
+       NVC0_NEW_3D_RASTERIZER | NVC0_NEW_3D_ZSA | NVC0_NEW_3D_BLEND |
+       NVC0_NEW_3D_VIEWPORT |
+       NVC0_NEW_3D_TEXTURES | NVC0_NEW_3D_SAMPLERS |
+       NVC0_NEW_3D_VERTPROG | NVC0_NEW_3D_FRAGPROG |
+       NVC0_NEW_3D_TCTLPROG | NVC0_NEW_3D_TEVLPROG | NVC0_NEW_3D_GMTYPROG |
+       NVC0_NEW_3D_TFB_TARGETS | NVC0_NEW_3D_VERTEX | NVC0_NEW_3D_ARRAYS);
    nvc0->scissors_dirty |= 1;
    nvc0->viewports_dirty |= 1;
 
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
index e209702a251..4ae68345983 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
@@ -446,7 +446,7 @@ nvc0_vertex_arrays_validate(struct nvc0_context *nvc0)
    }
    const_vbos = vbo_mode ? 0 : nvc0->constant_vbos;
 
-   update_vertex = (nvc0->dirty_3d & NVC0_NEW_VERTEX) ||
+   update_vertex = (nvc0->dirty_3d & NVC0_NEW_3D_VERTEX) ||
       (const_vbos != nvc0->state.constant_vbos) ||
       (vbo_mode != nvc0->state.vbo_mode);
 
@@ -949,12 +949,12 @@ nvc0_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
       info->indexed && (nvc0->vb_elt_limit >= (info->count * 2));
 
    /* Check whether we want to switch vertex-submission mode. */
-   if (nvc0->vbo_user && !(nvc0->dirty_3d & (NVC0_NEW_ARRAYS | NVC0_NEW_VERTEX))) {
+   if (nvc0->vbo_user && !(nvc0->dirty_3d & (NVC0_NEW_3D_ARRAYS | NVC0_NEW_3D_VERTEX))) {
       if (nvc0->vbo_push_hint != !!nvc0->state.vbo_mode)
          if (nvc0->state.vbo_mode != 3)
-            nvc0->dirty_3d |= NVC0_NEW_ARRAYS;
+            nvc0->dirty_3d |= NVC0_NEW_3D_ARRAYS;
 
-      if (!(nvc0->dirty_3d & NVC0_NEW_ARRAYS) && nvc0->state.vbo_mode == 0) {
+      if (!(nvc0->dirty_3d & NVC0_NEW_3D_ARRAYS) && nvc0->state.vbo_mode == 0) {
          if (nvc0->vertex->shared_slots)
             nvc0_update_user_vbufs_shared(nvc0);
          else