[Mesa-dev] [PATCH 3/6] nvc0: rename nvc0_graph_state::flushed to ::flushed_3d

[Samuel Pitoiset]

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/gallium/drivers/nouveau/nvc0/nvc0_compute.c        | 2 +-
 src/gallium/drivers/nouveau/nvc0/nvc0_context.c        | 2 +-
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.h         | 2 +-
 src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c | 4 ++--
 src/gallium/drivers/nouveau/nvc0/nve4_compute.c        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
index 491221e..0717583 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
@@ -281,7 +281,7 @@ nvc0_compute_state_validate(struct nvc0_context *nvc0)
    nouveau_pushbuf_bufctx(nvc0->base.pushbuf, nvc0->bufctx_cp);
    if (unlikely(nouveau_pushbuf_validate(nvc0->base.pushbuf)))
       return false;
-   if (unlikely(nvc0->state.flushed))
+   if (unlikely(nvc0->state.flushed_3d))
       nvc0_bufctx_fence(nvc0, nvc0->bufctx_cp, true);
 
    return true;
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.c b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c
index f33d29d..683fc20 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c
@@ -177,7 +177,7 @@ nvc0_default_kick_notify(struct nouveau_pushbuf *push)
       nouveau_fence_next(&screen->base);
       nouveau_fence_update(&screen->base, true);
       if (screen->cur_ctx)
-         screen->cur_ctx->state.flushed = true;
+         screen->cur_ctx->state.flushed_3d = true;
       NOUVEAU_DRV_STAT(&screen->base, pushbuf_count, 1);
    }
 }
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
index 8487abc..9a58da5 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
@@ -30,7 +30,7 @@ struct nvc0_context;
 struct nvc0_blitter;
 
 struct nvc0_graph_state {
-   bool flushed;
+   bool flushed_3d;
    bool rasterizer_discard;
    bool early_z_forced;
    bool prim_restart;
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
index fbf45ce..e9a4f7c 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
@@ -740,8 +740,8 @@ nvc0_state_validate(struct nvc0_context *nvc0, uint32_t mask)
    nouveau_pushbuf_bufctx(nvc0->base.pushbuf, nvc0->bufctx_3d);
    ret = nouveau_pushbuf_validate(nvc0->base.pushbuf);
 
-   if (unlikely(nvc0->state.flushed)) {
-      nvc0->state.flushed = false;
+   if (unlikely(nvc0->state.flushed_3d)) {
+      nvc0->state.flushed_3d = false;
       nvc0_bufctx_fence(nvc0, nvc0->bufctx_3d, true);
    }
    return !ret;
diff --git a/src/gallium/drivers/nouveau/nvc0/nve4_compute.c b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
index 60a7118..e33458b 100644
--- a/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
+++ b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
@@ -338,7 +338,7 @@ nve4_compute_state_validate(struct nvc0_context *nvc0)
    nouveau_pushbuf_bufctx(nvc0->base.pushbuf, nvc0->bufctx_cp);
    if (unlikely(nouveau_pushbuf_validate(nvc0->base.pushbuf)))
       return false;
-   if (unlikely(nvc0->state.flushed))
+   if (unlikely(nvc0->state.flushed_3d))
       nvc0_bufctx_fence(nvc0, nvc0->bufctx_cp, true);
 
    return true;
-- 
2.6.4