diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 63b20966..214f7255 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -233,7 +233,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_VUKAN="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $8}'`" + AMD_VULKAN="`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,21 +250,30 @@ pw_gui_for_edit_db () { else export PW_WINE_CPU_TOPOLOGY="disabled" fi - if [[ "${AMD_VUKAN}" == "amdvlk" ]] ; then + if [[ "${AMD_VULKAN}" == "amdvlk" ]] ; then export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_icd32.json:/usr/share/vulkan/icd.d/amd_icd64.json" - elif [[ "${AMD_VUKAN}" == "amdgpupro" ]] ; then + if [[ $(cat /etc/os-release | grep -oP 'PRETTY_NAME="\K[^"]+') == "Nobara" ]] ; 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 export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_pro_icd32.json:/usr/share/vulkan/icd.d/amd_pro_icd64.json" - elif [[ "${AMD_VUKAN}" == "radv" ]] ; then + if [[ $(cat /etc/os-release | grep -oP 'PRETTY_NAME="\K[^"]+') == "Nobara" ]] ; 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" + 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 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_VUKAN}" == "radv_aco" ]] ; then + elif [[ "${AMD_VULKAN}" == "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_VUKAN}" == "radv_gpl" ]] ; then + elif [[ "${AMD_VULKAN}" == "radv_gpl" ]] ; then unset RADV_PERFTEST export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 export RADV_PERFTEST=gpl @@ -273,7 +282,7 @@ pw_gui_for_edit_db () { # Debug echo (nedded delete) echo $VK_ICD_FILENAMES echo $RADV_PERFTEST - echo $AMD_VUKAN + 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 return 0