mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-19 12:41:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor vulkan_surface_create

Browse Source
This commit is contained in:
twinaphex 2016-02-19 12:23:16 +01:00
parent db074e1c1a
commit cebefa6ae1
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/common/vulkan_common.h
View File

@ -46,6 +46,7 @@ enum vulkan_wsi_type
VULKAN_WSI_WAYLAND,
VULKAN_WSI_ANDROID,
VULKAN_WSI_WIN32,
VULKAN_WSI_XCB,
VULKAN_WSI_XLIB
};

35
gfx/drivers_context/wayland_ctx.c
View File

@ -954,18 +954,12 @@ static bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk,
surf_info.display = (struct wl_display*)display;
surf_info.surface = (struct wl_surface*)surface;
vk->fpCreateWaylandSurfaceKHR(vk->context.instance,
&surf_info, NULL, &vk->vk_surface);
if (!vulkan_create_swapchain(
vk, width, height, swap_interval))
if (vk->fpCreateWaylandSurfaceKHR(vk->context.instance,
&surf_info, NULL, &vk->vk_surface) != VK_SUCCESS)
return false;
}
return true;
#else
break;
#endif
break;
case VULKAN_WSI_ANDROID:
#ifdef ANDROID
{
@ -980,15 +974,9 @@ static bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk,
if (vk->fpCreateAndroidSurfaceKHR(vk->context.instance,
&surf_info, NULL, &vk->vk_surface) != VK_SUCCESS)
return false;
if (!vulkan_create_swapchain(
vk, width, height, swap_interval))
return false;
}
return true;
#else
break;
#endif
break;
case VULKAN_WSI_WIN32:
#ifdef _WIN32
{
@ -1004,20 +992,19 @@ static bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk,
if (vk->fpCreateWin32SurfaceKHR(vk->context.instance,
&surf_info, NULL, &vk->vk_surface) != VK_SUCCESS)
return false;
if (!vulkan_create_swapchain(
vk, width, height, swap_interval))
return false;
}
#else
break;
#endif
break;
case VULKAN_WSI_NONE:
default:
break;
return false;
}
return false;
if (!vulkan_create_swapchain(
vk, width, height, swap_interval))
return false;
return true;
}
#endif