From 2b89393e55dd3ad39ce24a28b340a86f6a21e129 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 23 Jan 2016 11:16:41 +0100 Subject: [PATCH] Proper fix for 32-bit compilation, no cast needed on debug callback --- renderdoc/driver/vulkan/vk_core.h | 2 +- renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h index 94d4aeef4..bb0e2d42c 100644 --- a/renderdoc/driver/vulkan/vk_core.h +++ b/renderdoc/driver/vulkan/vk_core.h @@ -511,7 +511,7 @@ private: const char* pLayerPrefix, const char* pMessage); - static VkBool32 DebugCallbackStatic( + static VkBool32 VKAPI_PTR DebugCallbackStatic( VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 2892946cb..a2ed6eee9 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -117,7 +117,7 @@ void WrappedVulkan::Initialise(VkInitParams ¶ms) VkDebugReportCallbackCreateInfoEXT debugInfo = {}; debugInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; debugInfo.pNext = NULL; - debugInfo.pfnCallback = (PFN_vkDebugReportCallbackEXT)&DebugCallbackStatic; + debugInfo.pfnCallback = &DebugCallbackStatic; debugInfo.pUserData = this; debugInfo.flags = VK_DEBUG_REPORT_WARN_BIT_EXT|VK_DEBUG_REPORT_PERF_WARN_BIT_EXT|VK_DEBUG_REPORT_ERROR_BIT_EXT;