ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2016-02-19 10:54:00 +01:00
parent 1165d1c0b7
commit 50a605e9db
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gfx/drivers_context/wayland_ctx.c
View File

@ -50,20 +50,20 @@ static volatile sig_atomic_t g_quit = 0;
static VkInstance cached_instance; static VkInstance cached_instance;
static VkDevice cached_device; static VkDevice cached_device;
#define GET_INSTANCE_PROC_ADDR(inst, entrypoint) do { \ #define VK_GET_INSTANCE_PROC_ADDR(vk, inst, entrypoint) do { \
wl->vk.fp##entrypoint = (PFN_vk##entrypoint) vkGetInstanceProcAddr(inst, "vk"#entrypoint); \ vk.fp##entrypoint = (PFN_vk##entrypoint) vkGetInstanceProcAddr(inst, "vk"#entrypoint); \
if (wl->vk.fp##entrypoint == NULL) { \ if (vk.fp##entrypoint == NULL) { \
RARCH_ERR("vkGetInstanceProcAddr failed to find vk%s\n", #entrypoint); \ RARCH_ERR("vkGetInstanceProcAddr failed to find vk%s\n", #entrypoint); \
goto error; \ goto error; \
} \ } \
} while(0) } while(0)
#define GET_DEVICE_PROC_ADDR(dev, entrypoint) do { \ #define VK_GET_DEVICE_PROC_ADDR(vk, dev, entrypoint) do { \
wl->vk.fp##entrypoint = (PFN_vk##entrypoint) vkGetDeviceProcAddr(dev, "vk" #entrypoint); \ vk.fp##entrypoint = (PFN_vk##entrypoint) vkGetDeviceProcAddr(dev, "vk" #entrypoint); \
if (wl->vk.fp##entrypoint == NULL) { \ if (vk.fp##entrypoint == NULL) { \
RARCH_ERR("vkGetDeviceProcAddr failed to find vk%s\n", #entrypoint); \ RARCH_ERR("vkGetDeviceProcAddr failed to find vk%s\n", #entrypoint); \
goto error; \ goto error; \
} \ } \
} while(0) } while(0)
#endif #endif
@ -642,13 +642,13 @@ static void *gfx_ctx_wl_init(void *video_driver)
app.apiVersion = VK_API_VERSION; app.apiVersion = VK_API_VERSION;
info.pApplicationInfo = &app; info.pApplicationInfo = &app;
info.enabledExtensionCount = ARRAY_SIZE(instance_extensions); info.enabledExtensionCount = ARRAY_SIZE(instance_extensions);
info.ppEnabledExtensionNames = instance_extensions; info.ppEnabledExtensionNames = instance_extensions;
if (cached_instance) if (cached_instance)
{ {
wl->vk.context.instance = cached_instance; wl->vk.context.instance = cached_instance;
cached_instance = NULL; cached_instance = NULL;
} }
else if (vkCreateInstance(&info, NULL, &wl->vk.context.instance) != VK_SUCCESS) else if (vkCreateInstance(&info, NULL, &wl->vk.context.instance) != VK_SUCCESS)
goto error; goto error;
@ -712,17 +712,17 @@ static void *gfx_ctx_wl_init(void *video_driver)
vkGetDeviceQueue(wl->vk.context.device, vkGetDeviceQueue(wl->vk.context.device,
wl->vk.context.graphics_queue_index, 0, &wl->vk.context.queue); wl->vk.context.graphics_queue_index, 0, &wl->vk.context.queue);
GET_INSTANCE_PROC_ADDR(wl->vk.context.instance, GetPhysicalDeviceSurfaceSupportKHR); VK_GET_INSTANCE_PROC_ADDR(wl->vk, wl->vk.context.instance, GetPhysicalDeviceSurfaceSupportKHR);
GET_INSTANCE_PROC_ADDR(wl->vk.context.instance, GetPhysicalDeviceSurfaceCapabilitiesKHR); VK_GET_INSTANCE_PROC_ADDR(wl->vk, wl->vk.context.instance, GetPhysicalDeviceSurfaceCapabilitiesKHR);
GET_INSTANCE_PROC_ADDR(wl->vk.context.instance, GetPhysicalDeviceSurfaceFormatsKHR); VK_GET_INSTANCE_PROC_ADDR(wl->vk, wl->vk.context.instance, GetPhysicalDeviceSurfaceFormatsKHR);
GET_INSTANCE_PROC_ADDR(wl->vk.context.instance, GetPhysicalDeviceSurfacePresentModesKHR); VK_GET_INSTANCE_PROC_ADDR(wl->vk, wl->vk.context.instance, GetPhysicalDeviceSurfacePresentModesKHR);
GET_INSTANCE_PROC_ADDR(wl->vk.context.instance, CreateWaylandSurfaceKHR); VK_GET_INSTANCE_PROC_ADDR(wl->vk, wl->vk.context.instance, CreateWaylandSurfaceKHR);
GET_INSTANCE_PROC_ADDR(wl->vk.context.instance, DestroySurfaceKHR); VK_GET_INSTANCE_PROC_ADDR(wl->vk, wl->vk.context.instance, DestroySurfaceKHR);
GET_DEVICE_PROC_ADDR(wl->vk.context.device, CreateSwapchainKHR); VK_GET_DEVICE_PROC_ADDR(wl->vk, wl->vk.context.device, CreateSwapchainKHR);
GET_DEVICE_PROC_ADDR(wl->vk.context.device, DestroySwapchainKHR); VK_GET_DEVICE_PROC_ADDR(wl->vk, wl->vk.context.device, DestroySwapchainKHR);
GET_DEVICE_PROC_ADDR(wl->vk.context.device, GetSwapchainImagesKHR); VK_GET_DEVICE_PROC_ADDR(wl->vk, wl->vk.context.device, GetSwapchainImagesKHR);
GET_DEVICE_PROC_ADDR(wl->vk.context.device, AcquireNextImageKHR); VK_GET_DEVICE_PROC_ADDR(wl->vk, wl->vk.context.device, AcquireNextImageKHR);
GET_DEVICE_PROC_ADDR(wl->vk.context.device, QueuePresentKHR); VK_GET_DEVICE_PROC_ADDR(wl->vk, wl->vk.context.device, QueuePresentKHR);
wl->vk.context.queue_lock = slock_new(); wl->vk.context.queue_lock = slock_new();
if (!wl->vk.context.queue_lock) if (!wl->vk.context.queue_lock)