From 60505613233bcf3b52760a1253093e2fda2221a9 Mon Sep 17 00:00:00 2001 From: Mark Young Date: Wed, 27 Jan 2016 12:51:00 -0700 Subject: [PATCH] loader: Fix 32-bit loader exception when layers enabled for Vulkan apps. The loader_create_device_terminator had an incorrect calling convention. This caused the ESP pointer to not get properly restored after the function was called by a 32-bit application. --- loader/loader.c | 2 +- loader/loader.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/loader.c b/loader/loader.c index 9040f3f..1b8fe21 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2987,7 +2987,7 @@ static VkResult loader_enable_device_layers( return err; } -VkResult loader_create_device_terminator( +VKAPI_ATTR VkResult VKAPI_CALL loader_create_device_terminator( VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, diff --git a/loader/loader.h b/loader/loader.h index 6dcc5de..4f253ef 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -427,7 +427,7 @@ VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceMemoryProperties ( VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties * pProperties); -VkResult loader_create_device_terminator( +VKAPI_ATTR VkResult VKAPI_CALL loader_create_device_terminator( VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, -- 2.7.4