Mesa (master): r600g: fix depth texture tests

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Sep  2 15:51:23 2010 +1000

r600g: fix depth texture tests

---

 src/gallium/drivers/r600/r600_texture.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 83fd01e..b6698e3 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -455,6 +455,8 @@ uint32_t r600_translate_texformat(enum pipe_format format,
 	};
 	desc = util_format_description(format);
 
+	word4 |= r600_get_swizzle_combined(desc->swizzle, swizzle_view);
+
 	/* Colorspace (return non-RGB formats directly). */
 	switch (desc->colorspace) {
 		/* Depth stencil formats */
@@ -493,8 +495,6 @@ uint32_t r600_translate_texformat(enum pipe_format format,
 		break;
 	}
 	
-	word4 |= r600_get_swizzle_combined(desc->swizzle, swizzle_view);
-
 	/* S3TC formats. TODO */
 	if (desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
 		goto out_unknown;