OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavapipe: Lift fence check into dedicated function

Browse Source 
Signed-off-by: Omar Akkila <omar.akkila@collabora.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15443>
This commit is contained in:
Omar Akkila
2022-03-18 00:54:43 -04:00
committed by Marge Bot
parent 4f6c7a6025
commit f18429340e
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gallium/frontends/lavapipe/lvp_device.c
View File

@@ -1283,6 +1283,13 @@ get_semaphore_link(struct lvp_semaphore *sema)
return tl; return tl;
} }
static bool
fence_finish(struct lvp_device *device,
struct pipe_fence_handle *fence, uint64_t timeout)
{
return fence && device->pscreen->fence_finish(device->pscreen, NULL, fence, timeout);
}
/* prune any timeline links which are older than the current device timeline id /* prune any timeline links which are older than the current device timeline id
* sema->lock MUST be locked before calling * sema->lock MUST be locked before calling
*/ */
@@ -1360,11 +1367,9 @@ static VkResult wait_semaphores(struct lvp_device *device,
if (!sema->is_timeline) { if (!sema->is_timeline) {
simple_mtx_lock(&sema->lock); simple_mtx_lock(&sema->lock);
if (sema->handle) { if (fence_finish(device, sema->handle, wait_interval)) {
if (device->pscreen->fence_finish(device->pscreen, NULL, sema->handle, wait_interval)) { tl_array[i].done = true;
tl_array[i].done = true; num_remaining--;
num_remaining--;
}
} }
simple_mtx_unlock(&sema->lock); simple_mtx_unlock(&sema->lock);
continue; continue;
@@ -1400,8 +1405,7 @@ static VkResult wait_semaphores(struct lvp_device *device,
*/ */
if (sema->current >= waitval || if (sema->current >= waitval ||
(tl_array[i].tl && (tl_array[i].tl &&
tl_array[i].tl->fence && fence_finish(device, tl_array[i].tl->fence, wait_interval))) {
device->pscreen->fence_finish(device->pscreen, NULL, tl_array[i].tl->fence, wait_interval))) {
tl_array[i].done = true; tl_array[i].done = true;
num_remaining--; num_remaining--;
} }
@@ -1730,8 +1734,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_QueueWaitIdle(
util_queue_finish(&queue->queue); util_queue_finish(&queue->queue);
simple_mtx_lock(&queue->last_lock); simple_mtx_lock(&queue->last_lock);
uint64_t timeline = queue->last_fence_timeline; uint64_t timeline = queue->last_fence_timeline;
if (queue->last_fence) { if (fence_finish(queue->device, queue->last_fence, PIPE_TIMEOUT_INFINITE)) {
queue->device->pscreen->fence_finish(queue->device->pscreen, NULL, queue->last_fence, PIPE_TIMEOUT_INFINITE);
queue->device->pscreen->fence_reference(queue->device->pscreen, &queue->device->queue.last_fence, NULL); queue->device->pscreen->fence_reference(queue->device->pscreen, &queue->device->queue.last_fence, NULL);
queue->last_finished = timeline; queue->last_finished = timeline;
} }
@@ -2282,9 +2285,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_GetFenceStatus(
if (fence->signalled) if (fence->signalled)
return VK_SUCCESS; return VK_SUCCESS;
if (!util_queue_fence_is_signalled(&fence->fence) || if (!util_queue_fence_is_signalled(&fence->fence) || !fence_finish(device, fence->handle, 0))
!fence->handle ||
!device->pscreen->fence_finish(device->pscreen, NULL, fence->handle, 0))
return VK_NOT_READY; return VK_NOT_READY;
fence->signalled = true; fence->signalled = true;
@@ -2403,8 +2404,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_WaitForFences(
} }
} }
if (!fence->handle || if (!fence_finish(device, fence->handle, timeout))
!device->pscreen->fence_finish(device->pscreen, NULL, fence->handle, timeout))
return VK_TIMEOUT; return VK_TIMEOUT;
simple_mtx_lock(&device->queue.last_lock); simple_mtx_lock(&device->queue.last_lock);
if (fence->handle == device->queue.last_fence) { if (fence->handle == device->queue.last_fence) {