diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 851be7d..6f03552 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3631,7 +3631,8 @@ start_portwine () { print_info "VKD3D-PROTON v.${VKD3D_STABLE_VER} in use" PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}" - CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi" # openvr_api_dxvk + CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi" + [[ "$PW_USE_VRCLIENT" = "1" ]] && add_to_var CP_DXVK_FILES "openvr_api_dxvk" CP_VKD3D_FILES="d3d12 libvkd3d-shader-1" CP_WINE_FILES="d3d12core d3d8" ;; @@ -3641,7 +3642,8 @@ start_portwine () { print_info "VKD3D-PROTON v.${VKD3D_GIT_VER} in use" PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" - CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi" # openvr_api_dxvk + CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi" + [[ "$PW_USE_VRCLIENT" = "1" ]] && add_to_var CP_DXVK_FILES "openvr_api_dxvk" CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1" CP_WINE_FILES="d3d10_1 d3d10" ;; @@ -3950,10 +3952,14 @@ start_portwine () { export VKD3D_SHADER_CACHE_PATH="${PATH_TO_VKD3D_FILES}/vkd3d_cache" fi - if [[ ! -d "${WINEPREFIX}/drive_c/vrclient/bin" ]] ; then - create_new_dir "${WINEPREFIX}/drive_c/vrclient/bin" - try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/vrclient.dll "${WINEPREFIX}/drive_c/vrclient/bin/vrclient.dll" - try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/vrclient_x64.dll "${WINEPREFIX}/drive_c/vrclient/bin/vrclient_x64.dll" + if [[ "$PW_USE_VRCLIENT" = "1" ]] ; then + if [[ ! -d "${WINEPREFIX}/drive_c/vrclient/bin" ]] ; then + create_new_dir "${WINEPREFIX}/drive_c/vrclient/bin" + try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/vrclient.dll "${WINEPREFIX}/drive_c/vrclient/bin/vrclient.dll" + try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/vrclient_x64.dll "${WINEPREFIX}/drive_c/vrclient/bin/vrclient_x64.dll" + fi + else + var_winedlloverride_update "vrclient,vrclient_x64,openvr_api_dxvk=" fi if [[ "${PW_USE_SHADER_CACHE}" == "1" ]] ; then diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 44d2317..2da55e3 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -36,6 +36,7 @@ export PW_USE_US_LAYOUT="0" export PW_GPU_USE="disabled" export PW_LOCALE_SELECT="disabled" export PW_DINPUT_PROTOCOL="0" +export PW_USE_VRCLIENT="0" export STAGING_SHARED_MEMORY="1" ###DEFAULT_WINE### export PW_WINE_USE="PROTON_LG"