zink: keep a count of async presents occuring for a given swapchain

this provides info about whether a swapchain is in use in another thread

Fixes: 8ade5588e3 ("zink: add kopper api")

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16932>
(cherry picked from commit 1dfa19c541)
This commit is contained in:
Mike Blumenkrantz 2022-06-09 09:19:18 -04:00 committed by Dylan Baker
parent 302c13dc8d
commit a86a20ed99
3 changed files with 6 additions and 2 deletions

View file

@ -31,7 +31,7 @@
"description": "zink: keep a count of async presents occuring for a given swapchain",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "8ade5588e39d736bdeab9bdd8ffa7cbfb6a5191e"
},

View file

@ -634,6 +634,8 @@ kopper_present(void *data, void *gdata, int thread_idx)
_mesa_hash_table_insert(swapchain->presents, (void*)(uintptr_t)next, arr);
}
util_dynarray_append(arr, VkSemaphore, cpi->sem);
if (thread_idx != -1)
p_atomic_dec(&swapchain->async_presents);
free(cpi);
}
@ -660,10 +662,11 @@ zink_kopper_present_queue(struct zink_screen *screen, struct zink_resource *res)
cpi->info.pResults = NULL;
res->obj->present = VK_NULL_HANDLE;
if (util_queue_is_initialized(&screen->flush_queue)) {
p_atomic_inc(&cpi->swapchain->async_presents);
util_queue_add_job(&screen->flush_queue, cpi, &cdt->present_fence,
kopper_present, NULL, 0);
} else {
kopper_present(cpi, screen, 0);
kopper_present(cpi, screen, -1);
}
res->obj->acquire = VK_NULL_HANDLE;
res->obj->indefinite_acquire = res->obj->acquired = false;

View file

@ -41,6 +41,7 @@ struct kopper_swapchain {
VkSwapchainCreateInfoKHR scci;
unsigned num_acquires;
unsigned max_acquires;
unsigned async_presents;
};
enum kopper_type {