Mesa (master): r600g: just change tile type when buffer is set to depth.

Dave Airlie airlied at kemper.freedesktop.org
Tue Feb 1 04:40:02 UTC 2011


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Feb  1 14:38:45 2011 +1000

r600g: just change tile type when buffer is set to depth.

Not 100% sure on this one, but this is how it should work,
the question is whether it will uncover other bugs elsewhere.

---

 src/gallium/drivers/r600/evergreen_state.c |    3 ---
 src/gallium/drivers/r600/r600_state.c      |    5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 426b3a9..c64b93b 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -721,10 +721,7 @@ static void evergreen_db(struct r600_pipe_context *rctx, struct r600_pipe_state
 
 	surf = (struct r600_surface *)state->zsbuf;
 	rtex = (struct r600_resource_texture*)state->zsbuf->texture;
-	rtex->tiled = 1;
-	rtex->array_mode[level] = 2;
 	rtex->tile_type = 1;
-	rtex->depth = 1;
 	rbuffer = &rtex->resource;
 
 	/* XXX quite sure for dx10+ hw don't need any offset hacks */
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index acaa5c0..6adbbd9 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -759,10 +759,9 @@ static void r600_db(struct r600_pipe_context *rctx, struct r600_pipe_state *rsta
 
 	surf = (struct r600_surface *)state->zsbuf;
 	rtex = (struct r600_resource_texture*)state->zsbuf->texture;
-	rtex->tiled = 1;
-	rtex->array_mode[level] = 2;
+
 	rtex->tile_type = 1;
-	rtex->depth = 1;
+
 	rbuffer = &rtex->resource;
 
 	/* XXX quite sure for dx10+ hw don't need any offset hacks */




More information about the mesa-commit mailing list