[Mesa-dev] [PATCH 14/15] r600g: rename r600_reg::flush_flags -> sbu_flags

[Marek Olšák]

There is no other use for that.
---
 src/gallium/drivers/r600/evergreen_hw_context.c |    2 +-
 src/gallium/drivers/r600/r600_hw_context.c      |    4 ++--
 src/gallium/drivers/r600/r600_hw_context_priv.h |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c 
b/src/gallium/drivers/r600/evergreen_hw_context.c
index 443bc7c..9487bdf 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -902,7 +902,7 @@ static int evergreen_loop_const_init(struct r600_context 
*ctx, uint32_t offset)
        for (i = 0; i < nreg; i++) {
                r600_loop_consts[i].offset = EVERGREEN_LOOP_CONST_OFFSET + 
((offset + i) * 4);
                r600_loop_consts[i].flags = REG_FLAG_DIRTY_ALWAYS;
-               r600_loop_consts[i].flush_flags = 0;
+               r600_loop_consts[i].sbu_flags = 0;
        }
        return r600_context_add_block(ctx, r600_loop_consts, nreg, 
PKT3_SET_LOOP_CONST, EVERGREEN_LOOP_CONST_OFFSET);
 }
diff --git a/src/gallium/drivers/r600/r600_hw_context.c 
b/src/gallium/drivers/r600/r600_hw_context.c
index bba73e8..bdef830 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -196,7 +196,7 @@ static void r600_init_block(struct r600_context *ctx,
                if ((ctx->screen->family > CHIP_R600) &&
                    (ctx->screen->family < CHIP_RV770) && reg[i+j].flags & 
REG_FLAG_RV6XX_SBU) {
                        block->pm4[block->pm4_ndwords++] = 
PKT3(PKT3_SURFACE_BASE_UPDATE, 0, 0);
-                       block->pm4[block->pm4_ndwords++] = reg[i+j].flush_flags;
+                       block->pm4[block->pm4_ndwords++] = reg[i+j].sbu_flags;
                }
        }
        /* check that we stay in limit */
@@ -718,7 +718,7 @@ static int r600_loop_const_init(struct r600_context *ctx, 
uint32_t offset)
        for (i = 0; i < nreg; i++) {
                r600_loop_consts[i].offset = R600_LOOP_CONST_OFFSET + ((offset 
+ i) * 4);
                r600_loop_consts[i].flags = REG_FLAG_DIRTY_ALWAYS;
-               r600_loop_consts[i].flush_flags = 0;
+               r600_loop_consts[i].sbu_flags = 0;
        }
        return r600_context_add_block(ctx, r600_loop_consts, nreg, 
PKT3_SET_LOOP_CONST, R600_LOOP_CONST_OFFSET);
 }
diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h 
b/src/gallium/drivers/r600/r600_hw_context_priv.h
index ed56623..278bc0d 100644
--- a/src/gallium/drivers/r600/r600_hw_context_priv.h
+++ b/src/gallium/drivers/r600/r600_hw_context_priv.h
@@ -47,7 +47,7 @@
 struct r600_reg {
        unsigned                        offset;
        unsigned                        flags;
-       unsigned                        flush_flags;
+       unsigned                        sbu_flags;
 };
 
 /*
-- 
1.7.5.4

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev