Improved vulkan driver detection condition for PW_VULKAN_USE

This commit is contained in:
2025-07-23 21:27:27 +05:00
parent 7c6ecdd518
commit bdb90516a6

View File

@ -567,14 +567,38 @@ if [[ -f "$portwine_exe" ]] ; then
fi fi
fi fi
if [[ -z $PW_VULKAN_USE ]] \ [[ $PW_VULKAN_USE =~ [3-5] ]] && unset PW_VULKAN_USE
|| (( PW_VULKAN_USE > 2 )) ; then if [[ -z $PW_VULKAN_USE ]] ; then
pw_check_vulkan pw_check_vulkan
VULKAN_VERSION_CHECK=$(grep "apiVersion" "${PW_TMPFS_PATH}/vulkaninfo.tmp" 2>/dev/null) if [[ -f "${PW_TMPFS_PATH}/vulkaninfo.tmp" ]] ; then
if [[ $VULKAN_VERSION_CHECK =~ 1.[3-9]. ]] ; then count="0"
export PW_VULKAN_USE="2" while read -r line ; do
elif [[ $VULKAN_VERSION_CHECK =~ 1.[1-2]. ]] ; then [[ $line =~ apiVersion ]] && VULKAN_VERSION_CHECK["$count"]="$line"
export PW_VULKAN_USE="1" [[ $line =~ driverVersion ]] && VULKAN_DRIVER_VERSION["$count"]="$line"
if [[ $line =~ deviceName ]] ; then
if [[ $line =~ "$PW_GPU_USE" ]] ; then
VULKAN_DEVICE_NAME["$count"]="$PW_GPU_USE"
break
else
if [[ $line =~ llvmpipe ]] ; then
unset VULKAN_VERSION_CHECK["$count"] VULKAN_DRIVER_VERSION["$count"]
else
VULKAN_DEVICE_NAME["$count"]="$line"
(( count++ ))
fi
fi
fi
done < "${PW_TMPFS_PATH}/vulkaninfo.tmp"
if [[ ${VULKAN_VERSION_CHECK[@]} =~ 1.[3-9]+. ]] ; then
if [[ ${VULKAN_DEVICE_NAME[@],,} =~ (amd|intel) && ${VULKAN_DRIVER_VERSION[@]} =~ (2[5-9]|[3-9][0-9]). ]] \
|| [[ ${VULKAN_DEVICE_NAME[@],,} =~ nvidia && ${VULKAN_DRIVER_VERSION[@]} =~ (5[5-9][0-9]|[6-9][0-9][0-9]). ]] ; then
export PW_VULKAN_USE="2"
else
export PW_VULKAN_USE="6"
fi
elif [[ ${VULKAN_VERSION_CHECK[@]} =~ 1.[1-2]. ]] ; then
export PW_VULKAN_USE="1"
fi
else else
export PW_VULKAN_USE="0" export PW_VULKAN_USE="0"
fi fi