From: Dave Airlie <airlied@redhat.com>
Date: Thu, 2 Sep 2010 05:51:23 +0000 (+1000)
Subject: r600g: fix depth texture tests
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e8ff0f63b6f078b17989e42dd05c9b69729b341b;p=mesa.git

r600g: fix depth texture tests
---

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 83fd01e8a1e..b6698e3885c 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;