Mesa (master): r600g: use format from the sampler view not from the texture .

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Oct  7 15:13:09 2010 +1000

r600g: use format from the sampler view not from the texture.

we want to use the format from the sampler view which isn't always the
same as the texture format when creating sampler views.

---

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

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 603a8a7..0fd1d39 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -424,15 +424,15 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
 	swizzle[1] = state->swizzle_g;
 	swizzle[2] = state->swizzle_b;
 	swizzle[3] = state->swizzle_a;
-	format = r600_translate_texformat(texture->format,
+	format = r600_translate_texformat(state->format,
 					  swizzle,
 					  &word4, &yuv_format);
 	if (format == ~0) {
 		format = 0;
 	}
-	desc = util_format_description(texture->format);
+	desc = util_format_description(state->format);
 	if (desc == NULL) {
-		R600_ERR("unknow format %d\n", texture->format);
+		R600_ERR("unknow format %d\n", state->format);
 	}
 	tmp = (struct r600_resource_texture*)texture;
 	rbuffer = &tmp->resource;
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index b55c345..7ceedf6 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -626,15 +626,15 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c
 	swizzle[1] = state->swizzle_g;
 	swizzle[2] = state->swizzle_b;
 	swizzle[3] = state->swizzle_a;
-	format = r600_translate_texformat(texture->format,
+	format = r600_translate_texformat(state->format,
 					  swizzle,
 					  &word4, &yuv_format);
 	if (format == ~0) {
 		format = 0;
 	}
-	desc = util_format_description(texture->format);
+	desc = util_format_description(state->format);
 	if (desc == NULL) {
-		R600_ERR("unknow format %d\n", texture->format);
+		R600_ERR("unknow format %d\n", state->format);
 	}
 	tmp = (struct r600_resource_texture*)texture;
 	rbuffer = &tmp->resource;