From f3040c6e057dba271300afc6cf89ed0981701d00 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 23 Sep 2021 12:52:12 -0500 Subject: [PATCH] lavapipe: Simplify DeviceWaitIdle No reason to duplicate the guts of QueueWaitIdle inside DeviceWaitIdle. Reviewed-By: Mike Blumenkrantz Part-of: --- src/gallium/frontends/lavapipe/lvp_device.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index d78ca12e7e9..bab411a917c 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -1663,15 +1663,8 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_DeviceWaitIdle( { LVP_FROM_HANDLE(lvp_device, device, _device); - util_queue_finish(&device->queue.queue); - simple_mtx_lock(&device->queue.last_lock); - uint64_t timeline = device->queue.last_fence_timeline; - if (device->queue.last_fence) { - device->pscreen->fence_finish(device->pscreen, NULL, device->queue.last_fence, PIPE_TIMEOUT_INFINITE); - device->pscreen->fence_reference(device->pscreen, &device->queue.last_fence, NULL); - device->queue.last_finished = timeline; - } - simple_mtx_unlock(&device->queue.last_lock); + lvp_QueueWaitIdle(lvp_queue_to_handle(&device->queue)); + return VK_SUCCESS; }