From 25d741e26ac8fea931888493090e9760c4e06ba8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 29 Feb 2016 04:21:08 +0100 Subject: [PATCH] Start setting up more function pointers --- gfx/common/vulkan_common.c | 75 ++++++++++++++++++++++++++------------ gfx/common/vulkan_common.h | 46 +++++++++++++---------- 2 files changed, 78 insertions(+), 43 deletions(-) diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c index f1916ab347..8f126296e4 100644 --- a/gfx/common/vulkan_common.c +++ b/gfx/common/vulkan_common.c @@ -22,25 +22,35 @@ #endif #include +#include #include "vulkan_common.h" #ifdef HAVE_VULKAN +static dylib_t vulkan_library; static VkInstance cached_instance; static VkDevice cached_device; #endif +#define VKSYM(vk, entrypoint) do { \ + vk->fp.vk##entrypoint = (PFN_vk##entrypoint) dylib_proc(vulkan_library, "vk"#entrypoint);\ + if (vk->fp.vk##entrypoint == NULL) { \ + RARCH_ERR("vkGetInstanceProcAddr failed to find vk%s\n", #entrypoint); \ + return false; \ + } \ +} while(0) + #define VK_GET_INSTANCE_PROC_ADDR(vk, inst, entrypoint) do { \ - vk->fp##entrypoint = (PFN_vk##entrypoint) vkGetInstanceProcAddr(inst, "vk"#entrypoint); \ - if (vk->fp##entrypoint == NULL) { \ + vk->fp.vk##entrypoint = (PFN_vk##entrypoint) vkGetInstanceProcAddr(inst, "vk"#entrypoint); \ + if (vk->fp.vk##entrypoint == NULL) { \ RARCH_ERR("vkGetInstanceProcAddr failed to find vk%s\n", #entrypoint); \ return false; \ } \ } while(0) #define VK_GET_DEVICE_PROC_ADDR(vk, dev, entrypoint) do { \ - vk->fp##entrypoint = (PFN_vk##entrypoint) vkGetDeviceProcAddr(dev, "vk" #entrypoint); \ - if (vk->fp##entrypoint == NULL) { \ + vk->fp.vk##entrypoint = (PFN_vk##entrypoint) vkGetDeviceProcAddr(dev, "vk" #entrypoint); \ + if (vk->fp.vk##entrypoint == NULL) { \ RARCH_ERR("vkGetDeviceProcAddr failed to find vk%s\n", #entrypoint); \ return false; \ } \ @@ -990,6 +1000,19 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk, break; } +#ifdef _WIN32 + vulkan_library = dylib_load("vulkan-1.dll"); +#else + vulkan_library = dylib_load("libvulkan.so"); +#endif + + if (!vulkan_library) + return false; + + RARCH_LOG("Vulkan dynamic library loaded.\n"); + + VKSYM(vk, CreateInstance); + app.pApplicationName = "RetroArch"; app.applicationVersion = 0; app.pEngineName = "RetroArch"; @@ -1005,10 +1028,12 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk, vk->context.instance = cached_instance; cached_instance = NULL; } - else if (vkCreateInstance(&info, NULL, &vk->context.instance) != VK_SUCCESS) + else if (vk->fp.vkCreateInstance(&info, NULL, &vk->context.instance) != VK_SUCCESS) return false; - if (vkEnumeratePhysicalDevices(vk->context.instance, + VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, EnumeratePhysicalDevices); + + if (vk->fp.vkEnumeratePhysicalDevices(vk->context.instance, &gpu_count, NULL) != VK_SUCCESS) return false; @@ -1178,7 +1203,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk, surf_info.display = (struct wl_display*)display; surf_info.surface = (struct wl_surface*)surface; - if (vk->fpCreateWaylandSurfaceKHR(vk->context.instance, + if (vk->fp.vkCreateWaylandSurfaceKHR(vk->context.instance, &surf_info, NULL, &vk->vk_surface) != VK_SUCCESS) return false; } @@ -1195,7 +1220,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk, surf_info.flags = 0; surf_info.window = (ANativeWindow*)surface; - if (vk->fpCreateAndroidSurfaceKHR(vk->context.instance, + if (vk->fp.vkCreateAndroidSurfaceKHR(vk->context.instance, &surf_info, NULL, &vk->vk_surface) != VK_SUCCESS) return false; } @@ -1213,7 +1238,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk, surf_info.hinstance = display; surf_info.hwnd = surface; - if (vk->fpCreateWin32SurfaceKHR(vk->context.instance, + if (vk->fp.vkCreateWin32SurfaceKHR(vk->context.instance, &surf_info, NULL, &vk->vk_surface) != VK_SUCCESS) return false; } @@ -1231,7 +1256,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk, surf_info.dpy = (Display*)display; surf_info.window = *(const Window*)surface; - if (vk->fpCreateXlibSurfaceKHR(vk->context.instance, + if (vk->fp.vkCreateXlibSurfaceKHR(vk->context.instance, &surf_info, NULL, &vk->vk_surface) != VK_SUCCESS) return false; @@ -1250,7 +1275,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk, surf_info.connection = XGetXCBConnection((Display*)display); surf_info.window = *(const xcb_window_t*)surface; - if (vk->fpCreateXcbSurfaceKHR(vk->context.instance, + if (vk->fp.vkCreateXcbSurfaceKHR(vk->context.instance, &surf_info, NULL, &vk->vk_surface) != VK_SUCCESS) return false; @@ -1268,7 +1293,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk, surf_info.connection = display; surf_info.mirSurface = surface; - if (vk->fpCreateMirSurfaceKHR(vk->context.instance, + if (vk->fp.vkCreateMirSurfaceKHR(vk->context.instance, &surf_info, NULL, &vk->vk_surface) != VK_SUCCESS) return false; @@ -1301,7 +1326,7 @@ void vulkan_present(gfx_ctx_vulkan_data_t *vk, unsigned index) /* Better hope QueuePresent doesn't block D: */ slock_lock(vk->context.queue_lock); - err = vk->fpQueuePresentKHR(vk->context.queue, &present); + err = vk->fp.vkQueuePresentKHR(vk->context.queue, &present); if (err != VK_SUCCESS || result != VK_SUCCESS) { @@ -1318,11 +1343,11 @@ void vulkan_context_destroy(gfx_ctx_vulkan_data_t *vk, if (vk->context.queue) vkQueueWaitIdle(vk->context.queue); if (vk->swapchain) - vk->fpDestroySwapchainKHR(vk->context.device, + vk->fp.vkDestroySwapchainKHR(vk->context.device, vk->swapchain, NULL); if (destroy_surface && vk->vk_surface != VK_NULL_HANDLE) - vk->fpDestroySurfaceKHR(vk->context.instance, + vk->fp.vkDestroySurfaceKHR(vk->context.instance, vk->vk_surface, NULL); for (i = 0; i < VULKAN_MAX_SWAPCHAIN_IMAGES; i++) @@ -1347,6 +1372,10 @@ void vulkan_context_destroy(gfx_ctx_vulkan_data_t *vk, if (vk->context.instance) vkDestroyInstance(vk->context.instance, NULL); } + + if (vulkan_library) + dylib_close(vulkan_library); + } void vulkan_acquire_next_image(gfx_ctx_vulkan_data_t *vk) @@ -1361,7 +1390,7 @@ void vulkan_acquire_next_image(gfx_ctx_vulkan_data_t *vk) vkCreateFence(vk->context.device, &info, NULL, &fence); - err = vk->fpAcquireNextImageKHR(vk->context.device, + err = vk->fp.vkAcquireNextImageKHR(vk->context.device, vk->swapchain, UINT64_MAX, VK_NULL_HANDLE, fence, &vk->context.current_swapchain_index); @@ -1411,11 +1440,11 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk, RARCH_LOG("[Vulkan]: Creating swapchain with present mode: %u\n", (unsigned)swapchain_present_mode); - vk->fpGetPhysicalDeviceSurfaceCapabilitiesKHR(vk->context.gpu, + vk->fp.vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk->context.gpu, vk->vk_surface, &surface_properties); - vk->fpGetPhysicalDeviceSurfaceFormatsKHR(vk->context.gpu, + vk->fp.vkGetPhysicalDeviceSurfaceFormatsKHR(vk->context.gpu, vk->vk_surface, &format_count, NULL); - vk->fpGetPhysicalDeviceSurfaceFormatsKHR(vk->context.gpu, + vk->fp.vkGetPhysicalDeviceSurfaceFormatsKHR(vk->context.gpu, vk->vk_surface, &format_count, formats); if (format_count == 1 && formats[0].format == VK_FORMAT_UNDEFINED) @@ -1478,9 +1507,9 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk, info.clipped = true; info.oldSwapchain = old_swapchain; - vk->fpCreateSwapchainKHR(vk->context.device, &info, NULL, &vk->swapchain); + vk->fp.vkCreateSwapchainKHR(vk->context.device, &info, NULL, &vk->swapchain); if (old_swapchain != VK_NULL_HANDLE) - vk->fpDestroySwapchainKHR(vk->context.device, old_swapchain, NULL); + vk->fp.vkDestroySwapchainKHR(vk->context.device, old_swapchain, NULL); vk->context.swapchain_width = swapchain_size.width; vk->context.swapchain_height = swapchain_size.height; @@ -1513,9 +1542,9 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk, break; } - vk->fpGetSwapchainImagesKHR(vk->context.device, vk->swapchain, + vk->fp.vkGetSwapchainImagesKHR(vk->context.device, vk->swapchain, &vk->context.num_swapchain_images, NULL); - vk->fpGetSwapchainImagesKHR(vk->context.device, vk->swapchain, + vk->fp.vkGetSwapchainImagesKHR(vk->context.device, vk->swapchain, &vk->context.num_swapchain_images, vk->context.swapchain_images); RARCH_LOG("[Vulkan]: Got %u swapchain images.\n", vk->context.num_swapchain_images); diff --git a/gfx/common/vulkan_common.h b/gfx/common/vulkan_common.h index e98d339f7a..31166a0632 100644 --- a/gfx/common/vulkan_common.h +++ b/gfx/common/vulkan_common.h @@ -158,38 +158,44 @@ typedef struct gfx_ctx_vulkan_data { vulkan_context_t context; - PFN_vkGetPhysicalDeviceSurfaceSupportKHR - fpGetPhysicalDeviceSurfaceSupportKHR; - PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR - fpGetPhysicalDeviceSurfaceCapabilitiesKHR; - PFN_vkGetPhysicalDeviceSurfaceFormatsKHR - fpGetPhysicalDeviceSurfaceFormatsKHR; - PFN_vkGetPhysicalDeviceSurfacePresentModesKHR - fpGetPhysicalDeviceSurfacePresentModesKHR; - PFN_vkCreateSwapchainKHR fpCreateSwapchainKHR; - PFN_vkDestroySwapchainKHR fpDestroySwapchainKHR; - PFN_vkGetSwapchainImagesKHR fpGetSwapchainImagesKHR; - PFN_vkAcquireNextImageKHR fpAcquireNextImageKHR; - PFN_vkQueuePresentKHR fpQueuePresentKHR; + struct + { + PFN_vkCreateInstance vkCreateInstance; + PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices; + PFN_vkGetPhysicalDeviceSurfaceSupportKHR + vkGetPhysicalDeviceSurfaceSupportKHR; + PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR + vkGetPhysicalDeviceSurfaceCapabilitiesKHR; + PFN_vkGetPhysicalDeviceSurfaceFormatsKHR + vkGetPhysicalDeviceSurfaceFormatsKHR; + PFN_vkGetPhysicalDeviceSurfacePresentModesKHR + vkGetPhysicalDeviceSurfacePresentModesKHR; + PFN_vkCreateSwapchainKHR vkCreateSwapchainKHR; + PFN_vkDestroySwapchainKHR vkDestroySwapchainKHR; + PFN_vkGetSwapchainImagesKHR vkGetSwapchainImagesKHR; + PFN_vkAcquireNextImageKHR vkAcquireNextImageKHR; + PFN_vkQueuePresentKHR vkQueuePresentKHR; #ifdef _WIN32 - PFN_vkCreateWin32SurfaceKHR fpCreateWin32SurfaceKHR; + PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR; #endif #ifdef HAVE_XCB - PFN_vkCreateXcbSurfaceKHR fpCreateXcbSurfaceKHR; + PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR; #endif #ifdef HAVE_XLIB - PFN_vkCreateXlibSurfaceKHR fpCreateXlibSurfaceKHR; + PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR; #endif #ifdef ANDROID - PFN_vkCreateAndroidSurfaceKHR fpCreateAndroidSurfaceKHR; + PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR; #endif #ifdef HAVE_WAYLAND - PFN_vkCreateWaylandSurfaceKHR fpCreateWaylandSurfaceKHR; + PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR; #endif #ifdef HAVE_MIR - FN_vkCreateMirSurfaceKHR fpCreateMirSurfaceKHR; + PFN_vkCreateMirSurfaceKHR vkCreateMirSurfaceKHR; #endif - PFN_vkDestroySurfaceKHR fpDestroySurfaceKHR; + PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR; + } fp; + VkSurfaceKHR vk_surface; VkSwapchainKHR swapchain;