mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 15:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Vulkan) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-07-20 06:31:15 +02:00
parent 9ac9309991
commit a5a3d64b18
2 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gfx/common/vulkan_common.c
View File

@ -123,7 +123,8 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL vulkan_debug_cb(
} }
#endif #endif
void vulkan_emulated_mailbox_deinit(struct vulkan_emulated_mailbox *mailbox) static void vulkan_emulated_mailbox_deinit(
struct vulkan_emulated_mailbox *mailbox)
{ {
if (mailbox->thread) if (mailbox->thread)
{ {
@ -142,51 +143,45 @@ void vulkan_emulated_mailbox_deinit(struct vulkan_emulated_mailbox *mailbox)
memset(mailbox, 0, sizeof(*mailbox)); memset(mailbox, 0, sizeof(*mailbox));
} }
VkResult vulkan_emulated_mailbox_acquire_next_image( static VkResult vulkan_emulated_mailbox_acquire_next_image(
struct vulkan_emulated_mailbox *mailbox, struct vulkan_emulated_mailbox *mailbox,
unsigned *index) unsigned *index)
{ {
VkResult res; VkResult res = VK_TIMEOUT;
if (mailbox->swapchain == VK_NULL_HANDLE)
return VK_ERROR_OUT_OF_DATE_KHR;
slock_lock(mailbox->lock); slock_lock(mailbox->lock);
if (!mailbox->has_pending_request) if (!mailbox->has_pending_request)
{ {
mailbox->request_acquire = true; mailbox->request_acquire = true;
scond_signal(mailbox->cond); scond_signal(mailbox->cond);
} }
mailbox->has_pending_request = true; mailbox->has_pending_request = true;
if (mailbox->acquired) if (mailbox->acquired)
{ {
res = mailbox->result; res = mailbox->result;
*index = mailbox->index; *index = mailbox->index;
mailbox->has_pending_request = false; mailbox->has_pending_request = false;
mailbox->acquired = false; mailbox->acquired = false;
} }
else
res = VK_TIMEOUT;
slock_unlock(mailbox->lock); slock_unlock(mailbox->lock);
return res; return res;
} }
VkResult vulkan_emulated_mailbox_acquire_next_image_blocking( static VkResult vulkan_emulated_mailbox_acquire_next_image_blocking(
struct vulkan_emulated_mailbox *mailbox, struct vulkan_emulated_mailbox *mailbox,
unsigned *index) unsigned *index)
{ {
VkResult res; VkResult res;
if (mailbox->swapchain == VK_NULL_HANDLE)
return VK_ERROR_OUT_OF_DATE_KHR;
slock_lock(mailbox->lock); slock_lock(mailbox->lock);
if (!mailbox->has_pending_request) if (!mailbox->has_pending_request)
{ {
mailbox->request_acquire = true; mailbox->request_acquire = true;
scond_signal(mailbox->cond); scond_signal(mailbox->cond);
} }
@ -197,9 +192,9 @@ VkResult vulkan_emulated_mailbox_acquire_next_image_blocking(
res = mailbox->result; res = mailbox->result;
if (res == VK_SUCCESS) if (res == VK_SUCCESS)
*index = mailbox->index; *index = mailbox->index;
mailbox->has_pending_request = false; mailbox->has_pending_request = false;
mailbox->acquired = false; mailbox->acquired = false;
slock_unlock(mailbox->lock); slock_unlock(mailbox->lock);
return res; return res;
@ -264,7 +259,7 @@ static void vulkan_emulated_mailbox_loop(void *userdata)
vkDestroyFence(mailbox->device, fence, NULL); vkDestroyFence(mailbox->device, fence, NULL);
} }
bool vulkan_emulated_mailbox_init( static bool vulkan_emulated_mailbox_init(
struct vulkan_emulated_mailbox *mailbox, struct vulkan_emulated_mailbox *mailbox,
VkDevice device, VkDevice device,
VkSwapchainKHR swapchain) VkSwapchainKHR swapchain)
@ -2809,8 +2804,11 @@ retry:
/* Non-blocking acquire. If we don't get a swapchain frame right away, /* Non-blocking acquire. If we don't get a swapchain frame right away,
* just skip rendering to the swapchain this frame, similar to what * just skip rendering to the swapchain this frame, similar to what
* MAILBOX would do. */ * MAILBOX would do. */
err = vulkan_emulated_mailbox_acquire_next_image( if (vk->mailbox.swapchain == VK_NULL_HANDLE)
&vk->mailbox, &vk->context.current_swapchain_index); err = VK_ERROR_OUT_OF_DATE_KHR;
else
err = vulkan_emulated_mailbox_acquire_next_image(
&vk->mailbox, &vk->context.current_swapchain_index);
} }
else else
{ {
@ -2953,22 +2951,32 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
RARCH_LOG("[Vulkan]: Do not need to re-create swapchain.\n"); RARCH_LOG("[Vulkan]: Do not need to re-create swapchain.\n");
vulkan_create_wait_fences(vk); vulkan_create_wait_fences(vk);
if (vk->emulating_mailbox && vk->mailbox.swapchain == VK_NULL_HANDLE) if ( vk->emulating_mailbox
&& vk->mailbox.swapchain == VK_NULL_HANDLE)
{ {
vulkan_emulated_mailbox_init(&vk->mailbox, vk->context.device, vk->swapchain); vulkan_emulated_mailbox_init(
&vk->mailbox, vk->context.device, vk->swapchain);
vk->created_new_swapchain = false; vk->created_new_swapchain = false;
return true; return true;
} }
else if (!vk->emulating_mailbox && vk->mailbox.swapchain != VK_NULL_HANDLE) else if (
!vk->emulating_mailbox
&& vk->mailbox.swapchain != VK_NULL_HANDLE)
{ {
/* We are tearing down, and entering a state where we are supposed to have /* We are tearing down, and entering a state
* where we are supposed to have
* acquired an image, so block until we have acquired. */ * acquired an image, so block until we have acquired. */
if (!vk->context.has_acquired_swapchain) if (!vk->context.has_acquired_swapchain)
res = vulkan_emulated_mailbox_acquire_next_image_blocking( {
&vk->mailbox, if (vk->mailbox.swapchain == VK_NULL_HANDLE)
&vk->context.current_swapchain_index); res = VK_ERROR_OUT_OF_DATE_KHR;
else
res = vulkan_emulated_mailbox_acquire_next_image_blocking(
&vk->mailbox,
&vk->context.current_swapchain_index);
}
else else
res = VK_SUCCESS; res = VK_SUCCESS;
vulkan_emulated_mailbox_deinit(&vk->mailbox); vulkan_emulated_mailbox_deinit(&vk->mailbox);

6
gfx/common/vulkan_common.h
View File

@ -147,12 +147,6 @@ struct vulkan_emulated_mailbox
VkResult result; VkResult result;
}; };
bool vulkan_emulated_mailbox_init(struct vulkan_emulated_mailbox *mailbox,
VkDevice device, VkSwapchainKHR swapchain);
void vulkan_emulated_mailbox_deinit(struct vulkan_emulated_mailbox *mailbox);
VkResult vulkan_emulated_mailbox_acquire_next_image(struct vulkan_emulated_mailbox *mailbox, unsigned *index);
VkResult vulkan_emulated_mailbox_acquire_next_image_blocking(struct vulkan_emulated_mailbox *mailbox, unsigned *index);
typedef struct gfx_ctx_vulkan_data typedef struct gfx_ctx_vulkan_data
{ {
bool need_new_swapchain; bool need_new_swapchain;