diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-04-13 10:55:29 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-04-27 13:14:30 +0100 |
| commit | 048247115bf89fe52aecc2dd8e23acc7ad17abd4 (patch) | |
| tree | 75d18cd575eebf6948582d0865686db759d646cc | |
| parent | 0b4a916ab0d973feaab5f757b277247d08db5dca (diff) | |
gallium/radeon: handle failure when mapping staging buffer
Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
(cherry picked from commit a17911ceb11fbf14b296095a9b5c506295b73d99)
| -rw-r--r-- | src/gallium/drivers/radeon/r600_buffer_common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index 81409ced827..ecc86251094 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -358,6 +358,10 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx, 0, 0, resource, level, box); data = r600_buffer_map_sync_with_rings(rctx, staging, PIPE_TRANSFER_READ); + if (!data) { + pipe_resource_reference((struct pipe_resource **)&staging, NULL); + return NULL; + } data += box->x % R600_MAP_BUFFER_ALIGNMENT; return r600_buffer_get_transfer(ctx, resource, level, usage, box, |