Module: Mesa Branch: master Commit: 5e7e7d96b341e937d3b795e94ac4a863c357f724 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e7e7d96b341e937d3b795e94ac4a863c357f724
Author: Marek Olšák <[email protected]> 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 <[email protected]> --- 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 9d1b7f6..67c3f95 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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
