Skip to content

Commit c0443c5

Browse files
Update SDL_vulkan.inc to 3.4.4
1 parent 8d54059 commit c0443c5

2 files changed

Lines changed: 10 additions & 14 deletions

File tree

units/SDL3.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ interface
122122
{$I SDL_atomic.inc} // 3.4.4
123123
{$I SDL_hidapi.inc} // 3.4.4
124124
{$I SDL_metal.inc} // 3.4.4
125-
{$I SDL_vulkan.inc} // 3.2.0
125+
{$I SDL_vulkan.inc} // 3.4.4
126126
{$I SDL_thread.inc} // 3.2.0
127127
{$I SDL_process.inc} // 3.2.0
128128
{$I SDL_storage.inc} // 3.2.0

units/SDL_vulkan.inc

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
}
2727

2828
{ #note : SDL3-for-Pascal: The following comment includes the original C code. }
29-
{ Avoid including vulkan.h, don't define VkInstance if it's already included }
29+
{ Avoid including vulkan_core.h, don't define VkInstance if it's already included }
3030
{
31-
#ifdef VULKAN_H_
31+
#ifdef VULKAN_CORE_H_
3232
#define NO_SDL_VULKAN_TYPEDEFS
3333
#endif
3434
#ifndef NO_SDL_VULKAN_TYPEDEFS
3535
#define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;
3636
37-
#if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
37+
#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)
3838
#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef struct object##_T *object;
3939
#else
4040
#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;
@@ -45,31 +45,27 @@
4545
VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)
4646
struct VkAllocationCallbacks;
4747
}
48-
{ #todo : Is there a common compiler flag in the Vulkan bindings for Pascal? Couldn't find any common one. Examine. }
48+
{ #todo : Is there a common compiler flag in the Vulkan bindings for Pascal?
49+
Couldn't find any common one. Examine. }
4950
{$IFDEF VULKAN}
5051
{$DEFINE NO_SDL_VULKAN_TYPEDEFS}
5152
{$ENDIF}
5253
{$IFNDEF NO_SDL_VULKAN_TYPEDEFS}
5354
type
5455
PVkInstance = ^TVkInstance;
5556
TVkInstance = ^TVkInstance_T;
56-
TVkInstance_T = record
57-
end;
57+
TVkInstance_T = Pointer;
5858
PVkPhysicalDevice = ^TVkPhysicalDevice;
5959
TVkPhysicalDevice = ^TVkPhysicalDevice_T;
60-
TVkPhysicalDevice_T = record
61-
end;
60+
TVkPhysicalDevice_T = Pointer;
6261
PVkSurfaceKHR = ^TVkSurfaceKHR;
6362
TVkSurfaceKHR = ^TVkSurfaceKHR_T;
64-
TVkSurfaceKHR_T = record
65-
end;
63+
TVkSurfaceKHR_T = Pointer;
6664
{$ENDIF}
6765
type
6866
PPVkAllocationCallbacks = ^PVkAllocationCallbacks;
6967
PVkAllocationCallbacks = ^TVkAllocationCallbacks;
70-
TVkAllocationCallbacks = record
71-
{undefined structure}
72-
end;
68+
TVkAllocationCallbacks = Pointer; {undefined structure}
7369

7470
{*
7571
* \name Vulkan support functions

0 commit comments

Comments
 (0)