From 31575b17857961041661476366b59469b4b78b9b Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Sat, 23 Dec 2023 15:14:47 +0300
Subject: [PATCH] drop dx12_disable
---
data_from_portwine/changelog_rus | 3 +++
data_from_portwine/scripts/lang | 2 --
data_from_portwine/scripts/portwine_db/Genshin Impact | 1 -
data_from_portwine/scripts/portwine_db/default | 2 --
data_from_portwine/scripts/portwine_db/warframe | 1 -
data_from_portwine/scripts/runlib | 6 ------
data_from_portwine/scripts/start.sh | 2 +-
7 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index c07de82b..7ad747c7 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,9 @@
-----------------------------------------
История изменений:
+* удалена переменная "DX12_DISABLE" из EDIT_DB (устаревшая функция)
+* произведен перенос проверки драйвера Vulkan в режим зоздания лога
+
###Scripts version 2239### Дата: 17.12.2023 / Размер скачиваемого обновления: 8 мегабайт
* исправлен запуск League of Legends (для исправления запустите автоустановку)
* добавлена корректная проверка драйвера vulkan, без установки в систему vulkan-tools
diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang
index e8183a9d..2801ec3b 100755
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -138,7 +138,6 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export PW_USE_RUNTIME_INFO='Использовать контейнерный режим запуска (Рекомендуется не изменять значение)'
export PW_MANGOHUD_INFO='Использование мониторинга FPS и нагрузки системы (Включается и выключается сочитанием клавиш - правый Shift + F12)'
export PW_USE_GAMEMODE_INFO='Использование автоматической оптимизации системы для увеличения производительности в играх (при условии установленного пакета gamemode в системе)'
- export PW_DX12_DISABLE_INFO='Принудительное отключение DirectX 12'
export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)'
export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)'
export PW_USE_D3D_EXTRAS_INFO='Включить принудительное использование сторонних библиотек DirectX'
@@ -468,7 +467,6 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
export PW_USE_RUNTIME_INFO='Use container launch mode (It is recommended not to change the value)'
export PW_MANGOHUD_INFO='Using FPS and system load monitoring (Turns on and off by the key combination - right Shift + F12)'
export PW_USE_GAMEMODE_INFO='Using automatic system optimization to improve performance in games (provided the gamemode package is installed on the system)'
- export PW_DX12_DISABLE_INFO='Forced disabling DirectX 12'
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'
diff --git a/data_from_portwine/scripts/portwine_db/Genshin Impact b/data_from_portwine/scripts/portwine_db/Genshin Impact
index 341a9a55..68d93579 100644
--- a/data_from_portwine/scripts/portwine_db/Genshin Impact
+++ b/data_from_portwine/scripts/portwine_db/Genshin Impact
@@ -25,7 +25,6 @@ export PW_USE_NVAPI_AND_DLSS="0"
export PW_USE_FAKE_DLSS="0"
export PW_WINE_FULLSCREEN_FSR="1"
export PW_USE_GAMEMODE="1"
-export PW_DX12_DISABLE="0"
export PW_USE_D3D_EXTRAS="1"
export PW_FIX_VIDEO_IN_GAME="0"
export PW_USE_US_LAYOUT="0"
diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default
index f6c9e453..c3a8567e 100755
--- a/data_from_portwine/scripts/portwine_db/default
+++ b/data_from_portwine/scripts/portwine_db/default
@@ -16,8 +16,6 @@
##export LAUNCH_PARAMETERS="+com_skipIntroVideo 1 +com_skipSignInManager 1" # Additional launch options
##export PW_VULKAN_USE=1 # 1 ,dxvk or 0 for OpenGL
-##export PW_USE_DXR10=1
-##export PW_DLSS_ON=1
##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_OLD_GL_STRING=1
##export PW_HIDE_NVIDIA_GPU=1
diff --git a/data_from_portwine/scripts/portwine_db/warframe b/data_from_portwine/scripts/portwine_db/warframe
index ab280ca5..a6bfc734 100644
--- a/data_from_portwine/scripts/portwine_db/warframe
+++ b/data_from_portwine/scripts/portwine_db/warframe
@@ -25,7 +25,6 @@ export PW_USE_NVAPI_AND_DLSS="0"
export PW_USE_FAKE_DLSS="0"
export PW_WINE_FULLSCREEN_FSR="1"
export PW_USE_GAMEMODE="1"
-export PW_DX12_DISABLE="0"
export PW_USE_D3D_EXTRAS="1"
export PW_FIX_VIDEO_IN_GAME="0"
export PW_USE_US_LAYOUT="0"
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 50c32f7b..7caa24e0 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -488,7 +488,6 @@ start_portwine () {
stop_portwine
fi
export mesa_glthread=true
- export PW_DX12_DISABLE=1
export ENABLE_VKBASALT=0
export PW_MANGOHUD=0
export WINE_FULLSCREEN_FSR=0
@@ -547,11 +546,6 @@ start_portwine () {
try_force_link_file "${PATH_TO_D8VK_FILES}/x32/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/d3d8.dll"
var_winedlloverride_update d3d8=n
fi
-
- if [[ "${PW_DX12_DISABLE}" == 1 ]]
- then var_winedlloverride_update "d3d12,d3d12core="
- else var_winedlloverride_update "d3d12,d3d12core=n"
- fi
if [[ ! -d "${WINEPREFIX}/drive_c/vrclient/bin" ]] ; then
create_new_dir "${WINEPREFIX}/drive_c/vrclient/bin"
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index b70c2606..ef33e355 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -469,7 +469,7 @@ pw_edit_db () {
pw_gui_for_edit_db \
PW_MANGOHUD 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_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \
+ PW_GUI_DISABLED_CS PW_USE_GAMEMODE 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 PW_USE_GAMESCOPE
if [ "$?" == 0 ] ; then