Completely finished the job

data_from_portwine/scripts/functions_helper

@@ -202,6 +202,15 @@ var_vk_istance_layers_config_update () {
     return 0
 }
 
+var_ld_library_path_update() {
+    if [ ! -z "${LD_LIBRARY_PATH}" ]; then
+        export LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH"
+    else
+        export LD_LIBRARY_PATH="$1"
+    fi
+    return 0
+}
+
 unpack_tar_zst () {
     set -o pipefail
     unset PW_ZSTD_PORT
@@ -818,7 +827,7 @@ pw_check_and_download_plugins () {
 }
 
 check_nvidia_rtx () {
-    if echo "$LSPCI_VGA" | grep -i "nvidia" ; then          
+    if [[ $(echo "$LSPCI_VGA" | grep -i "nvidia") ]] ; then
         # Turing (without nvidia 16XX)
         [[ "$LSPCI_VGA" == *TU[0-9]* ]] && [[ "$LSPCI_VGA" != *TU11[6-7]* ]] && return 0
         # Ampere
@@ -830,7 +839,7 @@ check_nvidia_rtx () {
 }
 
 check_hybrid_graphicks () {
-    if echo "$LSPCI_VGA" | grep -i nvidia | grep -iE '(intel|amd)'
+    if [[ $(echo "$LSPCI_VGA" | grep -i nvidia | grep -i -E '(intel|amd)') ]]
     then return 0
     else return 1
     fi

data_from_portwine/scripts/zen_yad_gui

@@ -159,6 +159,11 @@ pw_gui_for_edit_db () {
     else
         CPU_LIMIT_VAR="disabled"
     fi
+    if [[ ! -z "${PW_AMD_VULKAN_USE}" ]] && [[ "${PW_AMD_VULKAN_USE}" != "default" ]] ; then
+        AMD_VULKAN_VAR="${PW_AMD_VULKAN_USE}"
+    else
+        AMD_VULKAN_VAR="default"
+    fi
 
     GET_REFRASH_RATE="30!45!60!75!120!144!165!240"
 
@@ -201,7 +206,7 @@ pw_gui_for_edit_db () {
     --field="${loc_gui_arg_exe}!${loc_gui_arg_exe_help} :CBE" "\\${LAUNCH_PARAMETERS[@]}!-dx11 -skipintro 1" \
     --field=":LBL" "" \
     --field="${loc_gui_cpu_limit}!${loc_gui_cpu_limit_help} :CB" "${CPU_LIMIT_VAR}!disabled!${GET_LOGICAL_CORE}" \
-    --field="${loc_gui_amd_vulkan_select}!${loc_gui_amd_vulkan_select} :CB" "${AMD_VUKAN_VAR}!default!amdvlk!amdgpupro!radv!radv_gpl!radv_aco" \
+    --field="${loc_gui_amd_vulkan_select}!${loc_gui_amd_vulkan_select} :CB" "${AMD_VULKAN_VAR}!default!amdvlk!amdgpupro!radv!radv_gpl!radv_aco" \
     --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!${GET_REFRASH_RATE}"  2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null &
     "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="650" \
     --text "${loc_gui_edit_db} <b>${PORTWINE_DB}</b>\n ${loc_gui_edit_db_help}" --separator=" " --borders=3 \
@@ -233,7 +238,7 @@ pw_gui_for_edit_db () {
     WINEDLLOVERRIDES=`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $3}'`
     LAUNCH_PARAMETERS=`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $5}'`
     CPU_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $7}'`"
-    AMD_VULKAN="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $8}'`"
+    PW_AMD_VULKAN_USE="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $8}'`"
     FPS_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $9}'`"
 
     if [[ "${FPS_LIMIT}" != "disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "disabled" ]] ; then
@@ -250,41 +255,37 @@ pw_gui_for_edit_db () {
     else
         export PW_WINE_CPU_TOPOLOGY="disabled"
     fi
-    if [[ "${AMD_VULKAN}" == "amdvlk" ]] ; then
+    if [[ "${PW_AMD_VULKAN_USE}" == "amdvlk" ]] ; then
         export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1
         if [[ $(grep -i -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release") ]] ; then
             export VK_ICD_FILENAMES="/opt/amdgpu/etc/vulkan/icd.d/amd_icd32.json:/opt/amdgpu/etc/vulkan/icd.d/amd_icd64.json"
         else
             export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_icd32.json:/usr/share/vulkan/icd.d/amd_icd64.json"
         fi
-    elif [[ "${AMD_VULKAN}" == "amdgpupro" ]] ; then
+    elif [[ "${PW_AMD_VULKAN_USE}" == "amdgpupro" ]] ; then
         export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1
         if [[ $(grep -i -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release") ]] ; then
             export VK_ICD_FILENAMES="/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd32.json:/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd64.json"
-            export LD_LIBRARY_PATH="/opt/amdgpu/libdrm/lib64:/opt/amdgpu/libdrm/lib32:$LD_LIBRARY_PATH"
+            var_ld_library_path_update "/opt/amdgpu/libdrm/lib64:/opt/amdgpu/libdrm/lib32"
         else
             export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_pro_icd32.json:/usr/share/vulkan/icd.d/amd_pro_icd64.json"
         fi
-    elif [[ "${AMD_VULKAN}" == "radv" ]] ; then
+    elif [[ "${PW_AMD_VULKAN_USE}" == "radv" ]] ; then
         export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1
         export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json"
-    elif [[ "${AMD_VULKAN}" == "radv_aco" ]] ; then
+    elif [[ "${PW_AMD_VULKAN_USE}" == "radv_aco" ]] ; then
         unset RADV_PERFTEST
         export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1
         export RADV_PERFTEST=aco
         export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json"
-    elif [[ "${AMD_VULKAN}" == "radv_gpl" ]] ; then
+    elif [[ "${PW_AMD_VULKAN_USE}" == "radv_gpl" ]] ; then
         unset RADV_PERFTEST
         export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1
         export RADV_PERFTEST=gpl
         export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json"
     fi
-    # Debug echo (nedded delete)
-    echo $VK_ICD_FILENAMES
-    echo $RADV_PERFTEST
-    echo $AMD_VULKAN
     echo "pw_gui_for_edit_db PORTWINE_DB_FILE=$PORTWINE_DB_FILE"
-    edit_db_from_gui $@ MANGOHUD_CONFIG LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES PW_WINE_CPU_TOPOLOGY
+    edit_db_from_gui $@ MANGOHUD_CONFIG LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES PW_WINE_CPU_TOPOLOGY PW_AMD_VULKAN_USE
     return 0
 }