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

render/vulkan: remove stage_cb conditional

Browse source 
We always have a stage_cb at this point.
This commit is contained in:
Simon Ser 2022-12-03 09:39:12 +01:00
parent dd5be430b4
commit 666c45bb29
1 changed files with 30 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
render/vulkan/renderer.c
View file

@ -953,44 +953,40 @@ static void vulkan_end(struct wlr_renderer *wlr_renderer) {
// We don't need a semaphore from the stage/transfer submission // We don't need a semaphore from the stage/transfer submission
// to the render submissions since they are on the same queue // to the render submissions since they are on the same queue
// 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 = end_command_buffer(stage_cb, renderer);
VkTimelineSemaphoreSubmitInfoKHR stage_timeline_submit_info; if (stage_timeline_point == 0) {
return;
}
VkTimelineSemaphoreSubmitInfoKHR stage_timeline_submit_info = {
.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR,
.signalSemaphoreValueCount = 1,
.pSignalSemaphoreValues = &stage_timeline_point,
};
VkSubmitInfo *stage_sub = &submit_infos[submit_count];
stage_sub->sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
stage_sub->pNext = &stage_timeline_submit_info;
stage_sub->commandBufferCount = 1u;
stage_sub->pCommandBuffers = &stage_cb->vk;
stage_sub->signalSemaphoreCount = 1;
stage_sub->pSignalSemaphores = &renderer->timeline_semaphore;
++submit_count;
uint64_t stage_wait_timeline_point; uint64_t stage_wait_timeline_point;
VkPipelineStageFlags stage_wait_stage; VkPipelineStageFlags stage_wait_stage;
if (stage_cb != NULL) { if (renderer->stage.last_timeline_point > 0) {
stage_timeline_point = end_command_buffer(stage_cb, renderer); stage_wait_timeline_point = renderer->stage.last_timeline_point;
if (stage_timeline_point == 0) { stage_wait_stage = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
return; stage_sub->waitSemaphoreCount = 1;
} stage_sub->pWaitSemaphores = &renderer->timeline_semaphore;
stage_sub->pWaitDstStageMask = &stage_wait_stage;
stage_timeline_submit_info = (VkTimelineSemaphoreSubmitInfoKHR){ stage_timeline_submit_info.waitSemaphoreValueCount = 1;
.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR, stage_timeline_submit_info.pWaitSemaphoreValues = &stage_wait_timeline_point;
.signalSemaphoreValueCount = 1,
.pSignalSemaphoreValues = &stage_timeline_point,
};
VkSubmitInfo *stage_sub = &submit_infos[submit_count];
stage_sub->sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
stage_sub->pNext = &stage_timeline_submit_info;
stage_sub->commandBufferCount = 1u;
stage_sub->pCommandBuffers = &stage_cb->vk;
stage_sub->signalSemaphoreCount = 1;
stage_sub->pSignalSemaphores = &renderer->timeline_semaphore;
++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;
} }
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);
if (render_timeline_point == 0) { if (render_timeline_point == 0) {
return; return;