RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vulkan: fix build error for 32bit builds with clang 

vk->surface is a handle and not a pointer, so assign VK_NULL_HANDLE.
This fixes the following build error on 32bit Windows when using clang for example,
which errors out when assigning a 32bit pointer to a 64bit integer:

  ../mpv-0.35.0/video/out/vulkan/utils.c:37:21:
    error: incompatible pointer to integer conversion assigning to 'VkSurfaceKHR' (aka 'unsigned long long') from 'void *' [-Wint-conversion]
          vk->surface = NULL;
                      ^ ~~~~
This commit is contained in:
Christoph Reiter 2023-01-08 15:41:25 +01:00 committed by sfan5
parent 8a0fa62b58
commit 96773f39e1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/vulkan/utils.c
View File

@ -34,7 +34,7 @@ void mpvk_uninit(struct mpvk_ctx *vk)
if (vk->surface) { if (vk->surface) {
assert(vk->vkinst); assert(vk->vkinst);
vkDestroySurfaceKHR(vk->vkinst->instance, vk->surface, NULL); vkDestroySurfaceKHR(vk->vkinst->instance, vk->surface, NULL);
vk->surface = NULL; vk->surface = VK_NULL_HANDLE;
} }
pl_vk_inst_destroy(&vk->vkinst); pl_vk_inst_destroy(&vk->vkinst);