From e830b3cffe2be4ec517f8b341734afa55fbe9f2f Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 4 Dec 2023 07:46:55 +0100 Subject: [PATCH] Update Vulkan SDK to 1.3.268.0 --- .ci/setup-windows.sh | 6 +++--- .cirrus.yml | 6 +++--- 3rdparty/SPIRV/SPIRV-Headers | 2 +- 3rdparty/SPIRV/SPIRV-Tools | 2 +- 3rdparty/glslang/glslang | 2 +- BUILDING.md | 6 +++--- azure-pipelines.yml | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh index 616dabbf31..1a9d0aa51c 100755 --- a/.ci/setup-windows.sh +++ b/.ci/setup-windows.sh @@ -22,7 +22,7 @@ QT_SVG_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtsvg${QT_SUFFIX}" QT_5CMP_URL="${QT_HOST}${QT_PREFIX}qt5compat.${QT_PREFIX_2}qt5compat${QT_SUFFIX}" LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z' GLSLANG_URL='https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z' -VULKAN_SDK_URL="https://www.dropbox.com/s/cs77c3iv5mbo0bt/VulkanSDK-${VULKAN_VER}-Installer.exe" +VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-1.3.268.0-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1" DEP_URLS=" \ $QT_BASE_URL \ @@ -73,8 +73,8 @@ download_and_verify() [ -d "./lib" ] || mkdir "./lib" for url in $DEP_URLS; do - # Get the filename from the URL. Breaks if urls have js args, so don't do that pls - fileName="$(rev "$(rev "$url" | cut -d'/' -f1)")" + # Get the filename from the URL and remove query strings (?arg=something). + fileName="$(rev "$(rev "$url" | cut -d'/' -f1)" | cut -d'?' -f1)" [ -z "$fileName" ] && echo "Unable to parse url: $url" && exit 1 # shellcheck disable=SC1003 diff --git a/.cirrus.yml b/.cirrus.yml index 116621da27..4a1e574518 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,8 +23,8 @@ env: # QT_VER_MSVC: 'msvc2019' # QT_DATE: '202311210527' # QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64 -# VULKAN_VER: '1.3.224.1' -# VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea' +# VULKAN_VER: '1.3.268.0' +# VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' # VULKAN_SDK: C:\VulkanSDK\${VULKAN_VER} # CACHE_DIR: "./cache" # UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e @@ -56,7 +56,7 @@ env: # linux_task: # container: -# image: rpcs3/rpcs3-ci-focal:1.4 +# image: rpcs3/rpcs3-ci-focal:1.5 # cpu: 4 # memory: 16G # env: diff --git a/3rdparty/SPIRV/SPIRV-Headers b/3rdparty/SPIRV/SPIRV-Headers index 85a1ed200d..e867c06631 160000 --- a/3rdparty/SPIRV/SPIRV-Headers +++ b/3rdparty/SPIRV/SPIRV-Headers @@ -1 +1 @@ -Subproject commit 85a1ed200d50660786c1a88d9166e871123cce39 +Subproject commit e867c06631767a2d96424cbec530f9ee5e78180f diff --git a/3rdparty/SPIRV/SPIRV-Tools b/3rdparty/SPIRV/SPIRV-Tools index eb0a36633d..360d469b9e 160000 --- a/3rdparty/SPIRV/SPIRV-Tools +++ b/3rdparty/SPIRV/SPIRV-Tools @@ -1 +1 @@ -Subproject commit eb0a36633d2acf4de82588504f951ad0f2cecacb +Subproject commit 360d469b9eac54d6c6e20f609f9ec35e3a5380ad diff --git a/3rdparty/glslang/glslang b/3rdparty/glslang/glslang index 10423ec659..36d08c0d94 160000 --- a/3rdparty/glslang/glslang +++ b/3rdparty/glslang/glslang @@ -1 +1 @@ -Subproject commit 10423ec659d301a0ff2daac8bbf38980abf27590 +Subproject commit 36d08c0d940cf307a23928299ef52c7970d8cee6 diff --git a/BUILDING.md b/BUILDING.md index 902e7ceb97..76dbd3e508 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -11,7 +11,7 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu * [Python 3.6+](https://www.python.org/downloads/) (add to PATH) * [Qt 6.6.1](https://www.qt.io/download-qt-installer) * [Visual Studio 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) -* [Vulkan SDK 1.3.224](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.224. +* [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. **Either add the** `QTDIR` **environment variable, e.g.** `\6.6.1\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** @@ -22,7 +22,7 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst * Clang 12+ or GCC 11+ * [CMake 3.16.9+](https://www.cmake.org/download/) * [Qt 6.6.1](https://www.qt.io/download-qt-installer) -* [Vulkan SDK 1.3.224](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.224. +* [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. * [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) **If you have an NVIDIA GPU, you may need to install the libglvnd package.** @@ -57,7 +57,7 @@ For Ubuntu systems, it is strongly recommended to use the PPA from [LunarG](http ``` . /etc/os-release wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - -sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.224-$UBUNTU_CODENAME.list https://packages.lunarg.com/vulkan/1.3.224/lunarg-vulkan-1.3.224-$UBUNTU_CODENAME.list +sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.268-$UBUNTU_CODENAME.list https://packages.lunarg.com/vulkan/1.3.268/lunarg-vulkan-1.3.268-$UBUNTU_CODENAME.list sudo apt update sudo apt install vulkan-sdk ``` diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f7eab5f8cb..fc3eaf31e4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,13 +38,13 @@ jobs: displayName: ccache - bash: | - docker pull --quiet rpcs3/rpcs3-ci-focal:1.4 + docker pull --quiet rpcs3/rpcs3-ci-focal:1.5 docker run \ -v $(pwd):/rpcs3 \ --env-file .ci/docker.env \ -v $CCACHE_DIR:/root/.ccache \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ - rpcs3/rpcs3-ci-focal:1.4 \ + rpcs3/rpcs3-ci-focal:1.5 \ /rpcs3/.ci/build-linux.sh displayName: Docker setup and build @@ -73,8 +73,8 @@ jobs: QT_VER_MSVC: 'msvc2019' QT_DATE: '202311210527' QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 - VULKAN_VER: '1.3.224.1' - VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea' + VULKAN_VER: '1.3.268.0' + VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER) CACHE_DIR: ./cache UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e