radv: Free temporary syncobj after waiting on it.
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Mon, 13 Nov 2017 22:26:32 +0000 (23:26 +0100)
committerBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tue, 14 Nov 2017 09:03:02 +0000 (10:03 +0100)
Otherwise we leak it.

Fixes: eaa56eab6da "radv: initial support for shared semaphores (v2)"
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
src/amd/vulkan/radv_device.c

index 4e3ad111382cfbf03665f623f397ff68ee6992a1..60f51469c4357c5d0acf82c3e1e750a79911aba1 100644 (file)
@@ -1833,10 +1833,6 @@ static VkResult radv_alloc_sem_counts(struct radv_winsys_sem_counts *counts,
 
                if (sem->temp_syncobj) {
                        counts->syncobj[syncobj_idx++] = sem->temp_syncobj;
-                       if (reset_temp) {
-                               /* after we wait on a temp import - drop it */
-                               sem->temp_syncobj = 0;
-                       }
                }
                else if (sem->syncobj)
                        counts->syncobj[syncobj_idx++] = sem->syncobj;
@@ -1857,6 +1853,21 @@ void radv_free_sem_info(struct radv_winsys_sem_info *sem_info)
        free(sem_info->signal.sem);
 }
 
+
+static void radv_free_temp_syncobjs(struct radv_device *device,
+                                   int num_sems,
+                                   const VkSemaphore *sems)
+{
+       for (uint32_t i = 0; i < num_sems; i++) {
+               RADV_FROM_HANDLE(radv_semaphore, sem, sems[i]);
+
+               if (sem->temp_syncobj) {
+                       device->ws->destroy_syncobj(device->ws, sem->temp_syncobj);
+                       sem->temp_syncobj = 0;
+               }
+       }
+}
+
 VkResult radv_alloc_sem_info(struct radv_winsys_sem_info *sem_info,
                             int num_wait_sems,
                             const VkSemaphore *wait_sems,
@@ -1995,6 +2006,9 @@ VkResult radv_QueueSubmit(
                        }
                }
 
+               radv_free_temp_syncobjs(queue->device,
+                                       pSubmits[i].waitSemaphoreCount,
+                                       pSubmits[i].pWaitSemaphores);
                radv_free_sem_info(&sem_info);
                free(cs_array);
        }