Skip to content

Commit c5b1341

Browse files
authored
Tweak Vulkan include guard check and 64-bit platform defines (#13210)
1 parent e18a631 commit c5b1341

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

include/SDL3/SDL_vulkan.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@
5151
extern "C" {
5252
#endif
5353

54-
/* Avoid including vulkan.h, don't define VkInstance if it's already included */
55-
#ifdef VULKAN_H_
54+
/* Avoid including vulkan_core.h, don't define VkInstance if it's already included */
55+
#ifdef VULKAN_CORE_H_
5656
#define NO_SDL_VULKAN_TYPEDEFS
5757
#endif
5858
#ifndef NO_SDL_VULKAN_TYPEDEFS
5959
#define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;
6060

61-
#if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
61+
#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) || (defined(__riscv) && __riscv_xlen == 64)
6262
#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef struct object##_T *object;
6363
#else
6464
#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;

0 commit comments

Comments
 (0)