Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-04-18 15:22:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

vrclient: Move initialization to the unix side.

Browse Source 
CW-Bug-Id: #22729
This commit is contained in:
Rémi Bernon 2023-10-19 12:38:31 +02:00 committed by Arkadiusz Hiler
parent e0b2b50fb1
commit c6a9e4ce99
4 changed files with 76 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vrclient_x64/Makefile.in
View File

@ -141,4 +141,5 @@ SOURCES = \
vrclient_x64/json_converter.cpp \ vrclient_x64/json_converter.cpp \
vrclient_x64/jsoncpp.cpp \ vrclient_x64/jsoncpp.cpp \
vrclient_x64/unix_vrrendermodels_manual.cpp \ vrclient_x64/unix_vrrendermodels_manual.cpp \
vrclient_x64/unixlib.cpp \
vrclient_x64/unixlib_generated.cpp \ vrclient_x64/unixlib_generated.cpp \

43
vrclient_x64/vrclient_x64/unixlib.cpp Normal file
View File

@ -0,0 +1,43 @@
#include "unix_private.h"
#include <dlfcn.h>
WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
static void *(*p_HmdSystemFactory)( const char *name, int *return_code );
static void *(*p_VRClientCoreFactory)( const char *name, int *return_code );
bool unix_vrclient_init( struct vrclient_init_params *params )
{
static void *vrclient;
if (vrclient) return true;
if (!(vrclient = dlopen( params->unix_path, RTLD_NOW )))
{
TRACE( "unable to load %s\n", params->unix_path );
return false;
}
#define LOAD_FUNC( x ) \
if (!(p_##x = (decltype(p_##x))dlsym( vrclient, #x ))) \
{ \
ERR( "unable to load " #x "\n" ); \
return false; \
}
LOAD_FUNC( HmdSystemFactory );
LOAD_FUNC( VRClientCoreFactory );
return true;
}
void *unix_HmdSystemFactory( const char *name, int *return_code )
{
return p_HmdSystemFactory( name, return_code );
}
void *unix_VRClientCoreFactory( const char *name, int *return_code )
{
return p_VRClientCoreFactory( name, return_code );
}

9
vrclient_x64/vrclient_x64/unixlib.h
View File

@ -37,6 +37,15 @@ struct render_model_texture_map
}; };
}; };
struct vrclient_init_params
{
char *unix_path;
};
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 );
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif /* __cplusplus */ #endif /* __cplusplus */

79
vrclient_x64/vrclient_x64/vrclient_main.c
View File

@ -31,8 +31,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(vrclient); WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
static void *vrclient_lib; struct compositor_data compositor_data = {0};
struct compositor_data compositor_data;
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
{ {
@ -45,19 +44,14 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
if (vrclient_lib) if (compositor_data.client_core_linux_side)
{ {
if (compositor_data.client_core_linux_side) struct cppIVRClientCore_IVRClientCore_003_Cleanup_params params =
{ {
struct cppIVRClientCore_IVRClientCore_003_Cleanup_params params = .linux_side = compositor_data.client_core_linux_side,
{ };
.linux_side = compositor_data.client_core_linux_side, cppIVRClientCore_IVRClientCore_003_Cleanup( &params );
}; compositor_data.client_core_linux_side = NULL;
cppIVRClientCore_IVRClientCore_003_Cleanup( &params );
compositor_data.client_core_linux_side = NULL;
}
dlclose(vrclient_lib);
vrclient_lib = NULL;
} }
break; break;
} }
@ -200,14 +194,13 @@ struct w_steam_iface *create_win_interface(const char *name, void *linux_side)
return NULL; return NULL;
} }
static void *(*vrclient_HmdSystemFactory)(const char *name, int *return_code);
static void *(*vrclient_VRClientCoreFactory)(const char *name, int *return_code);
static int load_vrclient(void) static int load_vrclient(void)
{ {
static const WCHAR PROTON_VR_RUNTIME_W[] = {'P','R','O','T','O','N','_','V','R','_','R','U','N','T','I','M','E',0}; static const WCHAR PROTON_VR_RUNTIME_W[] = {'P','R','O','T','O','N','_','V','R','_','R','U','N','T','I','M','E',0};
static BOOL loaded;
struct vrclient_init_params params = {0};
WCHAR pathW[PATH_MAX]; WCHAR pathW[PATH_MAX];
char *pathU;
DWORD sz; DWORD sz;
#ifdef _WIN64 #ifdef _WIN64
@ -216,8 +209,7 @@ static int load_vrclient(void)
static const char append_path[] = "/bin/vrclient.so"; static const char append_path[] = "/bin/vrclient.so";
#endif #endif
if(vrclient_lib) if (loaded) return 1;
return 1;
/* PROTON_VR_RUNTIME is provided by the proton setup script */ /* PROTON_VR_RUNTIME is provided by the proton setup script */
if(!GetEnvironmentVariableW(PROTON_VR_RUNTIME_W, pathW, ARRAY_SIZE(pathW))) if(!GetEnvironmentVariableW(PROTON_VR_RUNTIME_W, pathW, ARRAY_SIZE(pathW)))
@ -255,63 +247,38 @@ static int load_vrclient(void)
return 0; return 0;
} }
pathU = HeapAlloc(GetProcessHeap(), 0, sz + sizeof(append_path)); params.unix_path = HeapAlloc( GetProcessHeap(), 0, sz + sizeof(append_path) );
sz = WideCharToMultiByte(CP_UNIXCP, 0, pathW, -1, pathU, sz, NULL, NULL); sz = WideCharToMultiByte( CP_UNIXCP, 0, pathW, -1, params.unix_path, sz, NULL, NULL );
if(!sz) if(!sz)
{ {
ERR("Can't convert path to unixcp! %s\n", wine_dbgstr_w(pathW)); ERR("Can't convert path to unixcp! %s\n", wine_dbgstr_w(pathW));
HeapFree(GetProcessHeap(), 0, pathU); HeapFree(GetProcessHeap(), 0, params.unix_path);
return 0; return 0;
} }
strcat(pathU, append_path); strcat( params.unix_path, append_path );
TRACE("got openvr runtime path: %s\n", pathU); TRACE( "got openvr runtime path: %s\n", params.unix_path );
vrclient_lib = dlopen(pathU, RTLD_NOW); if (unix_vrclient_init( &params )) loaded = TRUE;
if(!vrclient_lib){
TRACE("unable to load vrclient.so\n");
HeapFree(GetProcessHeap(), 0, pathU);
return 0;
}
vrclient_HmdSystemFactory = dlsym(vrclient_lib, "HmdSystemFactory"); HeapFree( GetProcessHeap(), 0, params.unix_path );
if(!vrclient_HmdSystemFactory){ return loaded;
ERR("unable to load HmdSystemFactory method\n");
HeapFree(GetProcessHeap(), 0, pathU);
return 0;
}
vrclient_VRClientCoreFactory = dlsym(vrclient_lib, "VRClientCoreFactory");
if(!vrclient_VRClientCoreFactory){
ERR("unable to load VRClientCoreFactory method\n");
HeapFree(GetProcessHeap(), 0, pathU);
return 0;
}
HeapFree(GetProcessHeap(), 0, pathU);
return 1;
} }
void *CDECL HmdSystemFactory(const char *name, int *return_code) void *CDECL HmdSystemFactory(const char *name, int *return_code)
{ {
TRACE("name: %s, return_code: %p\n", name, return_code); TRACE("name: %s, return_code: %p\n", name, return_code);
if (!load_vrclient()) return NULL;
if(!load_vrclient()) return create_win_interface( name, unix_HmdSystemFactory( name, return_code ) );
return NULL;
return create_win_interface(name, vrclient_HmdSystemFactory(name, return_code));
} }
void *CDECL VRClientCoreFactory(const char *name, int *return_code) void *CDECL VRClientCoreFactory(const char *name, int *return_code)
{ {
TRACE("name: %s, return_code: %p\n", name, return_code); TRACE("name: %s, return_code: %p\n", name, return_code);
if (!load_vrclient()) return NULL;
if(!load_vrclient()) return create_win_interface( name, unix_VRClientCoreFactory( name, return_code ) );
return NULL;
return create_win_interface(name, vrclient_VRClientCoreFactory(name, return_code));
} }
static VkDevice_T *(WINAPI *p_get_native_VkDevice)( VkDevice_T * ); static VkDevice_T *(WINAPI *p_get_native_VkDevice)( VkDevice_T * );