Commit 600f959a authored by Boria138's avatar Boria138

Temporarily disabled video card selection when using gamescope and also cleaned…

Temporarily disabled video card selection when using gamescope and also cleaned and fixed the code and localization
parent 4f231600
...@@ -847,13 +847,6 @@ check_nvidia_rtx () { ...@@ -847,13 +847,6 @@ check_nvidia_rtx () {
return 1 return 1
} }
check_hybrid_graphicks () {
if [[ ! -z "$(echo "$LSPCI_VGA" | grep -i nvidia | grep -i -E '(intel|amd)')" ]]
then return 0
else return 1
fi
}
pw_init_db () { pw_init_db () {
if [[ -f "${portwine_exe}" ]] ; then if [[ -f "${portwine_exe}" ]] ; then
export PORTWINE_DB="$(basename "${portwine_exe}" .exe)" export PORTWINE_DB="$(basename "${portwine_exe}" .exe)"
...@@ -921,7 +914,6 @@ pw_init_db () { ...@@ -921,7 +914,6 @@ pw_init_db () {
check_variables PW_USE_FAKE_DLSS "0" check_variables PW_USE_FAKE_DLSS "0"
check_variables PW_USE_RAY_TRACING "1" check_variables PW_USE_RAY_TRACING "1"
fi fi
check_hybrid_graphicks && check_variables PW_PRIME_RENDER_OFFLOAD "1"
fi fi
[[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1 [[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1
......
...@@ -115,13 +115,14 @@ start_portwine () { ...@@ -115,13 +115,14 @@ start_portwine () {
fi fi
if [[ "${PW_USE_GAMESCOPE}" == 1 ]] && command -v gamescope &>/dev/null ; then if [[ "${PW_USE_GAMESCOPE}" == 1 ]] && command -v gamescope &>/dev/null ; then
if [[ ! -z "$GAMESCOPE_ARGS" ]]
then export PW_RUN_GAMESCOPE="gamescope -o 30 ${GAMESCOPE_ARGS} --"
else export PW_RUN_GAMESCOPE="gamescope -o 30 --"
# Workaround for https://gitlab.freedesktop.org/mesa/mesa/-/issues/6029 # Workaround for https://gitlab.freedesktop.org/mesa/mesa/-/issues/6029
if grep -q "i915" <<< $(lsmod); then if grep -q "i915" <<< $(lsmod); then
export INTEL_DEBUG=norbc export INTEL_DEBUG=norbc
fi fi
if [[ ! -z "$GAMESCOPE_ARGS" ]]
then export PW_RUN_GAMESCOPE="gamescope -o 30 ${GAMESCOPE_ARGS} --"
else export PW_RUN_GAMESCOPE="gamescope -o 30 --"
fi
export PW_WINE_FULLSCREEN_FSR=0 export PW_WINE_FULLSCREEN_FSR=0
else else
export PW_USE_GAMESCOPE=0 export PW_USE_GAMESCOPE=0
......
...@@ -166,6 +166,8 @@ pw_gui_for_edit_db () { ...@@ -166,6 +166,8 @@ pw_gui_for_edit_db () {
if [[ ! -z "${PW_GPU_USE}" ]] && [[ "${PW_GPU_USE}" != "disabled" ]] ; then if [[ ! -z "${PW_GPU_USE}" ]] && [[ "${PW_GPU_USE}" != "disabled" ]] ; then
GPU_VAR="${PW_GPU_USE}" GPU_VAR="${PW_GPU_USE}"
elif [[ ! -z "${PW_USE_GAMESCOPE}" ]] ; then
GPU_VAR="disabled"
else else
GPU_VAR="disabled" GPU_VAR="disabled"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment