From: Dave Airlie <airlied@redhat.com>
Date: Fri, 4 Feb 2011 05:26:09 +0000 (+1000)
Subject: r600g: fix evergreen sampler view + depth interaction
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fdd35dc91220046ed66877e60479f155e3a23690;p=mesa.git

r600g: fix evergreen sampler view + depth interaction
---

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 73fa1714361..b80d8049718 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -381,7 +381,7 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
 		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, TRUE);
 		tmp = tmp->flushed_depth_texture;
 	}