mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

More refactors - create vulkan_destroy_context

Browse Source
This commit is contained in:
twinaphex 2016-02-19 11:12:43 +01:00
parent 6be1453d9c
commit a61536ffdc
1 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
gfx/drivers_context/wayland_ctx.c
View File

@ -472,6 +472,12 @@ static void gfx_ctx_wl_get_video_size(void *data,
} \ } \
} while(0) } while(0)
static void vulkan_destroy_context(gfx_ctx_vulkan_data_t *vk)
{
if (vk->context.queue_lock)
slock_free(vk->context.queue_lock);
}
static bool vulkan_init_context(gfx_ctx_vulkan_data_t *vk) static bool vulkan_init_context(gfx_ctx_vulkan_data_t *vk)
{ {
unsigned i; unsigned i;
@ -848,8 +854,7 @@ static void gfx_ctx_wl_destroy(void *data)
{ {
case GFX_CTX_VULKAN_API: case GFX_CTX_VULKAN_API:
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
if (wl->vk.context.queue_lock) vulkan_destroy_context(&wl->vk);
slock_free(wl->vk.context.queue_lock);
#endif #endif
break; break;
case GFX_CTX_NONE: case GFX_CTX_NONE:
@ -1227,21 +1232,24 @@ static void *gfx_ctx_wl_get_context_data(void *data)
static void vulkan_acquire_next_image(gfx_ctx_vulkan_data_t *vk) static void vulkan_acquire_next_image(gfx_ctx_vulkan_data_t *vk)
{ {
unsigned index;
VkResult err; VkResult err;
VkSemaphoreCreateInfo sem_info = { VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO };
VkFenceCreateInfo info = { VK_STRUCTURE_TYPE_FENCE_CREATE_INFO };
VkFence fence; VkFence fence;
VkFence *next_fence; VkFence *next_fence;
unsigned index; VkSemaphoreCreateInfo sem_info =
{ VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO };
VkFenceCreateInfo info = { VK_STRUCTURE_TYPE_FENCE_CREATE_INFO };
vkCreateFence(vk->context.device, &info, NULL, &fence); vkCreateFence(vk->context.device, &info, NULL, &fence);
err = vk->fpAcquireNextImageKHR(vk->context.device, vk->swapchain, UINT64_MAX, err = vk->fpAcquireNextImageKHR(vk->context.device,
vk->swapchain, UINT64_MAX,
VK_NULL_HANDLE, fence, &vk->context.current_swapchain_index); VK_NULL_HANDLE, fence, &vk->context.current_swapchain_index);
index = vk->context.current_swapchain_index; index = vk->context.current_swapchain_index;
if (vk->context.swapchain_semaphores[index] == VK_NULL_HANDLE) if (vk->context.swapchain_semaphores[index] == VK_NULL_HANDLE)
vkCreateSemaphore(vk->context.device, &sem_info, NULL, &vk->context.swapchain_semaphores[index]); vkCreateSemaphore(vk->context.device, &sem_info,
NULL, &vk->context.swapchain_semaphores[index]);
vkWaitForFences(vk->context.device, 1, &fence, true, UINT64_MAX); vkWaitForFences(vk->context.device, 1, &fence, true, UINT64_MAX);
vkDestroyFence(vk->context.device, fence, NULL); vkDestroyFence(vk->context.device, fence, NULL);
@ -1262,26 +1270,32 @@ static void vulkan_acquire_next_image(gfx_ctx_vulkan_data_t *vk)
} }
} }
static bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk, unsigned width, unsigned height, static bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
unsigned width, unsigned height,
unsigned swap_interval) unsigned swap_interval)
{ {
unsigned i;
uint32_t format_count;
uint32_t desired_swapchain_images;
VkSurfaceCapabilitiesKHR surface_properties; VkSurfaceCapabilitiesKHR surface_properties;
VkSurfaceFormatKHR formats[256]; VkSurfaceFormatKHR formats[256];
VkSurfaceFormatKHR format; VkSurfaceFormatKHR format;
VkExtent2D swapchain_size; VkExtent2D swapchain_size;
VkPresentModeKHR swapchain_present_mode = swap_interval ? VK_PRESENT_MODE_FIFO_KHR : VK_PRESENT_MODE_MAILBOX_KHR;
VkSurfaceTransformFlagBitsKHR pre_transform;
VkSwapchainKHR old_swapchain; VkSwapchainKHR old_swapchain;
VkSurfaceTransformFlagBitsKHR pre_transform;
VkPresentModeKHR swapchain_present_mode = swap_interval
? VK_PRESENT_MODE_FIFO_KHR : VK_PRESENT_MODE_MAILBOX_KHR;
VkSwapchainCreateInfoKHR info = { VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR }; VkSwapchainCreateInfoKHR info = { VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR };
uint32_t format_count;
uint32_t desired_swapchain_images;
unsigned i;
RARCH_LOG("[Wayland/Vulkan]: Creating swapchain with present mode: %u\n", (unsigned)swapchain_present_mode); RARCH_LOG("[Wayland/Vulkan]: Creating swapchain with present mode: %u\n",
(unsigned)swapchain_present_mode);
vk->fpGetPhysicalDeviceSurfaceCapabilitiesKHR(vk->context.gpu, vk->vk_surface, &surface_properties); vk->fpGetPhysicalDeviceSurfaceCapabilitiesKHR(vk->context.gpu,
vk->fpGetPhysicalDeviceSurfaceFormatsKHR(vk->context.gpu, vk->vk_surface, &format_count, NULL); vk->vk_surface, &surface_properties);
vk->fpGetPhysicalDeviceSurfaceFormatsKHR(vk->context.gpu, vk->vk_surface, &format_count, formats); vk->fpGetPhysicalDeviceSurfaceFormatsKHR(vk->context.gpu,
vk->vk_surface, &format_count, NULL);
vk->fpGetPhysicalDeviceSurfaceFormatsKHR(vk->context.gpu,
vk->vk_surface, &format_count, formats);
if (format_count == 1 && formats[0].format == VK_FORMAT_UNDEFINED) if (format_count == 1 && formats[0].format == VK_FORMAT_UNDEFINED)
{ {
@ -1308,10 +1322,12 @@ static bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk, unsigned width, u
swapchain_size = surface_properties.currentExtent; swapchain_size = surface_properties.currentExtent;
desired_swapchain_images = surface_properties.minImageCount + 1; desired_swapchain_images = surface_properties.minImageCount + 1;
if ((surface_properties.maxImageCount > 0) && (desired_swapchain_images > surface_properties.maxImageCount)) if ((surface_properties.maxImageCount > 0)
&& (desired_swapchain_images > surface_properties.maxImageCount))
desired_swapchain_images = surface_properties.maxImageCount; desired_swapchain_images = surface_properties.maxImageCount;
if (surface_properties.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) if (surface_properties.supportedTransforms
& VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
pre_transform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR; pre_transform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
else else
pre_transform = surface_properties.currentTransform; pre_transform = surface_properties.currentTransform;
@ -1378,7 +1394,8 @@ static bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk, unsigned width, u
{ {
if (vk->context.swapchain_fences[i]) if (vk->context.swapchain_fences[i])
{ {
vkDestroyFence(vk->context.device, vk->context.swapchain_fences[i], NULL); vkDestroyFence(vk->context.device,
vk->context.swapchain_fences[i], NULL);
vk->context.swapchain_fences[i] = VK_NULL_HANDLE; vk->context.swapchain_fences[i] = VK_NULL_HANDLE;
} }
} }
@ -1390,18 +1407,20 @@ static bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk, unsigned width, u
static void vulkan_present(gfx_ctx_vulkan_data_t *vk, unsigned index) static void vulkan_present(gfx_ctx_vulkan_data_t *vk, unsigned index)
{ {
VkResult result = VK_SUCCESS, err = VK_SUCCESS; VkResult result = VK_SUCCESS;
VkPresentInfoKHR present = { VK_STRUCTURE_TYPE_PRESENT_INFO_KHR }; VkResult err = VK_SUCCESS;
present.swapchainCount = 1; VkPresentInfoKHR present = { VK_STRUCTURE_TYPE_PRESENT_INFO_KHR };
present.pSwapchains = &vk->swapchain; present.swapchainCount = 1;
present.pImageIndices = &index; present.pSwapchains = &vk->swapchain;
present.pResults = &result; present.pImageIndices = &index;
present.pResults = &result;
present.waitSemaphoreCount = 1; present.waitSemaphoreCount = 1;
present.pWaitSemaphores = &vk->context.swapchain_semaphores[index]; present.pWaitSemaphores = &vk->context.swapchain_semaphores[index];
/* Better hope QueuePresent doesn't block D: */ /* Better hope QueuePresent doesn't block D: */
slock_lock(vk->context.queue_lock); slock_lock(vk->context.queue_lock);
err = vk->fpQueuePresentKHR(vk->context.queue, &present); err = vk->fpQueuePresentKHR(vk->context.queue, &present);
if (err != VK_SUCCESS || result != VK_SUCCESS) if (err != VK_SUCCESS || result != VK_SUCCESS)
{ {
RARCH_LOG("[Wayland/Vulkan]: QueuePresent failed, invalidating swapchain.\n"); RARCH_LOG("[Wayland/Vulkan]: QueuePresent failed, invalidating swapchain.\n");
@ -1446,8 +1465,9 @@ static gfx_ctx_proc_t gfx_ctx_wl_get_proc_address(const char *symbol)
case GFX_CTX_OPENVG_API: case GFX_CTX_OPENVG_API:
#ifdef HAVE_EGL #ifdef HAVE_EGL
return egl_get_proc_address(symbol); return egl_get_proc_address(symbol);
#endif #else
break; break;
#endif
case GFX_CTX_NONE: case GFX_CTX_NONE:
default: default:
break; break;