mirror of
https://github.com/ptitSeb/box64.git
synced 2026-11-08 10:10:25 -10:00
[WRAPPER] Add/Fix SDL_Vulkan_GetVkGetInstanceProcAddr wrapped function from SDL2/SDL3 to use bridge2
This commit is contained in:
1 parent
05b1086f09
commit
c7bc293292
5 files changed
+17
-6
No files matched your search
@@ -4060,8 +4060,6 @@
|
||||
#() iFEpuvvppp -> iFEpuppp
|
||||
wrappedalure:
|
||||
wrappedalut:
|
||||
wrappedandroidshmem:
|
||||
wrappedandroidsupport:
|
||||
wrappedanl:
|
||||
wrappedatk:
|
||||
- vFp:
|
||||
@@ -5173,7 +5171,6 @@ wrappedgtkx112:
|
||||
- pFpipppppppi:
|
||||
- gtk_toolbar_insert_element
|
||||
wrappedharfbuzzsubset:
|
||||
wrappediconv:
|
||||
wrappedicui18n64:
|
||||
wrappedicui18n66:
|
||||
wrappedicui18n67:
|
||||
@@ -6968,6 +6965,8 @@ wrappedsdl2ttf:
|
||||
- pFpiii:
|
||||
- TTF_OpenFontIndexRW
|
||||
wrappedsdl3:
|
||||
- pFv:
|
||||
- SDL_Vulkan_GetVkGetInstanceProcAddr
|
||||
- pFp:
|
||||
- SDL_GL_GetProcAddress
|
||||
wrappedsdl3ttf:
|
||||
@@ -7063,7 +7062,6 @@ wrappedtcmallocminimal:
|
||||
- pFpLiiil:
|
||||
- mmap
|
||||
- mmap64
|
||||
wrappedtermuxexec:
|
||||
wrappedudev0:
|
||||
wrappedudev1:
|
||||
- vFpp:
|
||||
|
||||
@@ -11,9 +11,11 @@
|
||||
#define ADDED_FUNCTIONS()
|
||||
#endif
|
||||
|
||||
typedef void* (*pFv_t)(void);
|
||||
typedef void* (*pFp_t)(void*);
|
||||
|
||||
#define SUPER() ADDED_FUNCTIONS() \
|
||||
GO(SDL_Vulkan_GetVkGetInstanceProcAddr, pFv_t) \
|
||||
GO(SDL_GL_GetProcAddress, pFp_t)
|
||||
|
||||
#endif // __wrappedsdl3TYPES_H_
|
||||
@@ -840,7 +840,7 @@ EXPORT void* my2_SDL_Vulkan_GetVkGetInstanceProcAddr(x64emu_t* emu)
|
||||
emu->context->vkprocaddress = (vkprocaddess_t)my->SDL_Vulkan_GetVkGetInstanceProcAddr();
|
||||
|
||||
if(emu->context->vkprocaddress)
|
||||
return (void*)AddCheckBridge(my_lib->w.bridge, pFEpp, my_vkGetInstanceProcAddr, 0, "vkGetInstanceProcAddr");
|
||||
return (void*)AddCheckBridge2(my_lib->w.bridge, pFEpp, my_vkGetInstanceProcAddr,my->SDL_Vulkan_GetVkGetInstanceProcAddr, 0, "vkGetInstanceProcAddr");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -46,6 +46,17 @@ EXPORT void* my3_SDL_GL_GetProcAddress(x64emu_t* emu, void* name)
|
||||
return getGLProcAddress(emu, NULL, (glprocaddress_t)my->SDL_GL_GetProcAddress, rname);
|
||||
}
|
||||
|
||||
void* my_vkGetInstanceProcAddr(x64emu_t* emu, void* device, void* name);
|
||||
EXPORT void* my3_SDL_Vulkan_GetVkGetInstanceProcAddr(x64emu_t* emu)
|
||||
{
|
||||
if(!emu->context->vkprocaddress)
|
||||
emu->context->vkprocaddress = (vkprocaddess_t)my->SDL_Vulkan_GetVkGetInstanceProcAddr();
|
||||
|
||||
if(emu->context->vkprocaddress)
|
||||
return (void*)AddCheckBridge2(my_lib->w.bridge, pFEpp, my_vkGetInstanceProcAddr, my->SDL_Vulkan_GetVkGetInstanceProcAddr, 0, "vkGetInstanceProcAddr");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#undef HAS_MY
|
||||
|
||||
#define ALTMY my3_
|
||||
|
||||
@@ -1219,7 +1219,7 @@ GO(SDL_Vulkan_CreateSurface, iFpppp)
|
||||
GO(SDL_Vulkan_DestroySurface, vFppp)
|
||||
GO(SDL_Vulkan_GetInstanceExtensions, pFp)
|
||||
GO(SDL_Vulkan_GetPresentationSupport, iFppu)
|
||||
//GOM(SDL_Vulkan_GetVkGetInstanceProcAddr, pFEv)
|
||||
GOM(SDL_Vulkan_GetVkGetInstanceProcAddr, pFEv)
|
||||
GO(SDL_Vulkan_LoadLibrary, iFp)
|
||||
GO(SDL_Vulkan_UnloadLibrary, vFv)
|
||||
GO(SDL_WaitAndAcquireGPUSwapchainTexture, iFppppp)
|
||||
|
||||
Reference in new issue
Block a user