Mesa (master): r600g: fix typo in struct member name

Dave Airlie airlied at kemper.freedesktop.org
Wed Sep 22 03:37:19 UTC 2010


Module: Mesa
Branch: master
Commit: 6e901e330aa7f0d186dad19bcc886bf45a76e50b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e901e330aa7f0d186dad19bcc886bf45a76e50b

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Sep 21 13:16:32 2010 +1000

r600g: fix typo in struct member name

---

 src/gallium/drivers/r600/eg_hw_states.c   |    4 ++--
 src/gallium/drivers/r600/r600_hw_states.c |    4 ++--
 src/gallium/drivers/r600/r600_resource.h  |    2 +-
 src/gallium/drivers/r600/r600_state2.c    |    2 +-
 src/gallium/drivers/r600/r600_texture.c   |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/r600/eg_hw_states.c b/src/gallium/drivers/r600/eg_hw_states.c
index 3d10095..6ad350b 100644
--- a/src/gallium/drivers/r600/eg_hw_states.c
+++ b/src/gallium/drivers/r600/eg_hw_states.c
@@ -164,7 +164,7 @@ static void eg_db(struct r600_context *rctx, struct radeon_state *rstate,
 		return;
 
 	rtex = (struct r600_resource_texture*)state->zsbuf->texture;
-	rtex->tilled = 1;
+	rtex->tiled = 1;
 	rtex->array_mode = 2;
 	rtex->tile_type = 1;
 	rtex->depth = 1;
@@ -1107,7 +1107,7 @@ static void eg_texture_state_db(struct r600_screen *rscreen, struct r600_resourc
 
 	radeon_state_init(rstate, rscreen->rw, R600_STATE_DB, 0, 0);
 	rbuffer = &rtexture->resource;
-	rtexture->tilled = 1;
+	rtexture->tiled = 1;
 	rtexture->array_mode = 2;
 	rtexture->tile_type = 1;
 	rtexture->depth = 1;
diff --git a/src/gallium/drivers/r600/r600_hw_states.c b/src/gallium/drivers/r600/r600_hw_states.c
index 271bd1a..13abd17 100644
--- a/src/gallium/drivers/r600/r600_hw_states.c
+++ b/src/gallium/drivers/r600/r600_hw_states.c
@@ -165,7 +165,7 @@ static void r600_db(struct r600_context *rctx, struct radeon_state *rstate,
 		return;
 
 	rtex = (struct r600_resource_texture*)state->zsbuf->texture;
-	rtex->tilled = 1;
+	rtex->tiled = 1;
 	rtex->array_mode = 2;
 	rtex->tile_type = 1;
 	rtex->depth = 1;
@@ -1178,7 +1178,7 @@ static void r600_texture_state_db(struct r600_screen *rscreen, struct r600_resou
 
 	radeon_state_init(rstate, rscreen->rw, R600_STATE_DB, 0, 0);
 	rbuffer = &rtexture->resource;
-	rtexture->tilled = 1;
+	rtexture->tiled = 1;
 	rtexture->array_mode = 2;
 	rtexture->tile_type = 1;
 	rtexture->depth = 1;
diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h
index cd1c31e..5d56910 100644
--- a/src/gallium/drivers/r600/r600_resource.h
+++ b/src/gallium/drivers/r600/r600_resource.h
@@ -50,7 +50,7 @@ struct r600_resource_texture {
 	unsigned long			pitch_override;
 	unsigned long			bpt;
 	unsigned long			size;
-	unsigned			tilled;
+	unsigned			tiled;
 	unsigned			array_mode;
 	unsigned			tile_type;
 	unsigned			depth;
diff --git a/src/gallium/drivers/r600/r600_state2.c b/src/gallium/drivers/r600/r600_state2.c
index 0343704..b93bdd3 100644
--- a/src/gallium/drivers/r600/r600_state2.c
+++ b/src/gallium/drivers/r600/r600_state2.c
@@ -1563,7 +1563,7 @@ static void r600_db(struct r600_pipe_context *rctx, struct r600_pipe_state *rsta
 		return;
 
 	rtex = (struct r600_resource_texture*)state->zsbuf->texture;
-	rtex->tilled = 1;
+	rtex->tiled = 1;
 	rtex->array_mode = 2;
 	rtex->tile_type = 1;
 	rtex->depth = 1;
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index f60fe9f..4aabae1 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -267,7 +267,7 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx,
 	trans->transfer.box = *box;
 	trans->transfer.stride = rtex->pitch[sr.level];
 	trans->offset = r600_texture_get_offset(rtex, sr.level, box->z, sr.face);
-	if (rtex->tilled && !rtex->depth) {
+	if (rtex->tiled && !rtex->depth) {
 		resource.target = PIPE_TEXTURE_2D;
 		resource.format = texture->format;
 		resource.width0 = box->width;




More information about the mesa-commit mailing list