diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/vulkan/renderer.c | 38 | ||||
| -rw-r--r-- | render/vulkan/texture.c | 10 |
2 files changed, 35 insertions, 13 deletions
diff --git a/render/vulkan/renderer.c b/render/vulkan/renderer.c index 4a6f9bdf..f09da5e4 100644 --- a/render/vulkan/renderer.c +++ b/render/vulkan/renderer.c @@ -425,6 +425,7 @@ static bool init_command_buffer(struct wlr_vk_command_buffer *cb, *cb = (struct wlr_vk_command_buffer){ .vk = vk_cb, }; + wl_list_init(&cb->destroy_textures); return true; } @@ -449,6 +450,15 @@ static bool wait_command_buffer(struct wlr_vk_command_buffer *cb, return true; } +static void release_command_buffer_resources(struct wlr_vk_command_buffer *cb) { + struct wlr_vk_texture *texture, *texture_tmp; + wl_list_for_each_safe(texture, texture_tmp, &cb->destroy_textures, destroy_link) { + wl_list_remove(&texture->destroy_link); + texture->last_used_cb = NULL; + wlr_texture_destroy(&texture->wlr_texture); + } +} + static struct wlr_vk_command_buffer *get_command_buffer( struct wlr_vk_renderer *renderer) { VkResult res; @@ -461,6 +471,15 @@ static struct wlr_vk_command_buffer *get_command_buffer( return NULL; } + // Destroy textures for completed command buffers + for (size_t i = 0; i < VULKAN_COMMAND_BUFFERS_CAP; i++) { + struct wlr_vk_command_buffer *cb = &renderer->command_buffers[i]; + if (cb->vk != VK_NULL_HANDLE && !cb->recording && + cb->timeline_point <= current_point) { + release_command_buffer_resources(cb); + } + } + // First try to find an existing command buffer which isn't busy struct wlr_vk_command_buffer *unused = NULL; struct wlr_vk_command_buffer *wait = NULL; @@ -943,15 +962,7 @@ static void vulkan_end(struct wlr_renderer *wlr_renderer) { return; } - ++renderer->frame; release_stage_allocations(renderer); - - // destroy pending textures - wl_list_for_each_safe(texture, tmp_tex, &renderer->destroy_textures, destroy_link) { - wlr_texture_destroy(&texture->wlr_texture); - } - - wl_list_init(&renderer->destroy_textures); // reset the list } static bool vulkan_render_subtexture_with_matrix(struct wlr_renderer *wlr_renderer, @@ -1007,7 +1018,7 @@ static bool vulkan_render_subtexture_with_matrix(struct wlr_renderer *wlr_render VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(vert_pcr_data), sizeof(float), &alpha); vkCmdDraw(cb, 4, 1, 0, 0); - texture->last_used = renderer->frame; + texture->last_used_cb = renderer->current_command_buffer; return true; } @@ -1146,6 +1157,14 @@ static void vulkan_destroy(struct wlr_renderer *wlr_renderer) { wlr_vk_error("vkDeviceWaitIdle", res); } + for (size_t i = 0; i < VULKAN_COMMAND_BUFFERS_CAP; i++) { + struct wlr_vk_command_buffer *cb = &renderer->command_buffers[i]; + if (cb->vk == VK_NULL_HANDLE) { + continue; + } + release_command_buffer_resources(cb); + } + // stage.cb automatically freed with command pool struct wlr_vk_shared_buffer *buf, *tmp_buf; wl_list_for_each_safe(buf, tmp_buf, &renderer->stage.buffers, link) { @@ -1931,7 +1950,6 @@ struct wlr_renderer *vulkan_renderer_create_for_device(struct wlr_vk_device *dev renderer->dev = dev; wlr_renderer_init(&renderer->wlr_renderer, &renderer_impl); wl_list_init(&renderer->stage.buffers); - wl_list_init(&renderer->destroy_textures); wl_list_init(&renderer->foreign_textures); wl_list_init(&renderer->textures); wl_list_init(&renderer->descriptor_pools); diff --git a/render/vulkan/texture.c b/render/vulkan/texture.c index 6cea41b4..d1431556 100644 --- a/render/vulkan/texture.c +++ b/render/vulkan/texture.c @@ -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); } |