Browse Source

external: fix compilation of Vulkan headers on 32-bit Windows.

pull/317/head
Vladimír Vondruš 7 years ago
parent
commit
fadd4621d6
  1. 4
      doc/changelog.dox
  2. 2
      src/MagnumExternal/Vulkan/flextVk.cpp
  3. 2
      src/MagnumExternal/Vulkan/flextVk.cpp.template

4
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

2
src/MagnumExternal/Vulkan/flextVk.cpp vendored

@ -33,7 +33,7 @@ FlextVkInstance flextVkInstance{};
FlextVkDevice flextVkDevice{};
void flextVkInit() {
flextvkEnumerateInstanceVersion = reinterpret_cast<VkResult(*)(uint32_t*)>(vkGetInstanceProcAddr(nullptr, "vkEnumerateInstanceVersion"));
flextvkEnumerateInstanceVersion = reinterpret_cast<VkResult(VKAPI_PTR*)(uint32_t*)>(vkGetInstanceProcAddr(nullptr, "vkEnumerateInstanceVersion"));
}
void flextVkInitInstance(VkInstance instance, FlextVkInstance* data) {

2
src/MagnumExternal/Vulkan/flextVk.cpp.template vendored

@ -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

Loading…
Cancel
Save