From fadd4621d6e558f3dbe3b5e0b8d0169d3e9e362f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 15 Feb 2019 15:58:55 +0100 Subject: [PATCH] external: fix compilation of Vulkan headers on 32-bit Windows. --- doc/changelog.dox | 4 ++++ src/MagnumExternal/Vulkan/flextVk.cpp | 2 +- src/MagnumExternal/Vulkan/flextVk.cpp.template | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 08cd5ac15..dca6bff8a 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -54,6 +54,10 @@ See also: recognize also uppercase file extensions (see [mosra/magnum#312](https://github.com/mosra/magnum/pull/312)) +@subsection changelog-latest-bugfixes Bug fixes + +- Fixed compilation of the @ref Vk library on 32-bit Windows + @section changelog-2019-01 2019.01 Released 2019-02-04, tagged as diff --git a/src/MagnumExternal/Vulkan/flextVk.cpp b/src/MagnumExternal/Vulkan/flextVk.cpp index 0ac06a8b5..1ec0b9127 100644 --- a/src/MagnumExternal/Vulkan/flextVk.cpp +++ b/src/MagnumExternal/Vulkan/flextVk.cpp @@ -33,7 +33,7 @@ FlextVkInstance flextVkInstance{}; FlextVkDevice flextVkDevice{}; void flextVkInit() { - flextvkEnumerateInstanceVersion = reinterpret_cast(vkGetInstanceProcAddr(nullptr, "vkEnumerateInstanceVersion")); + flextvkEnumerateInstanceVersion = reinterpret_cast(vkGetInstanceProcAddr(nullptr, "vkEnumerateInstanceVersion")); } void flextVkInitInstance(VkInstance instance, FlextVkInstance* data) { diff --git a/src/MagnumExternal/Vulkan/flextVk.cpp.template b/src/MagnumExternal/Vulkan/flextVk.cpp.template index 837e6d08d..788774106 100644 --- a/src/MagnumExternal/Vulkan/flextVk.cpp.template +++ b/src/MagnumExternal/Vulkan/flextVk.cpp.template @@ -48,7 +48,7 @@ void flextVkInit() { @for f in funcs: @if f.name in ['EnumerateInstanceVersion']: flextvk@f.name = reinterpret_cast<@f.returntype\ -(*)(@f.param_type_list_string())>(vkGetInstanceProcAddr(nullptr, "vk@f.name")); +(VKAPI_PTR*)(@f.param_type_list_string())>(vkGetInstanceProcAddr(nullptr, "vk@f.name")); @end @end @end