nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-29 10:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

render/vulkan: always wait for last stage to complete before rendering

Browse Source 
When we have multiple command buffers in flight, we need to make
sure we don't start rendering before the previous texture uploads
are complete.
This commit is contained in:
Simon Ser 2022-11-04 17:32:06 +01:00
parent 7fdcb45e66
commit f4f3c15c1e
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/render/vulkan.h
View File

@ -195,6 +195,7 @@ struct wlr_vk_renderer {
struct { struct {
struct wlr_vk_command_buffer *cb; struct wlr_vk_command_buffer *cb;
uint64_t last_timeline_point;
struct wl_list buffers; // wlr_vk_shared_buffer.link struct wl_list buffers; // wlr_vk_shared_buffer.link
} stage; } stage;

14
render/vulkan/renderer.c
View File

@ -860,6 +860,8 @@ static void vulkan_end(struct wlr_renderer *wlr_renderer) {
// and we have a renderpass dependency for that. // and we have a renderpass dependency for that.
uint64_t stage_timeline_point; uint64_t stage_timeline_point;
VkTimelineSemaphoreSubmitInfoKHR stage_timeline_submit_info; VkTimelineSemaphoreSubmitInfoKHR stage_timeline_submit_info;
uint64_t stage_wait_timeline_point;
VkPipelineStageFlags stage_wait_stage;
if (stage_cb != NULL) { if (stage_cb != NULL) {
stage_timeline_point = end_command_buffer(stage_cb, renderer); stage_timeline_point = end_command_buffer(stage_cb, renderer);
if (stage_timeline_point == 0) { if (stage_timeline_point == 0) {
@ -878,6 +880,18 @@ static void vulkan_end(struct wlr_renderer *wlr_renderer) {
stage_sub->commandBufferCount = 1u; stage_sub->commandBufferCount = 1u;
stage_sub->pCommandBuffers = &pre_cb; stage_sub->pCommandBuffers = &pre_cb;
++submit_count; ++submit_count;
if (renderer->stage.last_timeline_point > 0) {
stage_wait_timeline_point = renderer->stage.last_timeline_point;
stage_wait_stage = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
stage_sub->waitSemaphoreCount = 1;
stage_sub->pWaitSemaphores = &renderer->timeline_semaphore;
stage_sub->pWaitDstStageMask = &stage_wait_stage;
stage_timeline_submit_info.waitSemaphoreValueCount = 1;
stage_timeline_submit_info.pWaitSemaphoreValues = &stage_wait_timeline_point;
}
renderer->stage.last_timeline_point = stage_timeline_point;
} }
uint64_t render_timeline_point = end_command_buffer(render_cb, renderer); uint64_t render_timeline_point = end_command_buffer(render_cb, renderer);