CastroFidel/PortWINE
3
2
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved for dxvk-sarek and new 3d api

Browse Source
This commit is contained in:
Htylol
2025-07-23 23:05:08 +05:00
parent ee108295f4
commit c2ff9aea0a
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data_from_portwine/scripts/functions_helper
View File

@ -3949,7 +3949,7 @@ fi
0) 0)
rm_from_var CP_WINE_FILES "d3d9 d3d8" rm_from_var CP_WINE_FILES "d3d9 d3d8"
;; ;;
1|2) 1|2|6)
rm_from_var CP_DXVK_FILES "d3d9 d3d8" rm_from_var CP_DXVK_FILES "d3d9 d3d8"
;; ;;
esac esac
@ -5471,7 +5471,7 @@ gui_edit_db () {
VKD3D_CB="DCB" VKD3D_CB="DCB"
DISABLE_EDIT_DB_LIST="PW_VKBASALT PW_VKBASALT_USER_CONF PW_USE_RAY_TRACING PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_WINED3D_VULKAN" DISABLE_EDIT_DB_LIST="PW_VKBASALT PW_VKBASALT_USER_CONF PW_USE_RAY_TRACING PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_WINED3D_VULKAN"
;; ;;
1|2) 1|2|6)
# Sarek, Newest # Sarek, Newest
VKD3D_CB="CB" VKD3D_CB="CB"
;; ;;

24
data_from_portwine/scripts/start.sh
View File

@ -571,17 +571,18 @@ if [[ -f "$portwine_exe" ]] ; then
if [[ -z $PW_VULKAN_USE ]] ; then if [[ -z $PW_VULKAN_USE ]] ; then
pw_check_vulkan pw_check_vulkan
if [[ -f "${PW_TMPFS_PATH}/vulkaninfo.tmp" ]] ; then if [[ -f "${PW_TMPFS_PATH}/vulkaninfo.tmp" ]] ; then
unset VULKAN_VERSION_CHECK VULKAN_DRIVER_VERSION VULKAN_DEVICE_NAME
count="0" count="0"
while read -r line ; do while read -r line ; do
[[ $line =~ apiVersion ]] && VULKAN_VERSION_CHECK["$count"]="$line" [[ $line =~ apiVersion ]] && VULKAN_VERSION_CHECK["$count"]="$line"
[[ $line =~ driverVersion ]] && VULKAN_DRIVER_VERSION["$count"]="$line" [[ $line =~ driverVersion ]] && VULKAN_DRIVER_VERSION["$count"]="$line"
if [[ $line =~ deviceName ]] ; then if [[ $line =~ deviceName ]] ; then
if [[ $line =~ "$PW_GPU_USE" ]] ; then if [[ $line == *"$PW_GPU_USE"* ]] ; then
VULKAN_DEVICE_NAME["$count"]="$PW_GPU_USE" VULKAN_DEVICE_NAME["$count"]="$PW_GPU_USE"
break break
else else
if [[ $line =~ llvmpipe ]] ; then if [[ $line =~ llvmpipe ]] ; then
unset VULKAN_VERSION_CHECK["$count"] VULKAN_DRIVER_VERSION["$count"] unset 'VULKAN_VERSION_CHECK["$count"]' 'VULKAN_DRIVER_VERSION["$count"]'
else else
VULKAN_DEVICE_NAME["$count"]="$line" VULKAN_DEVICE_NAME["$count"]="$line"
(( count++ )) (( count++ ))
@ -589,14 +590,17 @@ if [[ -f "$portwine_exe" ]] ; then
fi fi
fi fi
done < "${PW_TMPFS_PATH}/vulkaninfo.tmp" done < "${PW_TMPFS_PATH}/vulkaninfo.tmp"
if [[ ${VULKAN_VERSION_CHECK[@]} =~ 1.[3-9]+. ]] ; then if [[ ${VULKAN_VERSION_CHECK[*]} =~ 1.[3-9]+. ]] ; then
if [[ ${VULKAN_DEVICE_NAME[@],,} =~ (amd|intel) && ${VULKAN_DRIVER_VERSION[@]} =~ (2[5-9]|[3-9][0-9]). ]] \ for number in $(seq 0 $(( ${#VULKAN_VERSION_CHECK[@]} - 1 ))) ; do
|| [[ ${VULKAN_DEVICE_NAME[@],,} =~ nvidia && ${VULKAN_DRIVER_VERSION[@]} =~ (5[5-9][0-9]|[6-9][0-9][0-9]). ]] ; then if [[ ${VULKAN_DEVICE_NAME[$number],,} =~ (amd|intel) && ${VULKAN_DRIVER_VERSION[$number]} =~ (2[5-9]|[3-9][0-9]). ]] \
export PW_VULKAN_USE="2" || [[ ${VULKAN_DEVICE_NAME[$number],,} =~ nvidia && ${VULKAN_DRIVER_VERSION[$number]} =~ (5[5-9][0-9]|[6-9][0-9][0-9]). ]] ; then
else export PW_VULKAN_USE="2"
export PW_VULKAN_USE="6" break
fi else
elif [[ ${VULKAN_VERSION_CHECK[@]} =~ 1.[1-2]. ]] ; then export PW_VULKAN_USE="6"
fi
done
elif [[ ${VULKAN_VERSION_CHECK[*]} =~ 1.[1-2]. ]] ; then
export PW_VULKAN_USE="1" export PW_VULKAN_USE="1"
fi fi
else else