fixed double used mangohud and vkbasalt

data_from_portwine/scripts/functions_helper

@@ -665,26 +665,38 @@ pw_mangohud_check () {
     if [[ "${PW_MANGOHUD}" == "1" ]] \
     && ! check_gamescope_session
     then
+        if [[ "$PW_USE_SYSTEM_VK_LAYERS" != "1" ]] ; then
+            sed -i 's/: "VK_LAYER/: "PW_VK_LAYER/' "${PW_PLUGINS_PATH}/portable/share/vulkan/implicit_layer.d"/MangoHud*.json
+            var_pw_vk_istance_layers_config_update "PW_VK_LAYER_MANGOHUD_overlay64:PW_VK_LAYER_MANGOHUD_overlay32"
+            print_info "Portable MANGOHUD is enabled"
+        else
+            print_info "System MANGOHUD is enabled"
+        fi
         export PW_MANGOHUD_SLR='MANGOHUD=1'
         MANGOHUD_LIB_NAME="libMangoHud.so"
         if [[ "${PW_VULKAN_USE}" = "0" ]] ; then
-	        MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:libMangoHud_opengl.so:${MANGOHUD_LIB_NAME}"
+            MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:libMangoHud_opengl.so:${MANGOHUD_LIB_NAME}"
         fi
         if [[ ! -z "${PW_LD_PRELOAD}" ]]
         then export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${MANGOHUD_LIB_NAME}"
         else export PW_LD_PRELOAD="${MANGOHUD_LIB_NAME}"
         fi
-        var_pw_vk_istance_layers_config_update "VK_LAYER_MANGOHUD_overlay64:VK_LAYER_MANGOHUD_overlay32"
-        print_info "Portable MANGOHUD is enabled"
     else
         export PW_MANGOHUD_SLR=""
-        print_info "Portable MANGOHUD is disabled"
+        print_info "MANGOHUD is disabled"
     fi
     return 0
 }
 
 pw_vkbasalt_check () {
     if [[ "${ENABLE_VKBASALT}" == "1" ]] ; then
+        if [[ "$PW_USE_SYSTEM_VK_LAYERS" != "1" ]] ; then
+            sed -i 's/: "VK_LAYER/: "PW_VK_LAYER/' "${PW_PLUGINS_PATH}/portable/share/vulkan/implicit_layer.d"/vkBasalt*.json
+            var_pw_vk_istance_layers_config_update "PW_VK_LAYER_VKBASALT_post_processing64:PW_VK_LAYER_VKBASALT_post_processing32"
+            print_info "Portable vkBasalt is enabled"
+        else
+            print_info "System vkBasalt is enabled"
+        fi
         export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf"
         if ! grep "${PW_PLUGINS_PATH}/reshade" "${VKBASALT_CONFIG_FILE}" &>/dev/null
         then sed -ri "s|= .*/reshade|= \"${PW_PLUGINS_PATH}\"/reshade|g" "${VKBASALT_CONFIG_FILE}"
@@ -693,8 +705,6 @@ pw_vkbasalt_check () {
             sed -ri "s/effects = .*/effects = ${PW_VKBASALT_EFFECTS}/g" "${VKBASALT_CONFIG_FILE}"
             sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${VKBASALT_CONFIG_FILE}"
         fi
-        var_pw_vk_istance_layers_config_update "VK_LAYER_VKBASALT_post_processing64:VK_LAYER_VKBASALT_post_processing32"
-        print_info "vkBasalt is enabled"
     else
         export DISABLE_VKBASALT=1
         print_info "vkBasalt is disabled"
@@ -1583,6 +1593,17 @@ start_portwine () {
     then pw_check_and_download_wine "${PW_WINE_USE}"
     fi
     init_wine_ver
+
+    if [[ "$PW_USE_OBS_VKCAPTURE" == "1" ]] ; then
+        export OBS_VKCAPTURE="1"
+        if ! check_flatpak ; then
+            export PW_USE_SYSTEM_VK_LAYERS="1"
+            print_warning "System mangohud, vkBasalt, obs-vk capture and other applications using vulkan layers are forcibly used."
+        else
+            export PW_USE_SYSTEM_VK_LAYERS="0"
+        fi
+    fi
+
     pw_init_runtime
 
     if [[ "${PW_USE_GSTREAMER}" == "1" ]] ; then
@@ -1679,12 +1700,6 @@ start_portwine () {
     fi
     echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
 
-    if [[ "$PW_USE_OBS_VKCAPTURE" == "1" ]] ; then
-        export OBS_VKCAPTURE="1"
-        export PW_USE_SYSTEM_VK_LAYERS="1"
-        print_warning "System mangohud, vkBasalt, obs-vk capture and other applications using vulkan layers are forcibly used."
-    fi
-
     if [[ "${PW_NO_ESYNC}" == 1 ]]
     then export WINEESYNC="0"
     else export WINEESYNC="1"

data_from_portwine/scripts/start.sh

@@ -195,7 +195,7 @@ if [[ "${INSTALLING_PORT}" == 1 ]] ; then
     return 0
 fi
 
-# check slip update
+# check skip update
 if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \
 && [[ ! -f "/tmp/portproton.lock" ]]
 then
@@ -229,7 +229,7 @@ else pw_download_libs
 fi
 
 pw_init_db
-# change_locale
+
 pw_check_and_download_dxvk_and_vkd3d
 # shellcheck source=/dev/null
 source "${USER_CONF}"

data_from_portwine/scripts/var

@@ -7,7 +7,7 @@ export PW_MANGOHUD="0"
 export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"
 export PW_VKBASALT_EFFECTS="Curves:cas"
 export PW_VKBASALT_FFX_CAS="0.66"
-export ENABLE_VKBASALT=1
+export ENABLE_VKBASALT="1"
 export GAMESCOPE_ARGS="-F fsr"
 export PW_USE_RUNTIME="1"
 export PW_RT_MOUNT_RO=("")