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.

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 603a8a7b915766c5f5d5b4942f626b0bcbeeefc1..0fd1d3995182695025dd83a5a174487614ace316 100644 (file)
--- 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 b55c34500595b875009fa751636cab46983aa472..7ceedf6363b01ef8eee3c9545f76d0d2b4c7e320 100644 (file)
--- 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;