From f0d526f3af3bee45643e6963cef960cf72346ed1 Mon Sep 17 00:00:00 2001 From: Boria138 Date: Sat, 25 Nov 2023 17:33:23 +0600 Subject: [PATCH] Deleted prime render offload --- data_from_portwine/scripts/functions_helper | 6 ++---- data_from_portwine/scripts/lang | 2 -- data_from_portwine/scripts/runlib | 18 +++--------------- data_from_portwine/scripts/start.sh | 4 ++-- data_from_portwine/scripts/var | 1 - 5 files changed, 7 insertions(+), 24 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 223225d8..505d3bd7 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -308,10 +308,8 @@ check_user_conf () { echo "# User overides db and var settings..." >> "${USER_CONF}" echo "# export DXVK_HUD=full" >> "${USER_CONF}" echo "# export GALLIUM_HUD=fps" >> "${USER_CONF}" - echo "export optirun_on= #nvidia-prime-run or prime-run" >> "${USER_CONF}" - else - grep "optirun_on" "${USER_CONF}" >/dev/null - [[ "$?" != 0 ]] && echo "export optirun_on=" >> "${USER_CONF}" + elif grep "optirun_on" "${USER_CONF}" ; then + sed -i '/optirun_on/d' "${USER_CONF}" fi } diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 6980ec62..51be6045 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -140,7 +140,6 @@ if [[ "${update_loc}" == "RUS" ]] ; then export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)' export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)' export PW_USE_D3D_EXTRAS_INFO='Включить принудительное использование сторонних библиотек DirectX' - export PW_PRIME_RENDER_OFFLOAD_INFO='Включить дискретную видеокарту NVIDIA для ноутбуков с гибридной графикой (при поддержке установленого драйвера в ОС)' export PW_USE_WINDOWS_7_INFO='Изменить версию WINDOWS 10 на WINDOWS 7 в префиксе' export PW_USE_SHADER_CACHE_INFO='Использовать кеширование шейдеров средствами WINE (отключать только при наличии микрофризов в игре)' export PW_WINE_FULLSCREEN_FSR_INFO='Работает во время использования любой версии ProtonGE в полноэкранном режиме при разрешении ниже стандартного для экрана' @@ -423,7 +422,6 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export PW_USE_WINE_DXGI_INFO='Forced use of built-in DXGI library (in rare cases it solves problems with DX12 games)' export PW_MANGOHUD_USER_CONF_INFO='Forced use of MANGOHUD system settings (GOverlay, etc.)' export PW_USE_D3D_EXTRAS_INFO='Enable forced use of third-party DirectX libraries' - export PW_PRIME_RENDER_OFFLOAD_INFO='Enable NVIDIA discrete graphics card for notebooks with hybrid graphics (if supported by the installed driver in the OS)' export PW_USE_WINDOWS_7_INFO='Change the version of WINDOWS 10 to WINDOWS 7 in the prefix' export PW_USE_SHADER_CACHE_INFO='Use WINE shader caching (disable only if there are microfreezes in the game)' export PW_WINE_FULLSCREEN_FSR_INFO='Works while using any version of ProtonGE in full screen mode at a resolution below the standard screen' diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 3cbb1326..66a3981f 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Author: Castro-Fidel (linux-gaming.ru) -# Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus; UserDiscord +# Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus; UserDiscord; Boria138 ######################################################################## echo ' █░░ █ █▄░█ █░█ ▀▄▀ ▄▄ █▀▀ ▄▀█ █▀▄▀█ █ █▄░█ █▀▀ ░ █▀█ █░█ @@ -162,18 +162,6 @@ start_portwine () { export PW_VULKAN_USE=5 fi - if [[ "${PW_PRIME_RENDER_OFFLOAD}" == 1 ]] ; then - 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 - unset __GLX_VENDOR_LIBRARY_NAME __VK_LAYER_NV_optimus - else - export __NV_PRIME_RENDER_OFFLOAD=1 - export __GLX_VENDOR_LIBRARY_NAME=nvidia - export __VK_LAYER_NV_optimus=NVIDIA_only - fi - fi - if [[ "${PW_HEAP_DELAY_FREE}" == 1 ]] then export WINE_HEAP_DELAY_FREE="1" else export WINE_HEAP_DELAY_FREE="0" @@ -636,7 +624,7 @@ pw_run () { echo "Log WINE:" >> "${PW_LOG_TO_FILE}" echo "" print_debug "Log from RUNTIME and WINE:" - env ${optirun_on} ${PW_GAMEMODERUN_SLR} \ + ${PW_GAMEMODERUN_SLR} \ NO_AT_BRIDGE=0 ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ @@ -652,7 +640,7 @@ pw_run () { fi echo "" print_debug "Log from RUNTIME and WINE:" - env ${optirun_on} ${PW_GAMEMODERUN_SLR} \ + ${PW_GAMEMODERUN_SLR} \ NO_AT_BRIDGE=0 ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 45de81ca..9e0efab8 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -409,7 +409,7 @@ pw_start_cont_xterm () { unset PW_SANDBOX_HOME_PATH # export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" pw_init_runtime - ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ + ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ @@ -466,7 +466,7 @@ pw_edit_db () { pw_gui_for_edit_db \ PW_MANGOHUD PW_MANGOHUD_x32 PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ - PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \ + PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \ PW_REDUCE_PULSE_LATENCY PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE \ PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK if [ "$?" == 0 ] ; then diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 68fbd870..4847e5f5 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -55,7 +55,6 @@ export DEFPFX_VER="v1" export PROGPFX_VER="v1" export PW_MUST_WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b,winemenubuilder.exe=" ################################################################# -export optirun_on="" export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" ################################################################# pw_install_dll_in_prefix ()