From: Marek Olšák <maraeo@gmail.com>
Date: Mon, 30 Jan 2012 08:12:33 +0000 (+0100)
Subject: r600g: rename r600_reg::flush_flags -> sbu_flags
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=70d40fc6755a2e4b23c831143cb02133f30fbb02;p=mesa.git

r600g: rename r600_reg::flush_flags -> sbu_flags

There is no other use for that.
---

diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
index 443bc7c6743..9487bdfc6f2 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 7fd0152e456..ea7978250bf 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 ed566230982..278bc0d6fab 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;
 };
 
 /*