summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2012-06-15 05:13:02 +0200
committerJakob Bornecrantz <jakob@vmware.com>2012-06-27 20:02:47 +0200
commit87de3e42c1e357018d2808f91c8306e680783654 (patch)
tree9db5e10def4ce103244f0e4568fbf966c1f1a731
parentb7e6ac11706e36a8b773b3fc1b2286dc1f76ca97 (diff)
downloadmesa-auto-cherry-for-8.0.tar.gz
st/mesa: don't do srgb->linear conversion in decompress_with_blitauto-cherry-for-8.0
This fixes piglit/getteximage-formats on r600g. NOTE: This is a candidate for stable branches. Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 5e7e7d96b341e937d3b795e94ac4a863c357f724)
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c1
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 f5bf018c346..a8e02408890 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;