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: use swapchain semaphores for peek window rendering

Browse source
This commit is contained in:
Simon Zeni 2022-11-18 11:14:41 -05:00
parent e4932f0bbf
commit 278aa4cd41
2 changed files with 18 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/xrt/compositor/main/comp_window_peek.c
View file

@ -21,12 +21,6 @@ DEBUG_GET_ONCE_OPTION(window_peek, "XRT_WINDOW_PEEK", NULL)
#define PEEK_IMAGE_USAGE (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT) #define PEEK_IMAGE_USAGE (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT)
#define D(TYPE, thing) \
if (thing != VK_NULL_HANDLE) { \
vk->vkDestroy##TYPE(vk->device, thing, NULL); \
thing = VK_NULL_HANDLE; \
}
static inline struct vk_bundle * static inline struct vk_bundle *
get_vk(struct comp_window_peek *w) get_vk(struct comp_window_peek *w)
{ {
@ -167,23 +161,7 @@ comp_window_peek_create(struct comp_compositor *c)
PEEK_IMAGE_USAGE, // PEEK_IMAGE_USAGE, //
VK_PRESENT_MODE_MAILBOX_KHR); // VK_PRESENT_MODE_MAILBOX_KHR); //
VkSemaphoreCreateInfo sem_info = { VkResult ret = vk_cmd_buffer_create(vk, &w->cmd);
.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
.pNext = NULL,
.flags = 0,
};
VkResult ret = vk->vkCreateSemaphore(vk->device, &sem_info, NULL, &w->acquire);
if (ret != VK_SUCCESS) {
COMP_ERROR(c, "vkCreateSemaphore: %s", vk_result_string(ret));
}
ret = vk->vkCreateSemaphore(vk->device, &sem_info, NULL, &w->submit);
if (ret != VK_SUCCESS) {
COMP_ERROR(c, "vkCreateSemaphore: %s", vk_result_string(ret));
}
ret = vk_cmd_buffer_create(vk, &w->cmd);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
COMP_ERROR(c, "vk_cmd_buffer_create: %s", vk_result_string(ret)); COMP_ERROR(c, "vk_cmd_buffer_create: %s", vk_result_string(ret));
} }
@ -202,18 +180,24 @@ comp_window_peek_destroy(struct comp_window_peek **w_ptr)
return; return;
} }
// Finish the SDL window loop
w->running = false; w->running = false;
os_thread_helper_destroy(&w->oth);
SDL_DestroyWindow(w->window);
struct vk_bundle *vk = get_vk(w); struct vk_bundle *vk = get_vk(w);
os_mutex_lock(&vk->queue_mutex);
vk->vkDeviceWaitIdle(vk->device);
os_mutex_unlock(&vk->queue_mutex);
os_mutex_lock(&vk->cmd_pool_mutex);
vk->vkFreeCommandBuffers(vk->device, vk->cmd_pool, 1, &w->cmd); vk->vkFreeCommandBuffers(vk->device, vk->cmd_pool, 1, &w->cmd);
D(Semaphore, w->acquire); os_mutex_unlock(&vk->cmd_pool_mutex);
D(Semaphore, w->submit);
comp_target_swapchain_cleanup(&w->base); comp_target_swapchain_cleanup(&w->base);
os_thread_helper_destroy(&w->oth);
SDL_DestroyWindow(w->window);
free(w); free(w);
@ -223,7 +207,7 @@ comp_window_peek_destroy(struct comp_window_peek **w_ptr)
void void
comp_window_peek_blit(struct comp_window_peek *w, VkImage src, int32_t width, int32_t height) comp_window_peek_blit(struct comp_window_peek *w, VkImage src, int32_t width, int32_t height)
{ {
if (w->hidden) { if (w->hidden || !w->running) {
return; return;
} }
@ -252,13 +236,13 @@ comp_window_peek_blit(struct comp_window_peek *w, VkImage src, int32_t width, in
struct vk_bundle *vk = get_vk(w); struct vk_bundle *vk = get_vk(w);
// For submitting commands.
os_mutex_lock(&vk->cmd_pool_mutex);
VkCommandBufferBeginInfo begin_info = { VkCommandBufferBeginInfo begin_info = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
}; };
// For submitting commands.
os_mutex_lock(&vk->cmd_pool_mutex);
ret = vk->vkBeginCommandBuffer(w->cmd, &begin_info); ret = vk->vkBeginCommandBuffer(w->cmd, &begin_info);
VkImageSubresourceRange range = { VkImageSubresourceRange range = {
@ -369,12 +353,12 @@ comp_window_peek_blit(struct comp_window_peek *w, VkImage src, int32_t width, in
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
.pNext = NULL, .pNext = NULL,
.waitSemaphoreCount = 1, .waitSemaphoreCount = 1,
.pWaitSemaphores = &w->acquire, .pWaitSemaphores = &w->base.base.semaphores.present_complete,
.pWaitDstStageMask = &submit_flags, .pWaitDstStageMask = &submit_flags,
.commandBufferCount = 1, .commandBufferCount = 1,
.pCommandBuffers = &w->cmd, .pCommandBuffers = &w->cmd,
.signalSemaphoreCount = 1, .signalSemaphoreCount = 1,
.pSignalSemaphores = &w->submit, .pSignalSemaphores = &w->base.base.semaphores.render_complete,
}; };
os_mutex_lock(&vk->queue_mutex); os_mutex_lock(&vk->queue_mutex);
@ -392,7 +376,7 @@ comp_window_peek_blit(struct comp_window_peek *w, VkImage src, int32_t width, in
.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR, .sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR,
.pNext = NULL, .pNext = NULL,
.waitSemaphoreCount = 1, .waitSemaphoreCount = 1,
.pWaitSemaphores = &w->submit, .pWaitSemaphores = &w->base.base.semaphores.render_complete,
.swapchainCount = 1, .swapchainCount = 1,
.pSwapchains = &w->base.swapchain.handle, .pSwapchains = &w->base.swapchain.handle,
.pImageIndices = &current, .pImageIndices = &current,

3
src/xrt/compositor/main/comp_window_peek.h
View file

@ -48,9 +48,6 @@ struct comp_window_peek
bool running; bool running;
bool hidden; bool hidden;
VkSurfaceKHR surface;
VkSemaphore acquire;
VkSemaphore submit;
VkCommandBuffer cmd; VkCommandBuffer cmd;
struct os_thread_helper oth; struct os_thread_helper oth;