From 54db46582aba2252d544fa3956522f9ef06b49cb Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 15 Oct 2012 16:50:35 +0200 Subject: xserver mesa pixman git update 15 oct 2012 xserver: a69429a17bf4630f6e26f61630a1c2b287202627 pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1 mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28 --- mesalib/src/gallium/auxiliary/util/u_debug.c | 29 +++++++++++++--------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'mesalib/src/gallium/auxiliary/util/u_debug.c') diff --git a/mesalib/src/gallium/auxiliary/util/u_debug.c b/mesalib/src/gallium/auxiliary/util/u_debug.c index bf98f222e..c41585fdd 100644 --- a/mesalib/src/gallium/auxiliary/util/u_debug.c +++ b/mesalib/src/gallium/auxiliary/util/u_debug.c @@ -516,14 +516,12 @@ void debug_dump_surface(struct pipe_context *pipe, */ texture = surface->texture; - transfer = pipe_get_transfer(pipe, texture, surface->u.tex.level, - surface->u.tex.first_layer, - PIPE_TRANSFER_READ, - 0, 0, surface->width, surface->height); - - data = pipe->transfer_map(pipe, transfer); + data = pipe_transfer_map(pipe, texture, surface->u.tex.level, + surface->u.tex.first_layer, + PIPE_TRANSFER_READ, + 0, 0, surface->width, surface->height, &transfer); if(!data) - goto error; + return; debug_dump_image(prefix, texture->format, @@ -534,8 +532,6 @@ void debug_dump_surface(struct pipe_context *pipe, data); pipe->transfer_unmap(pipe, transfer); -error: - pipe->transfer_destroy(pipe, transfer); } @@ -597,20 +593,21 @@ debug_dump_surface_bmp(struct pipe_context *pipe, { struct pipe_transfer *transfer; struct pipe_resource *texture = surface->texture; + void *ptr; - transfer = pipe_get_transfer(pipe, texture, surface->u.tex.level, - surface->u.tex.first_layer, PIPE_TRANSFER_READ, - 0, 0, surface->width, surface->height); + ptr = pipe_transfer_map(pipe, texture, surface->u.tex.level, + surface->u.tex.first_layer, PIPE_TRANSFER_READ, + 0, 0, surface->width, surface->height, &transfer); - debug_dump_transfer_bmp(pipe, filename, transfer); + debug_dump_transfer_bmp(pipe, filename, transfer, ptr); - pipe->transfer_destroy(pipe, transfer); + pipe->transfer_unmap(pipe, transfer); } void debug_dump_transfer_bmp(struct pipe_context *pipe, const char *filename, - struct pipe_transfer *transfer) + struct pipe_transfer *transfer, void *ptr) { float *rgba; @@ -624,7 +621,7 @@ debug_dump_transfer_bmp(struct pipe_context *pipe, if(!rgba) goto error1; - pipe_get_tile_rgba(pipe, transfer, 0, 0, + pipe_get_tile_rgba(transfer, ptr, 0, 0, transfer->box.width, transfer->box.height, rgba); -- cgit v1.2.3