From 996fbfdd459f39c0548b9adc05dece906a442614 Mon Sep 17 00:00:00 2001 From: Boria138 Date: Tue, 12 Dec 2023 21:49:41 +0600 Subject: [PATCH] minor fix --- data_from_portwine/scripts/runlib | 2 +- data_from_portwine/scripts/start.sh | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index d37a7636..9ad6f1f4 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -773,7 +773,7 @@ create_new_dir "${PORT_WINE_TMP_PATH}"/mono export PW_VULKAN_DIR="${PORT_WINE_TMP_PATH}/VULKAN" create_new_dir "${PW_VULKAN_DIR}" -export VULKAN_API_DRIVER_VERSION="$(vulkaninfo 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')" +export VULKAN_API_DRIVER_VERSION="$(vulkaninfo --summary 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')" export VULKAN_DRIVER_NAME="$(vulkaninfo --summary 2>/dev/null | grep driverName | awk '{print$3}' | head -1)" export LSPCI_VGA="$(lspci -k | grep -E 'VGA|3D' | tr -d '\n')" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index c0b8ec72..b8de7894 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -28,9 +28,8 @@ if [[ "${XDG_SESSION_TYPE}" = "wayland" ]] && [[ ! -f "${PORT_WINE_TMP_PATH}/che echo "1" > "${PORT_WINE_TMP_PATH}/check_wayland" fi -if [[ -z "$VULKAN_DRIVER_NAME" ]] || [[ "$VULKAN_DRIVER_NAME" =~ "llvmpipe" ]] || [[ ! -f "${PORT_WINE_TMP_PATH}/check_vulkan" ]] ; then +if [[ -z "$VULKAN_DRIVER_NAME" ]] || [[ "$VULKAN_DRIVER_NAME" == "llvmpipe" ]] ; then zenity_info "Attention working version of vulkan not detected!\nIt is recommended to run games in OpenGL (low performance possible)!" - echo "1" > "${PORT_WINE_TMP_PATH}/check_vulkan" fi if [[ -f "${PORT_WINE_TMP_PATH}/tmp_main_gui_size" ]] && [[ ! -z "$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size)" ]] ; then @@ -563,10 +562,10 @@ do export DIST_ADD_TO_GUI="${DIST_ADD_TO_GUI}!${DAIG}" done -if [[ $VULKAN_API_DRIVER_VERSION == 1.[1-2].* ]] -then check_variables PW_VULKAN_USE "1" -else check_variables PW_VULKAN_USE "2" -fi +# if [[ $VULKAN_API_DRIVER_VERSION == 1.[1-2].* ]] +# then check_variables PW_VULKAN_USE "1" +# else check_variables PW_VULKAN_USE "2" +# fi check_nvidia_rtx && check_variables PW_VULKAN_USE "2" case "${PW_VULKAN_USE}" in