CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Boria138-fix-gamemode'

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-02-11 16:41:27 +03:00
commit f7803d8f40
1 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
data_from_portwine/scripts/runlib
View File

@ -293,20 +293,28 @@ start_portwine () {
export int_xneur=1 export int_xneur=1
fi fi
if [[ "$PW_USE_GAMEMODE" = "1" ]] ; then if [[ "$PW_USE_GAMEMODE" = "1" ]] ; then
export GAMEMODERUN=1
pkill gamemoded
sleep 0.1
GAMEMODEAUTO_NAME="libgamemodeauto.so.0" if command -v gamemoded ; then
if [[ ! -z "${PW_LD_PRELOAD}" ]] export GAMEMODERUN=1
then export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${GAMEMODEAUTO_NAME}" PW_GAMEMODERUN_SLR="gamemoderun"
else export PW_LD_PRELOAD="${GAMEMODEAUTO_NAME}" systemctl enable --now --user gamemoded &>/dev/null
print_info "Gamemod will be launched."
else
export GAMEMODERUN=1
if ! pidof gamemoded &>/dev/null ; then
GAMEMODEAUTO_NAME="libgamemodeauto.so.0"
if [[ ! -z "${PW_LD_PRELOAD}" ]]
then export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${GAMEMODEAUTO_NAME}"
else export PW_LD_PRELOAD="${GAMEMODEAUTO_NAME}"
fi
env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32" \
"${PW_PLUGINS_PATH}/portable/bin/gamemoded" &>/dev/null &
print_info "Gamemod will be launched."
sleep 0.1
fi
fi fi
env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32" \
"${PW_PLUGINS_PATH}/portable/bin/gamemoded" &>/dev/null &
print_info "Gamemod will be launched."
else else
export GAMEMODERUN=0 export GAMEMODERUN=0
print_info "Gamemod is not installed or disabled in vars script or db file: PW_USE_GAMEMODE=$PW_USE_GAMEMODE" print_info "Gamemod is not installed or disabled in vars script or db file: PW_USE_GAMEMODE=$PW_USE_GAMEMODE"
@ -723,15 +731,28 @@ pw_run () {
echo "Log WINE:" >> "${PW_LOG_TO_FILE}" echo "Log WINE:" >> "${PW_LOG_TO_FILE}"
echo "" echo ""
print_debug "Log from RUNTIME and WINE:" print_debug "Log from RUNTIME and WINE:"
${PW_RUN_GAMESCOPE} \ if [[ ! -z "$PW_GAMEMODERUN_SLR" ]] ; then
${pw_runtime} \ ${PW_RUN_GAMESCOPE} \
env PATH="${PATH}" \ ${pw_runtime} \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ env PATH="${PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \ LD_PRELOAD="${PW_LD_PRELOAD}" \
VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} \ VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \
${PW_MANGOHUD_SLR} \ VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" ${PW_GAMEMODERUN_SLR} \
${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
else
${PW_RUN_GAMESCOPE} \
${pw_runtime} \
env PATH="${PATH}" \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \
VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \
VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} \
${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
fi
else else
if [[ "${PW_USE_TERMINAL}" == "1" ]] ; then if [[ "${PW_USE_TERMINAL}" == "1" ]] ; then
export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm"
@ -740,16 +761,19 @@ pw_run () {
echo "" echo ""
echo "Log WINE:" > "${PW_LOG_TO_FILE}" echo "Log WINE:" > "${PW_LOG_TO_FILE}"
print_debug "Log from RUNTIME and WINE:" print_debug "Log from RUNTIME and WINE:"
${PW_RUN_GAMESCOPE} \ if [[ ! -z "$PW_GAMEMODERUN_SLR" ]] ; then
${pw_runtime} \ ${PW_RUN_GAMESCOPE} \
env PATH="${PATH}" \ ${pw_runtime} \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ env PATH="${PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \ LD_PRELOAD="${PW_LD_PRELOAD}" \
VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \ VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \
${PW_MANGOHUD_SLR} \ VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" ${PW_GAMEMODERUN_SLR} \
cat "${PW_LOG_TO_FILE}" ${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
cat "${PW_LOG_TO_FILE}"
fi
fi fi
} }
export -f pw_run export -f pw_run