qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-19 07:20:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Fix compiling on 32-bit systems

Browse source 
Casting between ints and pointers can be awkward.
This commit is contained in:
Bill Currie 2021-07-06 11:53:17 +09:00
parent e81d690b51
commit 490cf966f9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/Vulkan/debug.h
View file

@ -1,7 +1,7 @@
#ifndef __QF_Vulkan_debug_h #ifndef __QF_Vulkan_debug_h
#define __QF_Vulkan_debug_h #define __QF_Vulkan_debug_h
#if defined(_WIN32) && !defined(_WIN64) #if (defined(_WIN32) && !defined(_WIN64)) || (__WORDSIZE < 64)
#define QFV_duCmdBeginLabel(device, cmd, name...) #define QFV_duCmdBeginLabel(device, cmd, name...)
#define QFV_duCmdEndLabel(device, cmd) #define QFV_duCmdEndLabel(device, cmd)
#define QFV_duCmdInsertLabel(device, cmd, name...) #define QFV_duCmdInsertLabel(device, cmd, name...)

8
libs/video/renderer/vulkan/test/test-staging.c
View file

@ -77,7 +77,7 @@ vkWaitForFences (VkDevice device, uint32_t fenceCount, const VkFence *fences,
VkBool32 waitAll, uint64_t timeout) VkBool32 waitAll, uint64_t timeout)
{ {
for (uint32_t i = 0; i < fenceCount; i++) { for (uint32_t i = 0; i < fenceCount; i++) {
int *f = (int *)fences[i]; int *f = (int *) (intptr_t) fences[i];
if (*f) { if (*f) {
wait_count++; wait_count++;
} }
@ -90,7 +90,7 @@ static VkResult
vkResetFences (VkDevice device, uint32_t fenceCount, const VkFence *fences) vkResetFences (VkDevice device, uint32_t fenceCount, const VkFence *fences)
{ {
for (uint32_t i = 0; i < fenceCount; i++) { for (uint32_t i = 0; i < fenceCount; i++) {
int *f = (int *)fences[i]; int *f = (int *) (intptr_t) fences[i];
*f = 0; *f = 0;
} }
return VK_SUCCESS; return VK_SUCCESS;
@ -99,7 +99,7 @@ vkResetFences (VkDevice device, uint32_t fenceCount, const VkFence *fences)
static VkResult static VkResult
vkGetFenceStatus (VkDevice device, VkFence fence) vkGetFenceStatus (VkDevice device, VkFence fence)
{ {
int *f = (int *)fence; int *f = (int *) (intptr_t) fence;
return *f ? VK_SUCCESS : VK_NOT_READY; return *f ? VK_SUCCESS : VK_NOT_READY;
} }
@ -133,7 +133,7 @@ static VkResult
vkQueueSubmit (VkQueue queue, uint32_t count, const VkSubmitInfo *submits, vkQueueSubmit (VkQueue queue, uint32_t count, const VkSubmitInfo *submits,
VkFence fence) VkFence fence)
{ {
int *f = (int *)fence; int *f = (int *) (intptr_t) fence;
*f = 1; *f = 1;
return VK_SUCCESS; return VK_SUCCESS;
} }