r600g: rework dirty / depth texture tracking.

[mesa.git] / src / gallium / drivers / r600 / r600_state.c

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 6adbbd9eabe24195efba2a846d2731465487eeca..354d38ec2344c61b4bc0e810e9c1e33c372521c9 100644 (file)
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -429,7 +429,7 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c
                R600_ERR("unknow format %d\n", state->format);
        }
        tmp = (struct r600_resource_texture *)texture;
-       if (tmp->depth && tmp->tile_type == 1) {
+       if (tmp->depth && !tmp->is_flushing_texture) {
                r600_texture_depth_flush(ctx, texture);
                tmp = tmp->flushed_depth_texture;
        }
@@ -760,8 +760,6 @@ 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->tile_type = 1;
-
        rbuffer = &rtex->resource;
 
        /* XXX quite sure for dx10+ hw don't need any offset hacks */