Mesa (auto-cherry-for-8.0): st/mesa: don't do srgb-> linear conversion in decompress_with_blit

[Jakob Bornecrantz]

Module: Mesa
Branch: auto-cherry-for-8.0
Commit: 87de3e42c1e357018d2808f91c8306e680783654
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=87de3e42c1e357018d2808f91c8306e680783654

Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri Jun 15 05:13:02 2012 +0200

st/mesa: don't do srgb->linear conversion in decompress_with_blit

This fixes piglit/getteximage-formats on r600g.

NOTE: This is a candidate for stable branches.

Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 5e7e7d96b341e937d3b795e94ac4a863c357f724)

---

 src/mesa/state_tracker/st_cb_texture.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index f5bf018..a8e0240 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -639,6 +639,7 @@ decompress_with_blit(struct gl_context * ctx,
 
       u_sampler_view_default_template(&sv_temp, stObj->pt, stObj->pt->format);
 
+      sv_temp.format = util_format_linear(sv_temp.format);
       sv_temp.u.tex.first_level =
       sv_temp.u.tex.last_level = texImage->Level;