mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c/main: Pass in correct pipeline stage to wait on

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-02-21 01:02:19 +00:00 committed by Jakob Bornecrantz
parent b621fef75d
commit b1b6978069
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/xrt/compositor/main/comp_renderer.c
View file

@ -590,16 +590,17 @@ renderer_wait_for_last_fence(struct comp_renderer *r)
} }
static void static void
renderer_submit_queue(struct comp_renderer *r, VkCommandBuffer cmd) renderer_submit_queue(struct comp_renderer *r, VkCommandBuffer cmd, VkPipelineStageFlags pipeline_stage_flag)
{ {
COMP_TRACE_MARKER(); COMP_TRACE_MARKER();
struct vk_bundle *vk = &r->c->base.vk; struct vk_bundle *vk = &r->c->base.vk;
VkResult ret; VkResult ret;
VkPipelineStageFlags stage_flags[1] = {
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, #define WAIT_SEMAPHORE_COUNT 1
}; VkPipelineStageFlags stage_flags[WAIT_SEMAPHORE_COUNT] = {pipeline_stage_flag};
VkSemaphore wait_semaphores[WAIT_SEMAPHORE_COUNT] = {r->semaphores.present_complete};
// Wait for the last fence, if any. // Wait for the last fence, if any.
renderer_wait_for_last_fence(r); renderer_wait_for_last_fence(r);
@ -613,8 +614,8 @@ renderer_submit_queue(struct comp_renderer *r, VkCommandBuffer cmd)
VkSubmitInfo comp_submit_info = { VkSubmitInfo comp_submit_info = {
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
.waitSemaphoreCount = 1, .waitSemaphoreCount = WAIT_SEMAPHORE_COUNT,
.pWaitSemaphores = &r->semaphores.present_complete, .pWaitSemaphores = wait_semaphores,
.pWaitDstStageMask = stage_flags, .pWaitDstStageMask = stage_flags,
.commandBufferCount = 1, .commandBufferCount = 1,
.pCommandBuffers = &cmd, .pCommandBuffers = &cmd,
@ -858,7 +859,7 @@ dispatch_graphics(struct comp_renderer *r, struct comp_rendering *rr)
renderer_build_rendering(r, rr, rtr, src_samplers, src_image_views, src_norm_rects); renderer_build_rendering(r, rr, rtr, src_samplers, src_image_views, src_norm_rects);
renderer_submit_queue(r, rr->cmd); renderer_submit_queue(r, rr->cmd, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
return; return;
} }
@ -882,7 +883,7 @@ dispatch_graphics(struct comp_renderer *r, struct comp_rendering *rr)
do_gfx_mesh_and_proj(r, rr, rtr, layer, lvd, rvd); do_gfx_mesh_and_proj(r, rr, rtr, layer, lvd, rvd);
renderer_submit_queue(r, rr->cmd); renderer_submit_queue(r, rr->cmd, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
// We mark afterwards to not include CPU time spent. // We mark afterwards to not include CPU time spent.
comp_target_mark_submit(ct, c->frame.rendering.id, os_monotonic_get_ns()); comp_target_mark_submit(ct, c->frame.rendering.id, os_monotonic_get_ns());
@ -895,7 +896,7 @@ dispatch_graphics(struct comp_renderer *r, struct comp_rendering *rr)
do_gfx_mesh_and_proj(r, rr, rtr, layer, lvd, rvd); do_gfx_mesh_and_proj(r, rr, rtr, layer, lvd, rvd);
renderer_submit_queue(r, rr->cmd); renderer_submit_queue(r, rr->cmd, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
// We mark afterwards to not include CPU time spent. // We mark afterwards to not include CPU time spent.
comp_target_mark_submit(ct, c->frame.rendering.id, os_monotonic_get_ns()); comp_target_mark_submit(ct, c->frame.rendering.id, os_monotonic_get_ns());
@ -1074,7 +1075,7 @@ dispatch_compute(struct comp_renderer *r, struct comp_rendering_compute *crc)
comp_target_mark_submit(ct, c->frame.rendering.id, os_monotonic_get_ns()); comp_target_mark_submit(ct, c->frame.rendering.id, os_monotonic_get_ns());
renderer_submit_queue(r, crc->cmd); renderer_submit_queue(r, crc->cmd, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
} }