From 13fa4c9b1355dab0456def6e8e5c0205e58b7c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Mon, 2 Oct 2023 21:54:59 +0200 Subject: [PATCH] vrclient: Remove now unused PE-side unwrappers. CW-Bug-Id: #22729 --- vrclient_x64/vrclient_x64/unixlib.h | 6 ---- vrclient_x64/vrclient_x64/vrclient_main.c | 30 -------------------- vrclient_x64/vrclient_x64/vrclient_private.h | 6 ---- 3 files changed, 42 deletions(-) diff --git a/vrclient_x64/vrclient_x64/unixlib.h b/vrclient_x64/vrclient_x64/unixlib.h index 258cbb6a..319290e5 100644 --- a/vrclient_x64/vrclient_x64/unixlib.h +++ b/vrclient_x64/vrclient_x64/unixlib.h @@ -49,12 +49,6 @@ struct vrclient_init_params char *unix_path; }; -extern VkDevice_T *(WINAPI *p_get_native_VkDevice)( VkDevice_T * ); -extern VkInstance_T *(WINAPI *p_get_native_VkInstance)( VkInstance_T * ); -extern VkPhysicalDevice_T *(WINAPI *p_get_native_VkPhysicalDevice)( VkPhysicalDevice_T * ); -extern VkPhysicalDevice_T *(WINAPI *p_get_wrapped_VkPhysicalDevice)( VkInstance_T *, VkPhysicalDevice_T * ); -extern VkQueue_T *(WINAPI *p_get_native_VkQueue)( VkQueue_T * ); - extern bool unix_vrclient_init( struct vrclient_init_params *params ); extern void *unix_HmdSystemFactory( const char *name, int *return_code ); extern void *unix_VRClientCoreFactory( const char *name, int *return_code ); diff --git a/vrclient_x64/vrclient_x64/vrclient_main.c b/vrclient_x64/vrclient_x64/vrclient_main.c index 9818ebfb..dd09678e 100644 --- a/vrclient_x64/vrclient_x64/vrclient_main.c +++ b/vrclient_x64/vrclient_x64/vrclient_main.c @@ -280,36 +280,6 @@ void *CDECL VRClientCoreFactory(const char *name, int *return_code) return create_win_interface( name, unix_VRClientCoreFactory( name, return_code ) ); } -VkDevice_T *get_native_VkDevice( VkDevice_T *device ) -{ - load_vrclient(); - return p_get_native_VkDevice( device ); -} - -VkInstance_T *get_native_VkInstance( VkInstance_T *instance ) -{ - load_vrclient(); - return p_get_native_VkInstance( instance ); -} - -VkPhysicalDevice_T *get_native_VkPhysicalDevice( VkPhysicalDevice_T *device ) -{ - load_vrclient(); - return p_get_native_VkPhysicalDevice( device ); -} - -VkPhysicalDevice_T *get_wrapped_VkPhysicalDevice( VkInstance_T *instance, VkPhysicalDevice_T *device ) -{ - load_vrclient(); - return p_get_wrapped_VkPhysicalDevice( instance, device ); -} - -VkQueue_T *get_native_VkQueue( VkQueue_T *queue ) -{ - load_vrclient(); - return p_get_native_VkQueue( queue ); -} - static bool is_hmd_present_reg(void) { DWORD type, value, wait_status, size; diff --git a/vrclient_x64/vrclient_x64/vrclient_private.h b/vrclient_x64/vrclient_x64/vrclient_private.h index 35a4d99e..344451f6 100644 --- a/vrclient_x64/vrclient_x64/vrclient_private.h +++ b/vrclient_x64/vrclient_x64/vrclient_private.h @@ -95,12 +95,6 @@ extern w_Texture_t vrclient_translate_texture_dxvk( const w_Texture_t *texture, VkImageLayout *image_layout, VkImageCreateInfo *image_info ); #endif /* __dxvk_interop_h__ */ -extern VkDevice_T *get_native_VkDevice( VkDevice_T *device ); -extern VkInstance_T *get_native_VkInstance( VkInstance_T *instance ); -extern VkPhysicalDevice_T *get_native_VkPhysicalDevice( VkPhysicalDevice_T *device ); -extern VkPhysicalDevice_T *get_wrapped_VkPhysicalDevice( VkInstance_T *instance, VkPhysicalDevice_T *device ); -extern VkQueue_T *get_native_VkQueue( VkQueue_T *queue ); - #include "vrclient_generated.h" #endif /* __cplusplus */