Merge branch 'added-nouveau-zink' of github.com:Htylol/PortWINE into Htylol-added-nouveau-zink

This commit is contained in:
Mikhail Tergoev 2024-10-23 13:45:49 +03:00
commit b1c3ca2303
4 changed files with 10 additions and 10 deletions

@ -17,7 +17,7 @@ if [[ -n "$DUPLICATE" ]] ; then
exit 1 exit 1
fi fi
for ppdb in $SELF_PATH/portwine_db/* ; do for ppdb in "$SELF_PATH/portwine_db/"* ; do
echo "$ppdb" echo "$ppdb"
sed -i '/##export/d' "$ppdb" sed -i '/##export/d' "$ppdb"

@ -3046,6 +3046,9 @@ start_portwine () {
then then
export LIBGL_KOPPER_DRI2="1" export LIBGL_KOPPER_DRI2="1"
fi fi
if [[ -d /sys/bus/pci/drivers/nouveau ]] ; then
export NOUVEAU_USE_ZINK="1"
fi
;; ;;
5) 5)
# LEGACY DXVK # LEGACY DXVK

@ -2,7 +2,7 @@
# Author: linux-gaming.ru # Author: linux-gaming.ru
# shellcheck disable=SC2317 # shellcheck disable=SC2317
export INSTALLING_PORT=1 export INSTALLING_PORT=1
# shellcheck source=./start.sh # shellcheck source=/dev/null
source "$(dirname "$(readlink -f "$0")")/start.sh" source "$(dirname "$(readlink -f "$0")")/start.sh"
if check_flatpak if check_flatpak

@ -244,14 +244,11 @@ if [[ "${INSTALLING_PORT}" == 1 ]] ; then
fi fi
# choose gui start # choose gui start
case "$PW_GUI_START" in if [[ ! $PW_GUI_START =~ (PANED|NOTEBOOK) ]] ; then
PANED|NOTEBOOK) : ;;
*)
sed -i '/export PW_GUI_START=/d' "$USER_CONF" sed -i '/export PW_GUI_START=/d' "$USER_CONF"
echo 'export PW_GUI_START="NOTEBOOK"' >> "$USER_CONF" echo 'export PW_GUI_START="NOTEBOOK"' >> "$USER_CONF"
export PW_GUI_START="NOTEBOOK" export PW_GUI_START="NOTEBOOK"
;; fi
esac
if check_flatpak ; then if check_flatpak ; then
if check_gamescope_session if check_gamescope_session