hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

renderer/vulkan: Defer device lost signal until end of pass

Browse source 
If the compositor were to try to handle a GPU reset within the lost
signal (by recreating the renderer) we should avoid referencing renderer
resources after the lost signal. This prevents use after free for such
compositors.
This commit is contained in:
Alexander Orzechowski 2023-08-20 20:55:03 -04:00
parent bdc34401ba
commit 5f6912595e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
render/vulkan/pass.c
View file

@ -69,6 +69,7 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
struct wlr_vk_render_buffer *render_buffer = pass->render_buffer; struct wlr_vk_render_buffer *render_buffer = pass->render_buffer;
struct wlr_vk_command_buffer *stage_cb = NULL; struct wlr_vk_command_buffer *stage_cb = NULL;
VkSemaphoreSubmitInfoKHR *render_wait = NULL; VkSemaphoreSubmitInfoKHR *render_wait = NULL;
bool device_lost = false;
if (pass->failed) { if (pass->failed) {
goto error; goto error;
@ -364,11 +365,9 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
VkSubmitInfo2KHR submit_info[] = { stage_submit, render_submit }; VkSubmitInfo2KHR submit_info[] = { stage_submit, render_submit };
VkResult res = renderer->dev->api.vkQueueSubmit2KHR(renderer->dev->queue, 2, submit_info, VK_NULL_HANDLE); VkResult res = renderer->dev->api.vkQueueSubmit2KHR(renderer->dev->queue, 2, submit_info, VK_NULL_HANDLE);
if (res == VK_ERROR_DEVICE_LOST) {
wlr_log(WLR_ERROR, "vkQueueSubmit failed with VK_ERROR_DEVICE_LOST"); if (res != VK_SUCCESS) {
wl_signal_emit_mutable(&renderer->wlr_renderer.events.lost, NULL); device_lost = res == VK_ERROR_DEVICE_LOST;
goto error;
} else if (res != VK_SUCCESS) {
wlr_vk_error("vkQueueSubmit", res); wlr_vk_error("vkQueueSubmit", res);
goto error; goto error;
} }
@ -398,6 +397,11 @@ error:
vulkan_reset_command_buffer(render_cb); vulkan_reset_command_buffer(render_cb);
wlr_buffer_unlock(render_buffer->wlr_buffer); wlr_buffer_unlock(render_buffer->wlr_buffer);
free(pass); free(pass);
if (device_lost) {
wl_signal_emit_mutable(&renderer->wlr_renderer.events.lost, NULL);
}
return false; return false;
} }