Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 23:25:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

steam_helper, vrclient, openxr: Use Unix ABI for winevulkan unwrappers.

Browse Source 
CW-Bug-Id: #23180
This commit is contained in:
Paul Gofman 2023-12-28 16:51:10 -06:00 committed by Arkadiusz Hiler
parent 9e6011147d
commit ff94f04eca
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
steam_helper/steam.cpp
View File

@ -654,7 +654,7 @@ static void parse_extensions(const char *in, uint32_t *out_count,
extern "C" extern "C"
{ {
VkPhysicalDevice WINAPI __wine_get_native_VkPhysicalDevice(VkPhysicalDevice phys_dev); VkPhysicalDevice __wine_get_native_VkPhysicalDevice(VkPhysicalDevice phys_dev);
}; };
static void *get_winevulkan_unix_lib_handle(HMODULE hvulkan) static void *get_winevulkan_unix_lib_handle(HMODULE hvulkan)

10
vrclient_x64/unix_private.h
View File

@ -16,11 +16,11 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
extern VkDevice_T *(WINAPI *p_get_native_VkDevice)( VkDevice_T * ); extern VkDevice_T *(*p_get_native_VkDevice)( VkDevice_T * );
extern VkInstance_T *(WINAPI *p_get_native_VkInstance)( VkInstance_T * ); extern VkInstance_T *(*p_get_native_VkInstance)( VkInstance_T * );
extern VkPhysicalDevice_T *(WINAPI *p_get_native_VkPhysicalDevice)( VkPhysicalDevice_T * ); extern VkPhysicalDevice_T *(*p_get_native_VkPhysicalDevice)( VkPhysicalDevice_T * );
extern VkPhysicalDevice_T *(WINAPI *p_get_wrapped_VkPhysicalDevice)( VkInstance_T *, VkPhysicalDevice_T * ); extern VkPhysicalDevice_T *(*p_get_wrapped_VkPhysicalDevice)( VkInstance_T *, VkPhysicalDevice_T * );
extern VkQueue_T *(WINAPI *p_get_native_VkQueue)( VkQueue_T * ); extern VkQueue_T *(*p_get_native_VkQueue)( VkQueue_T * );
extern char *json_convert_startup_info(const char *startup_info); extern char *json_convert_startup_info(const char *startup_info);
extern char *json_convert_paths(const char *input); extern char *json_convert_paths(const char *input);

10
vrclient_x64/unixlib.cpp
View File

@ -12,11 +12,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
static void *(*p_HmdSystemFactory)( const char *name, int *return_code ); static void *(*p_HmdSystemFactory)( const char *name, int *return_code );
static void *(*p_VRClientCoreFactory)( const char *name, int *return_code ); static void *(*p_VRClientCoreFactory)( const char *name, int *return_code );
VkDevice_T *(WINAPI *p_get_native_VkDevice)( VkDevice_T * ); VkDevice_T *(*p_get_native_VkDevice)( VkDevice_T * );
VkInstance_T *(WINAPI *p_get_native_VkInstance)( VkInstance_T * ); VkInstance_T *(*p_get_native_VkInstance)( VkInstance_T * );
VkPhysicalDevice_T *(WINAPI *p_get_native_VkPhysicalDevice)( VkPhysicalDevice_T * ); VkPhysicalDevice_T *(*p_get_native_VkPhysicalDevice)( VkPhysicalDevice_T * );
VkPhysicalDevice_T *(WINAPI *p_get_wrapped_VkPhysicalDevice)( VkInstance_T *, VkPhysicalDevice_T * ); VkPhysicalDevice_T *(*p_get_wrapped_VkPhysicalDevice)( VkInstance_T *, VkPhysicalDevice_T * );
VkQueue_T *(WINAPI *p_get_native_VkQueue)( VkQueue_T * ); VkQueue_T *(*p_get_native_VkQueue)( VkQueue_T * );
static void *get_winevulkan_unixlib( HMODULE winevulkan ) static void *get_winevulkan_unixlib( HMODULE winevulkan )
{ {

10
wineopenxr/openxr.c
View File

@ -83,11 +83,11 @@ static char *wineopenxr_strdup(const char *src)
return r; return r;
} }
VkDevice(WINAPI *get_native_VkDevice)(VkDevice); VkDevice(*get_native_VkDevice)(VkDevice);
VkInstance(WINAPI *get_native_VkInstance)(VkInstance); VkInstance(*get_native_VkInstance)(VkInstance);
VkPhysicalDevice(WINAPI *get_native_VkPhysicalDevice)(VkPhysicalDevice); VkPhysicalDevice(*get_native_VkPhysicalDevice)(VkPhysicalDevice);
VkPhysicalDevice(WINAPI *get_wrapped_VkPhysicalDevice)(VkInstance, VkPhysicalDevice); VkPhysicalDevice(*get_wrapped_VkPhysicalDevice)(VkInstance, VkPhysicalDevice);
VkQueue(WINAPI *get_native_VkQueue)(VkQueue); VkQueue(*get_native_VkQueue)(VkQueue);
VkResult (WINAPI *p_wine_vkCreateInstance)(const VkInstanceCreateInfo *create_info, VkResult (WINAPI *p_wine_vkCreateInstance)(const VkInstanceCreateInfo *create_info,
const VkAllocationCallbacks *allocator, VkInstance *ret); const VkAllocationCallbacks *allocator, VkInstance *ret);
VkResult (WINAPI *p_wine_vkCreateDevice)(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info, VkResult (WINAPI *p_wine_vkCreateDevice)(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info,

10
wineopenxr/openxr_private.h
View File

@ -122,9 +122,9 @@ extern XrResult WINAPI wine_xrGetD3D11GraphicsRequirementsKHR(XrInstance instanc
extern XrResult WINAPI wine_xrGetD3D12GraphicsRequirementsKHR(XrInstance instance, extern XrResult WINAPI wine_xrGetD3D12GraphicsRequirementsKHR(XrInstance instance,
XrSystemId systemId, XrGraphicsRequirementsD3D12KHR *graphicsRequirements); XrSystemId systemId, XrGraphicsRequirementsD3D12KHR *graphicsRequirements);
extern VkDevice (WINAPI *get_native_VkDevice)(VkDevice); extern VkDevice (*get_native_VkDevice)(VkDevice);
extern VkInstance (WINAPI *get_native_VkInstance)(VkInstance); extern VkInstance (*get_native_VkInstance)(VkInstance);
extern VkPhysicalDevice (WINAPI *get_native_VkPhysicalDevice)(VkPhysicalDevice); extern VkPhysicalDevice (*get_native_VkPhysicalDevice)(VkPhysicalDevice);
extern VkPhysicalDevice (WINAPI *get_wrapped_VkPhysicalDevice)(VkInstance, VkPhysicalDevice); extern VkPhysicalDevice (*get_wrapped_VkPhysicalDevice)(VkInstance, VkPhysicalDevice);
extern VkQueue (WINAPI *get_native_VkQueue)(VkQueue); extern VkQueue (*get_native_VkQueue)(VkQueue);
extern XrResult load_host_openxr_loader(void); extern XrResult load_host_openxr_loader(void);