(Vulkan) Go through funcptr for vkDestroyInstance

This commit is contained in:
twinaphex 2016-02-29 21:27:18 +01:00
parent c62971042d
commit a1c8a47665
2 changed files with 6 additions and 2 deletions

View File

@ -1083,6 +1083,7 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
RARCH_LOG("Vulkan dynamic library loaded.\n"); RARCH_LOG("Vulkan dynamic library loaded.\n");
VKSYM(vk, CreateInstance); VKSYM(vk, CreateInstance);
VKSYM(vk, DestroyInstance);
app.pApplicationName = "RetroArch"; app.pApplicationName = "RetroArch";
app.applicationVersion = 0; app.applicationVersion = 0;
@ -1526,7 +1527,7 @@ void vulkan_context_destroy(gfx_ctx_vulkan_data_t *vk,
if (vk->context.device) if (vk->context.device)
VKFUNC(vkDestroyDevice)(vk->context.device, NULL); VKFUNC(vkDestroyDevice)(vk->context.device, NULL);
if (vk->context.instance) if (vk->context.instance)
vkDestroyInstance(vk->context.instance, NULL); VKFUNC(vkDestroyInstance)(vk->context.instance, NULL);
} }
if (vulkan_library) if (vulkan_library)

View File

@ -133,6 +133,10 @@ typedef struct vulkan_context
{ {
struct vulkan_context_fp struct vulkan_context_fp
{ {
/* Instance */
PFN_vkCreateInstance vkCreateInstance;
PFN_vkDestroyInstance vkDestroyInstance;
/* Fences */ /* Fences */
PFN_vkCreateFence vkCreateFence; PFN_vkCreateFence vkCreateFence;
PFN_vkDestroyFence vkDestroyFence; PFN_vkDestroyFence vkDestroyFence;
@ -196,7 +200,6 @@ typedef struct vulkan_context
/* Fixed-function vertex postprocessing */ /* Fixed-function vertex postprocessing */
PFN_vkCmdSetViewport vkCmdSetViewport; PFN_vkCmdSetViewport vkCmdSetViewport;
PFN_vkCreateInstance vkCreateInstance;
PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties; PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties;
PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices; PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices;
PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties; PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;