diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index b3b80ecda6cc292b5065015304bedbba4a8bd5a3..746a6db6fc47b826079c85e8b693e7918f6f475d 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -2043,7 +2043,7 @@ start_portwine () {
fi
if [[ "${PW_VULKAN_NO_ASYNC}" == 1 ]] ; then
- export RADV_DEBUG="llvm"
+ export RADV_DEBUG+="llvm "
var_vkd3d_config_update single_queue
fi
@@ -2333,15 +2333,6 @@ start_portwine () {
export PW_VKBASALT="0"
export PW_MANGOHUD="0"
export PW_WINE_FULLSCREEN_FSR="0"
- if echo "$LSPCI_VGA" | grep -i "AMD" &>/dev/null \
- && ! check_wayland_session
- then
- if check_gamescope_session \
- || [[ "${PW_GAMESCOPE}" = "1" ]]
- then
- export AMD_DEBUG="nodcc"
- fi
- fi
;;
4)
# GALLIUM ZINK
@@ -2895,8 +2886,23 @@ start_portwine () {
fi
# GAMESCOPE enable:
- if [[ "${PW_GAMESCOPE}" == 1 ]] \
- && [[ "${GAMESCOPE_INSTALLED}" == 1 ]] \
+ if [[ "${PW_GAMESCOPE}" == "1" && "${GAMESCOPE_INSTALLED}" == "1" ]] \
+ || check_gamescope_session
+ then
+ export vk_xwayland_wait_ready="false"
+ if [[ -d /sys/bus/pci/drivers/amdgpu ]] ; then
+ export RADV_DEBUG+="nodcc "
+ export AMD_DEBUG="nodcc"
+ if [[ ! "$(cat "${PW_TMPFS_PATH}/vulkaninfo.tmp" | grep -i VK_EXT_image_drm_format_modifier)" ]] ; then
+ export R600_DEBUG="nodcc"
+ grep -e '--backend' "${PW_TMPFS_PATH}/gamescope.tmp" &>/dev/null && PW_GS_BACKEND_SDL="1"
+ fi
+ fi
+ if [[ -d /sys/bus/pci/drivers/i915 ]] ; then
+ export INTEL_DEBUG="norbc"
+ fi
+ fi
+ if [[ "${PW_GAMESCOPE}" == "1" && "${GAMESCOPE_INSTALLED}" == "1" ]] \
&& ! check_gamescope_session
then
if [[ "${PW_GPU_USE}" != "disabled" ]] ; then
@@ -2906,11 +2912,9 @@ start_portwine () {
else
PW_ID_VIDEO=""
fi
- if ! check_wayland_session ; then
- export vk_xwayland_wait_ready="false"
- fi
+
#checkbox
- local PW_GAMESCOPE_ARGS_NEW=""
+ PW_GAMESCOPE_ARGS_NEW=""
[[ "${PW_GS_FULLSCREEN}" == "1" ]] && PW_GAMESCOPE_ARGS_NEW+=" -f"
[[ "${PW_GS_FORCE_FULLSCREEN}" == "1" ]] && PW_GAMESCOPE_ARGS_NEW+=" --force-windows-fullscreen"
[[ "${PW_GS_BORDERLESS_WINDOW}" == "1" ]] && PW_GAMESCOPE_ARGS_NEW+=" -b"
@@ -2933,12 +2937,6 @@ start_portwine () {
[[ "${PW_GS_EXPOSE_WAYLAND}" == "1" ]] && PW_GAMESCOPE_ARGS_NEW+=" --expose-wayland"
[[ "${PW_GS_REALTIME_SCHEDULING}" == "1" ]] && PW_GAMESCOPE_ARGS_NEW+=" --rt"
- if [[ "${PW_GS_FIX_AMD_AND_INTEL}" == "1" ]] ; then
- export RADV_DEBUG="nodcc"
- export R600_DEBUG="nodcc"
- export INTEL_DEBUG="norbc"
- fi
-
if [[ "${PW_GS_MANGOAPP}" == "1" ]] ; then
PW_GAMESCOPE_ARGS_NEW+=" --mangoapp"
export PW_MANGOHUD="0"
@@ -4521,18 +4519,12 @@ gui_gamescope () {
PW_GS_LIST="PW_GS_FULLSCREEN PW_GS_FORCE_FULLSCREEN PW_GS_BORDERLESS_WINDOW PW_GS_FORCE_GRAB_CURSOR
PW_GS_FORCE_GRAB_KEYBOARD PW_GS_HDR_ENABLE PW_GS_ENABLE_GAMESCOPE_WSI PW_GS_HDR_ITM_ENABLE PW_GS_SDR_GAMMUT_WIDENESS
PW_GS_FORCE_COMPOSITION PW_GS_HDR_FORCE_SUPPORT PW_GS_HDR_FORCE_OUTPUT PW_GS_HDR_FORCE_HEATMAP
- PW_GS_EXPOSE_WAYLAND PW_GS_REALTIME_SCHEDULING PW_GS_FIX_AMD_AND_INTEL
+ PW_GS_EXPOSE_WAYLAND PW_GS_REALTIME_SCHEDULING
"
grep -e '--mangoapp' "${PW_TMPFS_PATH}/gamescope.tmp" &>/dev/null && add_to_var PW_GS_LIST "PW_GS_MANGOAPP"
-
- if check_wayland_session ; then
- grep -e '--backend' "${PW_TMPFS_PATH}/gamescope.tmp" &>/dev/null \
- && add_to_var PW_GS_LIST "PW_GS_BACKEND_SDL" && add_to_var PW_GS_LIST "PW_GS_SDL_VIDEODRIVER_X11"
- else
- export PW_GS_BACKEND_SDL="0"
- export PW_GS_SDL_VIDEODRIVER_X11="0"
- fi
+ grep -e '--backend' "${PW_TMPFS_PATH}/gamescope.tmp" &>/dev/null \
+ && add_to_var PW_GS_LIST "PW_GS_BACKEND_SDL" && add_to_var PW_GS_LIST "PW_GS_SDL_VIDEODRIVER_X11"
GS_FILTER_CB="linear!nearest!fsr!nis!pixel"
#debian bookworm fix
@@ -4566,7 +4558,6 @@ if [[ "${SKIP_GAMESCOPE_TEXT_INFO}" != 1 ]] ; then
export PW_GS_MANGOAPP_INFO=$(gettext 'Launch with the mangoapp (mangohud) performance overlay enabled. You should use this instead of using mangohud on the game or gamescope.')
export PW_GS_BACKEND_SDL_INFO=$(gettext 'Use sdl backend. (by default wayland backend is used).')
export PW_GS_SDL_VIDEODRIVER_X11_INFO=$(gettext 'Force use sdl videodriver x11, works with BACKEND SDL. (Default is wayland)')
- export PW_GS_FIX_AMD_AND_INTEL_INFO=$(gettext 'Fixes artifacts on AMD and Intel video cards. (Use only when necessary).')
export SKIP_GAMESCOPE_TEXT_INFO=1
fi
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index aa7962200a915270af36d961e8e9d2f8d3b38144..b10244ecaad76ed4a8307b7a7eb15be3a7a80c64 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -98,7 +98,7 @@ unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_T
unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY
unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
-unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR
+unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*
@@ -258,7 +258,7 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
fi
if command -v vulkaninfo &>/dev/null ; then
- if timeout 3 vulkaninfo --summary &> "${PW_TMPFS_PATH}/vulkaninfo.tmp" ; then
+ if timeout 3 vulkaninfo &> "${PW_TMPFS_PATH}/vulkaninfo.tmp" ; then
VULKAN_DRIVER_NAME="$(grep -e 'driverName' "${PW_TMPFS_PATH}/vulkaninfo.tmp" | awk '{print$3}' | head -1)"
GET_GPU_NAMES=$(awk -F '=' '/deviceName/{print $2}' "${PW_TMPFS_PATH}/vulkaninfo.tmp" | sed '/llvm/d'| sort -u | sed 's/^ //' | paste -sd '!')
export VULKAN_DRIVER_NAME GET_GPU_NAMES
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index dc2490adc85b76e47b43a8ca294133bf508c27cd..8880c96e3e3c9b78857571054c4c8f66f9139fd8 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -125,7 +125,6 @@ export PW_GS_HDR_FORCE_OUTPUT="0"
export PW_GS_HDR_FORCE_HEATMAP="0"
export PW_GS_EXPOSE_WAYLAND="0"
export PW_GS_REALTIME_SCHEDULING="0"
-export PW_GS_FIX_AMD_AND_INTEL="0"
export PW_GS_BACKEND_SDL="0"
export PW_GS_SDL_VIDEODRIVER_X11="0"
export PW_GS_MANGOAPP="0"