From: Marek Olšák <maraeo@gmail.com>
Date: Fri, 15 Jun 2012 03:13:02 +0000 (+0200)
Subject: st/mesa: don't do srgb->linear conversion in decompress_with_blit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e7e7d96b341e937d3b795e94ac4a863c357f724;p=mesa.git

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@vmware.com>
---

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 9d1b7f672f5..67c3f959012 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -600,6 +600,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;