From 5d5af7d359e0060fa00b90a8f04900b96f9058b0 Mon Sep 17 00:00:00 2001 From: Christoph Bumiller Date: Wed, 25 Jul 2012 13:47:58 +0200 Subject: gallium: specify resource_resolve destination via a pipe_surface The format member of pipe_surface may differ from that of the pipe_resource, which is used to communicate, for instance, whether sRGB encode should be enabled in the resolve operation or not. Fixes resolve to sRGB surfaces in mesa/st when GL_FRAMEBUFFER_SRGB is disabled. Reviewed-by: Brian Paul --- src/gallium/drivers/nv30/nv30_miptree.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/gallium/drivers/nv30') diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c index 7e677291f6a..cd6a81428d9 100644 --- a/src/gallium/drivers/nv30/nv30_miptree.c +++ b/src/gallium/drivers/nv30/nv30_miptree.c @@ -153,7 +153,10 @@ nv30_resource_resolve(struct pipe_context *pipe, define_rect(info->src.res, 0, 0, info->src.x0, info->src.y0, info->src.x1 - info->src.x0, info->src.y1 - info->src.y0, &src); - define_rect(info->dst.res, info->dst.level, 0, info->dst.x0, info->dst.y0, + define_rect(info->dst.surface->texture, + info->dst.surface->u.tex.level, + info->dst.surface->u.tex.first_layer, + info->dst.x0, info->dst.y0, info->dst.x1 - info->dst.x0, info->dst.y1 - info->dst.y0, &dst); nv30_transfer_rect(nv30, BILINEAR, &src, &dst); -- cgit v1.2.3