From 6286d9810b7ebae588060370cd7a63c327478a2f Mon Sep 17 00:00:00 2001 From: Christoph Bumiller Date: Tue, 31 Jul 2012 15:56:09 +0200 Subject: Revert "gallium: specify resource_resolve destination via a pipe_surface" This reverts commit 5d5af7d359e0060fa00b90a8f04900b96f9058b0. It turns out the issue this was supposed to fix merely counter-acted a bug in the hardware driver that I wasn't aware of. The resource_resolve is not supposed to do sRGB conversion, period. (This would violate the requirement that source and destination must be of the same format). --- src/gallium/drivers/nv30/nv30_miptree.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/gallium/drivers/nv30/nv30_miptree.c') diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c index cd6a81428d9..7e677291f6a 100644 --- a/src/gallium/drivers/nv30/nv30_miptree.c +++ b/src/gallium/drivers/nv30/nv30_miptree.c @@ -153,10 +153,7 @@ 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.surface->texture, - info->dst.surface->u.tex.level, - info->dst.surface->u.tex.first_layer, - info->dst.x0, info->dst.y0, + define_rect(info->dst.res, info->dst.level, 0, 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