mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/vulkan: destroy textures after command buffer completes

Browse source 
We need to wait for any pending command buffer to complete before
we're able to fully destroy a struct wlr_vk_texture: the Vulkan
spec requires the VkDescriptorSet to be kept alive.

So far we've done this in vulkan_end(), after blocking until the
command buffer completes. We'll soon stop blocking, so move this
logic in get_command_buffer(), where we check which commands buffers
have completed in a non-blocking fashion.
This commit is contained in:
Simon Ser 2022-11-07 15:11:10 +01:00
parent 0730552e85
commit 2a414c896e
3 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
render/vulkan/texture.c
View file

@ -156,7 +156,7 @@ static bool write_pixels(struct wlr_vk_texture *texture,
VK_ACCESS_TRANSFER_WRITE_BIT,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_ACCESS_SHADER_READ_BIT);
texture->last_used = renderer->frame;
texture->last_used_cb = renderer->stage.cb;
free(copies);
@ -200,9 +200,9 @@ void vulkan_texture_destroy(struct wlr_vk_texture *texture) {
// it has to be executed before the texture can be destroyed.
// Add it to the renderer->destroy_textures list, destroying
// _after_ the stage command buffer has exectued
if (texture->last_used == texture->renderer->frame) {
if (texture->last_used_cb != NULL) {
assert(texture->destroy_link.next == NULL); // not already inserted
wl_list_insert(&texture->renderer->destroy_textures,
wl_list_insert(&texture->last_used_cb->destroy_textures,
&texture->destroy_link);
return;
}
@ -734,6 +734,10 @@ error:
static void texture_handle_buffer_destroy(struct wlr_addon *addon) {
struct wlr_vk_texture *texture =
wl_container_of(addon, texture, buffer_addon);
// We might keep the texture around, waiting for pending command buffers to
// complete before free'ing descriptor sets. Make sure we don't
// use-after-free the destroyed wlr_buffer.
texture->buffer = NULL;
vulkan_texture_destroy(texture);
}