diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2017-11-13 23:18:19 +0100 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2017-11-21 18:16:46 +0200 |
| commit | 75efb540e2a2e7631f1724550fffe37a9fcf48dc (patch) | |
| tree | aec690bdaa94de3887e66b342d7e185fad92b0a4 | |
| parent | 179acf6579478bea3fbb2f2d23fc436bb7d8f55b (diff) | |
| download | mesa-75efb540e2a2e7631f1724550fffe37a9fcf48dc.tar.gz | |
radv: Free syncobj with multiple imports.
Otherwise we can leak the old syncobj.
Fixes: eaa56eab6da "radv: initial support for shared semaphores (v2)"
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
(cherry picked from commit 917d3b43f2b206ccf036542aa1c39f1dbdd84f62)
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 6b4c43ca66b..70d59e4303c 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -3623,6 +3623,7 @@ VkResult radv_ImportSemaphoreFdKHR(VkDevice _device, RADV_FROM_HANDLE(radv_device, device, _device); RADV_FROM_HANDLE(radv_semaphore, sem, pImportSemaphoreFdInfo->semaphore); uint32_t syncobj_handle = 0; + uint32_t *syncobj_dst = NULL; assert(pImportSemaphoreFdInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR); int ret = device->ws->import_syncobj(device->ws, pImportSemaphoreFdInfo->fd, &syncobj_handle); @@ -3630,10 +3631,15 @@ VkResult radv_ImportSemaphoreFdKHR(VkDevice _device, return VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR; if (pImportSemaphoreFdInfo->flags & VK_SEMAPHORE_IMPORT_TEMPORARY_BIT_KHR) { - sem->temp_syncobj = syncobj_handle; + syncobj_dst = &sem->temp_syncobj; } else { - sem->syncobj = syncobj_handle; + syncobj_dst = &sem->syncobj; } + + if (*syncobj_dst) + device->ws->destroy_syncobj(device->ws, *syncobj_dst); + + *syncobj_dst = syncobj_handle; close(pImportSemaphoreFdInfo->fd); return VK_SUCCESS; } |