diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d0281e5e..5deba5c5 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -503,22 +503,27 @@ pw_mangohud_check () { return 0 } -pw_vkbasalt_check () { - if [[ "${ENABLE_VKBASALT}" == 1 ]] && [[ "${PW_VULKAN_USE}" != "0" ]] && [[ "${PW_VULKAN_USE}" != "3" ]] ; then - if [[ -z "${PW_VKBASALT_EFFECTS}" ]] ; then - export PW_VKBASALT_EFFECTS="Curves:cas" +pw_reshade_check () { + if [[ "${ENABLE_RESHADE}" == 1 ]] && [[ "${PW_VULKAN_USE}" != "0" ]] ; then + if [[ $(file "$portwine_exe") =~ x86-64 ]]; then + portwine_exe_arch=64 fi - sed -ri "s/effects = .*/effects = ${PW_VKBASALT_EFFECTS}/g" "${PORT_WINE_PATH}/data/vkBasalt.conf" - if [[ -z "${PW_VKBASALT_FFX_CAS}" ]] ; then - export PW_VKBASALT_FFX_CAS="0.7" + if [[ "$portwine_exe_arch" == "64" ]] ; then + $WINEDLLOVERRIDES="d3dcompiler_47=n,dxgi=n,b" + ln -is /run/pressure-vessel/pv-from-host/reshade/ReShade64.dll "$portwine_exe/dxgi.dll" + else + $WINEDLLOVERRIDES="d3dcompiler_47=n,d3d9=n.b" + ln -is /run/pressure-vessel/pv-from-host/reshade/ReShade32.dll "$portwine_exe/d3d9.dll" fi - sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${PORT_WINE_PATH}/data/vkBasalt.conf" - export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf" - var_vk_istance_layers_config_update "VK_LAYER_VKBASALT_post_processing64:VK_LAYER_VKBASALT_post_processing32" - print_info "vkBasalt is enabled" + + ln -is /run/pressure-vessel/pv-from-host/ReShade32.json "$portwine_exe/" + ln -is /run/pressure-vessel/pv-from-host/ "$portwine_exe/" + ln -is /run/pressure-vessel/pv-from-host/reshade/textures "$portwine_exe/" + ln -is /run/pressure-vessel/pv-from-host/reshade "$portwine_exe/" + print_info "Reshade is enabled" else - export DISABLE_VKBASALT=1 - print_info "vkBasalt is disabled" + export DISABLE_RESHADE=1 + print_info "Reshade is disabled" fi return 0 } diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index e30a0e85..9b47c66e 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -100,7 +100,6 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_edit_db="Изменить файл настроек для" export loc_download_other_wine="Открыть меню для скачивания других версий WINE-PROTON" - export ENABLE_VKBASALT_INFO='Включить vkBasalt по умолчанию для улучшение графики в играх работающих под Vulkan. (Горячая клавиша HOME отключает vkbasalt)' export PW_NO_ESYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе eventfd. (Рекомендуется не изменять значение)' export PW_NO_FSYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе фьютексов. (Автоматически отключается в системах без FUTEX_WAIT_MULTIPLE поддержки) (Рекомендуется не изменять значение)' export PW_USE_RAY_TRACING_INFO='Включить поддержку vkd3d - Ray Tracing' @@ -135,62 +134,6 @@ if [[ "${update_loc}" == "RUS" ]] ; then export PW_USE_EAC_AND_BE_INFO='Включить Easy Anti-Cheat and BattlEye Anti-Cheat (требуется если игра использует какой-то из этих античитов)' export PW_REDUCE_PULSE_LATENCY_INFO='Уменьшить задержку pulseaudio для исправления прерывистого звука' export PW_USE_US_LAYOUT_INFO='Принудительное использование английской раскладки (полезно для игр в которых управление верно работает исключительно на английской раскладке)' - - export PW_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)' - export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместно с CAS' - export PW_Bloom_INFO='Добавляет свечения от ярких источников света в игре' - export PW_Border_INFO='Обрезка изображения сверху и снизу (как в кино =)' - export PW_Cartoon_INFO='Сильное увеличение резкости краев текстур' - export PW_ChromaticAberration_INFO='Добавляет хроматические аберрации к изображению' - export PW_Clarity_INFO='Увеличение резкости текстур с небольшими модификациями контраста изображения (похож по эффекту на CAS)' - export PW_ColorMatrix_INFO='Добавление холодных цветов' - export PW_Colourfulness_INFO='Увеличение насыщенности цветов' - export PW_FakeHDR_INFO='Расширение динамического диапазона цветов' - export PW_FilmGrain2_INFO='Добавление эффекта зерна кинопленки' - export PW_Curves_INFO='Увеличивает контрастность изображения, при этом не трогая яркие и тёмные участки, чтобы не пропала детализация в тенях и небе' - export PW_Denoise_INFO='Уменьшение шумов за счет смазывания изображения' - export PW_Emphasize_INFO='Уменьшение разрядности цветопередачи' - export PW_FakeMotionBlur_INFO='Сильное размытие объектов в движении' - export PW_FilmicAnamorphSharpen_INFO='Увеличение резкости (рекомендую для мультяшных игр)' - export PW_FilmicPass_INFO='Добавление холодных цветов' - export PW_SMAA_INFO='Альтернативный вариант сглаживания (меньший эффект, но с меньшим потреблением ресурсов GPU, относительно стандартного SMAA)' - export PW_GaussianBlur_INFO='Небольшой эффект размытия ярких объектов (например пламя)' - export PW_Glitch_INFO='Эффект глючной картинки' - export PW_HighPassSharpen_INFO='Повышения резкости с использованием высокочастотных частот' - export PW_HQ4X_INFO='Сглаживание близлежащих пикселей с дорисовкой недостающих частей (в обычных играх картинка размывается)' - export PW_HSLShift_INFO='Усовершенствованный сдвиг HSL (для каждого оттенка)' - export PW_Layer_INFO='Наложение изображения на игру (изображение лежит в папке ~/PortWINE/PortProton/data/tmp/libs_v43/pressure-vessel/reshade/textures)' - export PW_Levels_INFO='Увеличивает контрастность, но некоторые детали в тенях или бликах могут быть потеряны' - export PW_LevelsPlus_INFO='Тоже что и Levels, но с меньшей потерей деталей' - export PW_LiftGammaGain_INFO='Коррекция гаммы по отдельным цветовым каналам: красному, зелёному и синему' - export PW_LightDoF_INFO='Увеличивает глубину резкости (сильно влияет на FPS)' - export PW_LumaSharpen_INFO='Повышает резкость изображения для улучшения деталей' - export PW_LUT_INFO='Цветокорекция изображения' - export PW_MagicBloom_INFO='Тоже самое что Bloom, но более естественный' - export PW_Monochrome_INFO='Преобразует изображение в черно-белое' - export PW_MultiLUT_INFO='Расширенная версия LUT (предустановлен лут Hollywood)' - export PW_MXAO_INFO='Алгоритм SSAO (сильно влияет на FPS)' - export PW_NightVision_INFO='Эффект ночного зрения' - export PW_Nostalgia_INFO='Делает картинку похожей на старые фотографии' - export PW_PerfectPerspective_INFO='Эффект рыбьего глаза (подходит для VR)' - export PW_PPFX_Godrays_INFO='Объёмное рассеяние света' - export PW_Prism_INFO='Эффект призматической линзы' - export PW_ReflectiveBumpMapping_INFO='Создаёт иллюзию глубины текстур' - export PW_Sepia_INFO='Добавляет эффект сепии со старых фотографий' - export PW_Splitscreen_INFO='Разделяет изображение на необработанное и обработанный вывод для сравнения' - export PW_SurfaceBlur_INFO='Снижение детализации объектов без размытия контрастных контуров' - export PW_Technicolor_INFO='Делает картинку похожей на фильмы 1930 годов' - export PW_Technicolor2_INFO='Обновлённая версия Technicolor, даёт иную картинку, агрессивнее меняя цвета' - export PW_TiltShift_INFO='Размытие по краям экрана для создания эффекта миниатюры' - export PW_Tonemap_INFO='Изменяет насыщенность картинки' - export PW_TriDither_INFO='Уменьшает количество шумов' - export PW_UIDetect_INFO='Автоматически переключает эффекты в зависимости от видимости UI' - export PW_Vibrance_INFO='Насыщает блеклые цвета, не трогая яркие' - export PW_Vignette_INFO='Добавляет к изображению виньетку' - export PW_AspectRatio_INFO='Эффект для настройки соотношения сторон (для игр которые не поддерживают широкоформатные мониторы)' - export PW_UIMask_INFO='Часть общего шейдера ReShade . Он использует маску с градиентами от черного к белому, чтобы определить, где будут применены эффекты' - export PW_StageDepth_INFO='Позволяет добавлять новые элементы в 3d-пространство внутри игры и применять пользовательские текстуры' - export PW_PPFX_Bloom_INFO='Добавляет Bloom эффект' export PW_WAYLAND_INFO="Внимание! Вы запускаете ${portname} в сессии Wayland, некоторые функции могут быть недоступны!\nРекомендуется перезапустить сессию в X11!" @@ -352,7 +295,6 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export loc_edit_db="Edit database file for" export loc_download_other_wine="Open the menu to download other versions of WINE-PROTON " - export ENABLE_VKBASALT_INFO='Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)' export PW_NO_ESYNC_INFO='Do not use in-process synchronization primitives based on eventfd. (It is recommended not to change the value.)' export PW_NO_FSYNC_INFO='Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems without FUTEX_WAIT_MULTIPLE support) (It is recommended not to change the value)' export PW_USE_RAY_TRACING_INFO='Enable vkd3d support - Ray Tracing' @@ -387,62 +329,6 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export PW_USE_EAC_AND_BE_INFO='Enable Easy Anti-Cheat and BattlEye Anti-Cheat runtimes (required if game used this anti-cheats)' export PW_REDUCE_PULSE_LATENCY_INFO='Reduce pulseaudio latency to fix intermittent sound' export PW_USE_US_LAYOUT_INFO='Forced use of the us layout (useful for games in which the control works correctly only on the us layout)' - - export PW_3DFX_INFO='Simulation of an old 3dfx graphics accelerator (adds horizontal stripes)' - export PW_AdaptiveSharpen_INFO='Sharpness increase, can be used with CAS' - export PW_Bloom_INFO='Adds glow from bright light sources in the game' - export PW_Border_INFO='Cropping the image from the top and bottom (like in a movie =)' - export PW_Cartoon_INFO='Strong sharpening of texture edges' - export PW_ChromaticAberration_INFO='Adds chromatic aberration to an image' - export PW_Clarity_INFO='Sharpening textures with slight modifications of image contrast (similar in effect to CAS)' - export PW_ColorMatrix_INFO='Adding cool colors' - export PW_Colourfulness_INFO='Increasing color saturationIncreasing color saturation' - export PW_FakeHDR_INFO='Add fake HDR' - export PW_FilmGrain2_INFO='Adding the film grain effect' - export PW_Curves_INFO='Increases the contrast of the image without affecting the bright and dark areas, so that the detail in shadows and sky is not lost' - export PW_Denoise_INFO='Reducing noise by blurring the image' - export PW_Emphasize_INFO='Reducing the bit depth of color' - export PW_FakeMotionBlur_INFO='Strong blurring of objects in motion' - export PW_FilmicAnamorphSharpen_INFO='Sharpening (recommended for cartoon games)' - export PW_FilmicPass_INFO='Adding cold colors' - export PW_SMAA_INFO='Alternative antialiasing option (less effect, but with less consumption of GPU resources, relative to the standard SMAA)' - export PW_GaussianBlur_INFO='Slight blur effect on bright objects (such as flames)' - export PW_Glitch_INFO='Glitch effect' - export PW_HighPassSharpen_INFO='Another method of sharpening using highpass frequencies' - export PW_HQ4X_INFO='Smoothing of nearby pixels with the drawing of missing parts (in normal games the picture is blurred)' - export PW_HSLShift_INFO='Advanced HSL shift (for each shade)' - export PW_Layer_INFO='Image overlay on the game (the image is in the ~/PortWINE/PortProton/data/tmp/libs_v43/pressure-vessel/reshade/textures folder)' - export PW_Levels_INFO='Increases contrast, but some detail in shadows or highlights may be lost' - export PW_LevelsPlus_INFO='Same as Levels, but with less loss of detail' - export PW_LiftGammaGain_INFO='Gamma correction by individual color channels: red, green and blue' - export PW_LightDoF_INFO='Increases depth of field (greatly affects FPS)' - export PW_LumaSharpen_INFO='Enhances image sharpness for improved detail' - export PW_LUT_INFO='Image color correction' - export PW_MagicBloom_INFO='Same as Bloom, but more natural' - export PW_Monochrome_INFO='Converts the image into monochrome' - export PW_MultiLUT_INFO='Extended version of the LUT (Hollywood loot is pre-installed)' - export PW_MXAO_INFO='SSAO algorithm (Greatly affects FPS)' - export PW_NightVision_INFO='Night vision effect' - export PW_Nostalgia_INFO='Makes the picture look like old photos' - export PW_PerfectPerspective_INFO='Fisheye effect (suitable for VR)' - export PW_PPFX_Godrays_INFO='Add God rays (also called 3D light rays) effect' - export PW_Prism_INFO='The prismatic lens effect' - export PW_ReflectiveBumpMapping_INFO='Creates the illusion of depth in textures' - export PW_Sepia_INFO='Adds a sepia effect like in old photos' - export PW_Splitscreen_INFO='Splits the image into raw and processed output for comparison' - export PW_SurfaceBlur_INFO='Reducing object detail without blurring contrast contours' - export PW_Technicolor_INFO='Makes the picture look like films from the 1930s' - export PW_Technicolor2_INFO='The updated version of Technicolor, gives a different picture by changing colors more aggressively' - export PW_TiltShift_INFO='Blur on the edges of the screen to create a Tilt Shift effect' - export PW_Tonemap_INFO='Changes the saturation of the picture' - export PW_TriDither_INFO='Reduces the amount of noise' - export PW_UIDetect_INFO='Automatically switches effects depending on the visibility of the UI' - export PW_Vibrance_INFO='Saturates faded colors without touching the bright ones' - export PW_Vignette_INFO='Adds a vignette to the image' - export PW_AspectRatio_INFO='An effect for adjusting the aspect ratio (for games that do not support widescreen monitors)' - export PW_UIMask_INFO='Part of the overall ReShade shader . It uses a mask with gradients from black to white to determine where the effects will be applied' - export PW_StageDepth_INFO='Allows you to add new elements to the 3d space inside the game and apply custom textures' - export PW_PPFX_Bloom_INFO='Adds a Bloom effect' export PW_WAYLAND_INFO="Attention! You are running $portname in a Wayland session, some features may not be available!\nRestarting your session in X11 is recommended!" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 7f52ecd3..7a6c95f3 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -68,7 +68,6 @@ start_portwine () { export VKD3D_DEBUG="warn" export WINE_MONO_TRACE="E:System.NotImplementedException" export VK_LOADER_DEBUG="none" - export VKBASALT_LOG_LEVEL="none" export DXVK_NVAPI_LOG_LEVEL=warn else export WINEDEBUG="-all" @@ -76,7 +75,6 @@ start_portwine () { export VKD3D_SHADER_DEBUG="none" export VKD3D_DEBUG="none" export DXVK_LOG_PATH="none" - export VKBASALT_LOG_LEVEL="none" export DXVK_NVAPI_LOG_LEVEL=none fi @@ -401,7 +399,7 @@ start_portwine () { fi export mesa_glthread=true export PW_DX12_DISABLE=1 - export ENABLE_VKBASALT=0 + export ENABLE_RESHADE=0 export PW_MANGOHUD=0 export WINE_FULLSCREEN_FSR=0 elif [[ "${PW_VULKAN_USE}" == "4" ]] ; then @@ -600,7 +598,7 @@ pw_run () { cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c" fi pw_mangohud_check - pw_vkbasalt_check + pw_reshade_check PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log" print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VKD3D_CONFIG" \ "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" "WINEDLLPATH" "WINE_CPU_TOPOLOGY" @@ -652,7 +650,7 @@ else unset PW_GUI_DISABLED_CS fi unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET PW_ICON_FOR_YAD -unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB +unset PW_CHECK_AUTOINSTAL PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PORTWINE_CREATE_SHORTCUT_NAME 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 diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 4812a575..7daef8c3 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -418,7 +418,7 @@ pw_create_prefix_backup () { 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_MANGOHUD PW_MANGOHUD_x32 PW_MANGOHUD_USER_CONF ENABLE_RESHADE 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_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 @@ -445,7 +445,7 @@ pw_autoinstall_from_db () { unset PORTWINE_CREATE_SHORTCUT_NAME export PW_DISABLED_CREATE_DB=1 export PW_MANGOHUD=0 - export ENABLE_VKBASALT=0 + export ENABLE_RESHADE=0 export PW_USE_D3D_EXTRAS=1 . "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}" } @@ -573,7 +573,6 @@ if [ -n "${portwine_exe}" ]; then --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ --field="PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=":LBL" "" \ - --button="${loc_gui_vkbasalt_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${ENABLE_VKBASALT_INFO}":120 \ --button="${loc_gui_edit_db_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_edit_db} ${PORTWINE_DB}":118 \ --button="${PW_SHORTCUT}" \ --button="${loc_gui_debug}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_debug}":102 \ @@ -878,7 +877,6 @@ fi gui_open_scripts_from_backup) gui_open_scripts_from_backup ;; open_changelog) open_changelog ;; change_loc) change_loc ;; - 120) gui_vkBasalt ;; pw_create_prefix_backup) pw_create_prefix_backup ;; gui_credits) gui_credits ;; pw_start_cont_xterm) pw_start_cont_xterm ;; diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 5a01afdf..0b658e9a 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -3,7 +3,7 @@ #SCRIPTS_NEXT_VERSION=2221 ######################################################################## export PW_MANGOHUD=0 -export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt +export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution #export PW_XKBD_RU_HACK=1 export PW_RT_MOUNT_RO=("") export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 277aefaa..e8cb88ed 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -415,76 +415,6 @@ gui_proton_downloader () { } export -f gui_proton_downloader -gui_vkBasalt () { - KEY_FX_GUI=$RANDOM - FILE_VKBASALT_CONF="${PORT_WINE_PATH}/data/vkBasalt.conf" - LIST_FX=(`grep -E '.fx$|.fxh$' "${FILE_VKBASALT_CONF}" | awk '{print $1}'`) - GET_FX_IN_FILE=(`echo ${PW_VKBASALT_EFFECTS} | sed s/"cas:"// | sed s/":"/" "/g`) - unset ADD_GUI_FX GUI_FX_RESULT - for add_list_fx in ${LIST_FX[@]} ; do - PW_VKBASALT_GUI_HELP="PW_${add_list_fx}_INFO" - if [[ ! -z `echo " ${GET_FX_IN_FILE[@]} " | grep " ${add_list_fx} "` ]] ; then - ADD_GUI_FX+="--field=$add_list_fx!${!PW_VKBASALT_GUI_HELP}:CHK%TRUE%" - else - ADD_GUI_FX+="--field=$add_list_fx!${!PW_VKBASALT_GUI_HELP}:CHK%FALSE%" - fi - done - if [[ ! -z "${PW_VKBASALT_FFX_CAS}" ]] ; then - VKBASALT_FFX_CAS_GUI=`bc -s <<< "${PW_VKBASALT_FFX_CAS}*100" | sed 's/\..*//'` - else - VKBASALT_FFX_CAS_GUI=75 - fi - export old_IFS=$IFS - export IFS="%" - "${pw_yad_v12_3}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=5 --separator=" " \ - --text-align=center --text="$loc_gui_vkbasalt_top" \ - ${ADD_GUI_FX} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set" 2>/dev/null & - export IFS="${old_IFS}" - - "${pw_yad_v12_3}" --plug=$KEY_FX_GUI --tabnum="2" --separator=" " --form \ - --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$loc_gui_ffx_cas":SCL "${VKBASALT_FFX_CAS_GUI}" \ - 1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" 2>/dev/null & - - "${pw_yad_v12_3}" --paned --key="$KEY_FX_GUI" --height="650" --title="vkBasalt" --center --borders=3 \ - --separator=" " --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ - --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ - --button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \ - --button="$loc_gui_save_changes"!!"$loc_gui_save_changes_help":182 2>/dev/null - YAD_VKBASALT_STATUS="$?" - case "${YAD_VKBASALT_STATUS}" in - 1|252) - /usr/bin/env bash -c ${pw_full_command_line[*]} & - exit 0 ;; - 180) - export ENABLE_VKBASALT=0 ;; - 182) - export ENABLE_VKBASALT=1 ;; - esac - YAD_BASALT_SET=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set"` - YAD_CAS_SET=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" | sed s/" "//g` - - INT_COUNT_FX=0 - for read_list_fx in ${YAD_BASALT_SET} ; do - if [[ "$read_list_fx" == "TRUE" ]] ; then - export GUI_FX_RESULT+="${LIST_FX[$INT_COUNT_FX]}:" - fi - export INT_COUNT_FX=$(( ${INT_COUNT_FX} + 1 )) - done - GUI_FX_RESULT="${GUI_FX_RESULT}cas" - export PW_VKBASALT_EFFECTS="${GUI_FX_RESULT}" - - if [[ "$YAD_CAS_SET" == "0" ]] ; then - export PW_VKBASALT_FFX_CAS="0" - elif [[ "$YAD_CAS_SET" == "100" ]] ; then - export PW_VKBASALT_FFX_CAS="1" - else - export PW_VKBASALT_FFX_CAS="0`bc -s <<< "scale=2; $YAD_CAS_SET/100"`" - fi - edit_db_from_gui PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS ENABLE_VKBASALT - /usr/bin/env bash -c ${pw_full_command_line[*]} & - exit 0 -} - portwine_create_shortcut () { pw_create_gui_png name_desktop="${PORTPROTON_NAME}" diff --git a/data_from_portwine/vkBasalt.conf b/data_from_portwine/vkBasalt.conf deleted file mode 100755 index 833202c1..00000000 --- a/data_from_portwine/vkBasalt.conf +++ /dev/null @@ -1,62 +0,0 @@ -reshadeTexturePath = /run/pressure-vessel/pv-from-host/reshade/textures -reshadeIncludePath = /run/pressure-vessel/pv-from-host/reshade - -FilmGrain2 = /run/pressure-vessel/pv-from-host/reshade/shaders/FilmGrain2.fx -Curves = /run/pressure-vessel/pv-from-host/reshade/shaders/Curves.fx -FakeHDR = /run/pressure-vessel/pv-from-host/reshade/shaders/FakeHDR.fx -Colourfulness = /run/pressure-vessel/pv-from-host/reshade/shaders/Colourfulness.fx -Bloom = /run/pressure-vessel/pv-from-host/reshade/shaders/Bloom.fx -SMAA = /run/pressure-vessel/pv-from-host/reshade/shaders/SMAA.fx -ChromaticAberration = /run/pressure-vessel/pv-from-host/reshade/shaders/ChromaticAberration.fx -Denoise = /run/pressure-vessel/pv-from-host/reshade/shaders/Denoise.fx -Clarity = /run/pressure-vessel/pv-from-host/reshade/shaders/Clarity.fx -Emphasize = /run/pressure-vessel/pv-from-host/reshade/shaders/Emphasize.fx -FakeMotionBlur = /run/pressure-vessel/pv-from-host/reshade/shaders/FakeMotionBlur.fx -FilmicAnamorphSharpen = /run/pressure-vessel/pv-from-host/reshade/shaders/FilmicAnamorphSharpen.fx -FilmicPass = /run/pressure-vessel/pv-from-host/reshade/shaders/FilmicPass.fx -GaussianBlur = /run/pressure-vessel/pv-from-host/reshade/shaders/GaussianBlur.fx -Glitch = /run/pressure-vessel/pv-from-host/reshade/shaders/Glitch.fx -HighPassSharpen = /run/pressure-vessel/pv-from-host/reshade/shaders/HighPassSharpen.fx -HQ4X = /run/pressure-vessel/pv-from-host/reshade/shaders/HQ4X.fx -HSLShift = /run/pressure-vessel/pv-from-host/reshade/shaders/HSLShift.fx -Layer = /run/pressure-vessel/pv-from-host/reshade/shaders/Layer.fx -Levels = /run/pressure-vessel/pv-from-host/reshade/shaders/Levels.fx -LevelsPlus = /run/pressure-vessel/pv-from-host/reshade/shaders/LevelsPlus.fx -LiftGammaGain = /run/pressure-vessel/pv-from-host/reshade/shaders/LiftGammaGain.fx -LightDoF = /run/pressure-vessel/pv-from-host/reshade/shaders/LightDoF.fx -LumaSharpen = /run/pressure-vessel/pv-from-host/reshade/shaders/LumaSharpen.fx -LUT = /run/pressure-vessel/pv-from-host/reshade/shaders/LUT.fx -MagicBloom = /run/pressure-vessel/pv-from-host/reshade/shaders/MagicBloom.fx -Monochrome = /run/pressure-vessel/pv-from-host/reshade/shaders/Monochrome.fx -MultiLUT = /run/pressure-vessel/pv-from-host/reshade/shaders/MultiLUT.fx -MXAO = /run/pressure-vessel/pv-from-host/reshade/shaders/MXAO.fx -NightVision = /run/pressure-vessel/pv-from-host/reshade/shaders/NightVision.fx -Nostalgia = /run/pressure-vessel/pv-from-host/reshade/shaders/Nostalgia.fx -PerfectPerspective = /run/pressure-vessel/pv-from-host/reshade/shaders/PerfectPerspective.fx -PPFX_Bloom = /run/pressure-vessel/pv-from-host/reshade/shaders/PPFX_Bloom.fx -PPFX_Godrays = /run/pressure-vessel/pv-from-host/reshade/shaders/PPFX_Godrays.fx -Prism = /run/pressure-vessel/pv-from-host/reshade/shaders/Prism.fx -ReflectiveBumpMapping = /run/pressure-vessel/pv-from-host/reshade/shaders/ReflectiveBumpMapping.fx -Sepia = /run/pressure-vessel/pv-from-host/reshade/shaders/Sepia.fx -Splitscreen = /run/pressure-vessel/pv-from-host/reshade/shaders/Splitscreen.fx -StageDepth = /run/pressure-vessel/pv-from-host/reshade/shaders/StageDepth.fx -SurfaceBlur = /run/pressure-vessel/pv-from-host/reshade/shaders/SurfaceBlur.fx -Technicolor = /run/pressure-vessel/pv-from-host/reshade/shaders/Technicolor.fx -Technicolor2 = /run/pressure-vessel/pv-from-host/reshade/shaders/Technicolor2.fx -TiltShift = /run/pressure-vessel/pv-from-host/reshade/shaders/TiltShift.fx -Tonemap = /run/pressure-vessel/pv-from-host/reshade/shaders/Tonemap.fx -TriDither = /run/pressure-vessel/pv-from-host/reshade/shaders/TriDither.fx -UIDetect = /run/pressure-vessel/pv-from-host/reshade/shaders/UIDetect.fx -UIMask = /run/pressure-vessel/pv-from-host/reshade/shaders/UIMask.fx -Vibrance = /run/pressure-vessel/pv-from-host/reshade/shaders/Vibrance.fx -Vignette = /run/pressure-vessel/pv-from-host/reshade/shaders/Vignette.fx -AdaptiveSharpen = /run/pressure-vessel/pv-from-host/reshade/shaders/AdaptiveSharpen.fx -ColorMatrix = /run/pressure-vessel/pv-from-host/reshade/shaders/ColorMatrix.fx -Cartoon = /run/pressure-vessel/pv-from-host/reshade/shaders/Cartoon.fx -3DFX = /run/pressure-vessel/pv-from-host/reshade/shaders/3DFX.fx -Border = /run/pressure-vessel/pv-from-host/reshade/shaders/Border.fx -AspectRatio = /run/pressure-vessel/pv-from-host/reshade/shaders/AspectRatio.fx - -casSharpness = 0.7 -toggleKey = Home -effects = FakeHDR:cas