From: Tom Stellard Date: Tue, 16 Oct 2012 14:21:40 +0000 (+0000) Subject: r600g: Fix segfault in r600_compute_global_transfer_map() X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b1e7bd769081a5ebe87b6a5caba4265b0b5bfe0c;p=mesa.git r600g: Fix segfault in r600_compute_global_transfer_map() This segfault was caused by commit 369e46888904c6d379b8b477d9242cff1608e30e, however it is my fault for not testing the patch while it was on the list. --- diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c index 655cf756186..55715949646 100644 --- a/src/gallium/drivers/r600/evergreen_compute.c +++ b/src/gallium/drivers/r600/evergreen_compute.c @@ -851,7 +851,7 @@ void *r600_compute_global_transfer_map( struct compute_memory_pool *pool = rctx->screen->global_pool; struct pipe_transfer *transfer = util_slab_alloc(&rctx->pool_transfers); struct r600_resource_global* buffer = - (struct r600_resource_global*)transfer->resource; + (struct r600_resource_global*)resource; uint32_t* map; compute_memory_finalize_pending(pool, ctx_);