summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2012-10-16 14:21:40 +0000
committerTom Stellard <[email protected]>2012-10-16 14:39:16 +0000
commitb1e7bd769081a5ebe87b6a5caba4265b0b5bfe0c (patch)
treecaa7e9e9c021408ee3828a18505b74bcd4dce9eb
parenta73c5d3f9d8a232efca750edd9e24f9913e0194d (diff)
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.
-rw-r--r--src/gallium/drivers/r600/evergreen_compute.c2
1 files changed, 1 insertions, 1 deletions
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_);