From 042627768d334c6aefc5d53d034469fcaaef7a9b Mon Sep 17 00:00:00 2001 From: Boria138 Date: Fri, 3 Nov 2023 21:14:25 +0600 Subject: [PATCH 1/5] Added Program bit depth to log --- data_from_portwine/scripts/start.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index dbf409f..5044ae8 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -122,6 +122,15 @@ portwine_start_debug () { echo "Version WINE in the Port:" >> "${PORT_WINE_PATH}/${portname}.log" echo "$PW_WINE_USE" >> "${PORT_WINE_PATH}/${portname}.log" echo "------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + echo "Program bit depth" >> "${PORT_WINE_PATH}/${portname}.log" + if [[ $(file "$portwine_exe") =~ x86-64 ]]; then + echo "64 bit" >> "${PORT_WINE_PATH}/${portname}.log" + echo "-----------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + else + echo "32 bit" >> "${PORT_WINE_PATH}/${portname}.log" + echo "------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + fi + echo "--------------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Date and time of start debug for ${portname}:" >> "${PORT_WINE_PATH}/${portname}.log" date >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" From 85cff1ef43683ea9fce58c3b5c35a9a17079fdc7 Mon Sep 17 00:00:00 2001 From: Boria138 Date: Tue, 7 Nov 2023 13:54:56 +0600 Subject: [PATCH 2/5] Deleted gamemode dlopen error and wine rlimit error from log --- data_from_portwine/scripts/start.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 5044ae8..0c7f0ae 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -227,6 +227,8 @@ portwine_start_debug () { sed -i '/.fx$/d' "${PORT_WINE_PATH}/${portname}.log" sed -i '/HACK_does_openvr_work/d' "${PORT_WINE_PATH}/${portname}.log" sed -i '/Uploading is disabled/d' "${PORT_WINE_PATH}/${portname}.log" + sed -i '/dlopen failed - libgamemode.so/d' "${PORT_WINE_PATH}/${portname}.log" + sed -i '/wine: RLIMIT_NICE is <= 20/d' "${PORT_WINE_PATH}/${portname}.log" deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++') echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log" "$pw_yad" --title="${portname}.log" --borders=3 --no-buttons --text-align=center \ From 733149752e85979d717b35a0f02e6bd4610c5c1e Mon Sep 17 00:00:00 2001 From: Boria138 Date: Tue, 7 Nov 2023 23:00:15 +0600 Subject: [PATCH 3/5] Made the log more detailed --- data_from_portwine/scripts/start.sh | 40 +++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 0c7f0ae..63a2b47 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -113,22 +113,27 @@ portwine_start_debug () { echo "--------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" if [[ "${PW_VULKAN_USE}" = "0" ]] ; then echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DX9-11 to ${loc_gui_open_gl}" >> "${PORT_WINE_PATH}/${portname}.log" + elif [[ "${PW_VULKAN_USE}" = "1" ]] ; then + echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_STABLE_VER} and VKD3D-PROTON v.${VKD3D_STABLE_VER}" >> "${PORT_WINE_PATH}/${portname}.log" + elif [[ "${PW_VULKAN_USE}" = "2" ]] ; then + echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_GIT_VER} and VKD3D-PROTON v.${VKD3D_GIT_VER}" >> "${PORT_WINE_PATH}/${portname}.log" elif [[ "${PW_VULKAN_USE}" = "3" ]] ; then echo "PW_VULKAN_USE=${PW_VULKAN_USE} - native DX9 on MESA drivers" >> "${PORT_WINE_PATH}/${portname}.log" + elif [[ "${PW_VULKAN_USE}" = "4" ]] ; then + echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DirectX to wined3d vulkan" >> "${PORT_WINE_PATH}/${portname}.log" else echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/${portname}.log" fi echo "--------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo "Version WINE in the Port:" >> "${PORT_WINE_PATH}/${portname}.log" + echo "Version WINE in use:" >> "${PORT_WINE_PATH}/${portname}.log" echo "$PW_WINE_USE" >> "${PORT_WINE_PATH}/${portname}.log" - echo "------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo "Program bit depth" >> "${PORT_WINE_PATH}/${portname}.log" + echo "-------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + echo "Program bit depth:" >> "${PORT_WINE_PATH}/${portname}.log" if [[ $(file "$portwine_exe") =~ x86-64 ]]; then echo "64 bit" >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" else echo "32 bit" >> "${PORT_WINE_PATH}/${portname}.log" - echo "------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" fi echo "--------------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Date and time of start debug for ${portname}:" >> "${PORT_WINE_PATH}/${portname}.log" @@ -137,7 +142,7 @@ portwine_start_debug () { echo "The installation path of the ${portname}:" >> "${PORT_WINE_PATH}/${portname}.log" echo "$PORT_WINE_PATH" >> "${PORT_WINE_PATH}/${portname}.log" echo "----------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo "Operating system" >> "${PORT_WINE_PATH}/${portname}.log" + echo "Operating system:" >> "${PORT_WINE_PATH}/${portname}.log" cat /etc/os-release | grep -oP 'PRETTY_NAME="\K[^"]+' >> "${PORT_WINE_PATH}/${portname}.log" echo "--------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Desktop environment:" >> "${PORT_WINE_PATH}/${portname}.log" @@ -145,13 +150,14 @@ portwine_start_debug () { echo "Current desktop: ${XDG_CURRENT_DESKTOP}" >> "${PORT_WINE_PATH}/${portname}.log" echo "Session type: ${XDG_SESSION_TYPE}" >> "${PORT_WINE_PATH}/${portname}.log" echo "--------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo "Kernel" >> "${PORT_WINE_PATH}/${portname}.log" + echo "Kernel:" >> "${PORT_WINE_PATH}/${portname}.log" uname -r >> "${PORT_WINE_PATH}/${portname}.log" echo "-------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo "CPU" >> "${PORT_WINE_PATH}/${portname}.log" - cat /proc/cpuinfo | grep "model name" >> "${PORT_WINE_PATH}/${portname}.log" + echo "CPU:" >> "${PORT_WINE_PATH}/${portname}.log" + echo "$(cat /proc/cpuinfo | grep 'cpu cores' | sort -u | cut -d':' -f2)-physical $(cat /proc/cpuinfo | \ + grep 'processor' | wc -l)-logical cores $(cat /proc/cpuinfo | grep 'model name' | sort -u | cut -d':' -f2)" >> "${PORT_WINE_PATH}/${portname}.log" echo "------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo "RAM" >> "${PORT_WINE_PATH}/${portname}.log" + echo "RAM:" >> "${PORT_WINE_PATH}/${portname}.log" free -m >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Graphic cards and drivers:" >> "${PORT_WINE_PATH}/${portname}.log" @@ -169,15 +175,21 @@ portwine_start_debug () { if [ $? -eq 0 ]; then echo "Vulkan cube test passed successfully" >> "${PORT_WINE_PATH}/${portname}.log" else - echo "Vkcube test completed with error" >> "${PORT_WINE_PATH}/${portname}.log" + echo "Vulkan cube test completed with error" >> "${PORT_WINE_PATH}/${portname}.log" fi - if [ ! -x "$(command -v gamemoderun 2>/dev/null)" ] + echo "----------------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + echo "GameMode status:" >> "${PORT_WINE_PATH}/${portname}.log" + if gamemoded -s | grep -q "active"; then - echo "---------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo "!!!gamemod not found!!!" >> "${PORT_WINE_PATH}/${portname}.log" + echo "gamemode is active" >> "${PORT_WINE_PATH}/${portname}.log" + elif gamemoded -s | grep -q "inactive"; + then + echo "gamemode is inactive" >> "${PORT_WINE_PATH}/${portname}.log" + else + echo "gamemode is not found" >> "${PORT_WINE_PATH}/${portname}.log" fi echo "---------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo 'locale :' >> "${PORT_WINE_PATH}/${portname}.log" + echo 'locale:' >> "${PORT_WINE_PATH}/${portname}.log" locale >> "${PORT_WINE_PATH}/${portname}.log" echo "---" >> "${PORT_WINE_PATH}/${portname}.log" echo 'locale -a | grep -i "$(locale | grep -e '^LANG=' | sed 's/LANG=//' | sed 's/\-8//')" :' >> "${PORT_WINE_PATH}/${portname}.log" From 4bb06820356a3f4539148d999afdbc6d06a1be1b Mon Sep 17 00:00:00 2001 From: Boria138 Date: Tue, 7 Nov 2023 23:26:14 +0600 Subject: [PATCH 4/5] Beautify CPU log --- data_from_portwine/scripts/start.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 63a2b47..d4d78a5 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -141,7 +141,7 @@ portwine_start_debug () { echo "-----------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "The installation path of the ${portname}:" >> "${PORT_WINE_PATH}/${portname}.log" echo "$PORT_WINE_PATH" >> "${PORT_WINE_PATH}/${portname}.log" - echo "----------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + echo "------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Operating system:" >> "${PORT_WINE_PATH}/${portname}.log" cat /etc/os-release | grep -oP 'PRETTY_NAME="\K[^"]+' >> "${PORT_WINE_PATH}/${portname}.log" echo "--------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" @@ -149,13 +149,14 @@ portwine_start_debug () { echo "Desktop session: ${DESKTOP_SESSION}" >> "${PORT_WINE_PATH}/${portname}.log" echo "Current desktop: ${XDG_CURRENT_DESKTOP}" >> "${PORT_WINE_PATH}/${portname}.log" echo "Session type: ${XDG_SESSION_TYPE}" >> "${PORT_WINE_PATH}/${portname}.log" - echo "--------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + echo "---------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Kernel:" >> "${PORT_WINE_PATH}/${portname}.log" uname -r >> "${PORT_WINE_PATH}/${portname}.log" echo "-------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "CPU:" >> "${PORT_WINE_PATH}/${portname}.log" - echo "$(cat /proc/cpuinfo | grep 'cpu cores' | sort -u | cut -d':' -f2)-physical $(cat /proc/cpuinfo | \ - grep 'processor' | wc -l)-logical cores $(cat /proc/cpuinfo | grep 'model name' | sort -u | cut -d':' -f2)" >> "${PORT_WINE_PATH}/${portname}.log" + echo "CPU physical cores:$(cat /proc/cpuinfo | grep 'cpu cores' | sort -u | cut -d':' -f2)" >> "${PORT_WINE_PATH}/${portname}.log" + echo "CPU logical cores: $(cat /proc/cpuinfo | grep 'processor' | wc -l)" >> "${PORT_WINE_PATH}/${portname}.log" + echo "CPU model name:$(cat /proc/cpuinfo | grep 'model name' | sort -u | cut -d':' -f2)" >> "${PORT_WINE_PATH}/${portname}.log" echo "------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "RAM:" >> "${PORT_WINE_PATH}/${portname}.log" free -m >> "${PORT_WINE_PATH}/${portname}.log" @@ -188,7 +189,7 @@ portwine_start_debug () { else echo "gamemode is not found" >> "${PORT_WINE_PATH}/${portname}.log" fi - echo "---------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + echo "----------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo 'locale:' >> "${PORT_WINE_PATH}/${portname}.log" locale >> "${PORT_WINE_PATH}/${portname}.log" echo "---" >> "${PORT_WINE_PATH}/${portname}.log" From dca84f26258605f74b743d569d41e89ef06c5f8c Mon Sep 17 00:00:00 2001 From: Boria138 Date: Wed, 8 Nov 2023 00:07:31 +0600 Subject: [PATCH 5/5] Fixed gamemode and update prime render offload --- data_from_portwine/scripts/runlib | 5 ++--- data_from_portwine/scripts/start.sh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 28a92cf..ad92b4e 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -159,8 +159,7 @@ start_portwine () { fi if [[ "${PW_PRIME_RENDER_OFFLOAD}" == 1 ]] ; then - if [[ ! -z $(command -v glxinfo) ]] \ - && [[ ! -z $(glxinfo -B | grep "OpenGL renderer" | grep -i "nvidia") ]] + if ${PW_WINELIB}/portable/bin/inxi -Gc0 | grep "renderer" | grep -i "nvidia" ; then print_debug "Nvidia used by default. Force disabled PRIME_RENDER_OFFLOAD" export __NV_PRIME_RENDER_OFFLOAD=0 @@ -220,7 +219,7 @@ start_portwine () { print_info "Gamemod will be launched." else export GAMEMODERUN=0 - echo "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" fi pw_other_fixes diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index d4d78a5..a3626ec 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -180,10 +180,10 @@ portwine_start_debug () { fi echo "----------------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "GameMode status:" >> "${PORT_WINE_PATH}/${portname}.log" - if gamemoded -s | grep -q "active"; + if gamemoded -s | grep "is active"; then echo "gamemode is active" >> "${PORT_WINE_PATH}/${portname}.log" - elif gamemoded -s | grep -q "inactive"; + elif gamemoded -s | grep "is inactive"; then echo "gamemode is inactive" >> "${PORT_WINE_PATH}/${portname}.log" else