From 985b2221232d77a318d0a3080bf9dd256a9ea730 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 13 Jun 2022 23:10:47 +0200 Subject: [PATCH] Update SPIR-V to v2022.2 --- 3rdparty/SPIRV/SPIRV-Headers | 2 +- 3rdparty/SPIRV/SPIRV-Tools | 2 +- 3rdparty/SPIRV/spirv.vcxproj | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/SPIRV/SPIRV-Headers b/3rdparty/SPIRV/SPIRV-Headers index 3fdabd0da2..4995a2f272 160000 --- a/3rdparty/SPIRV/SPIRV-Headers +++ b/3rdparty/SPIRV/SPIRV-Headers @@ -1 +1 @@ -Subproject commit 3fdabd0da2932c276b25b9b4a988ba134eba1aa6 +Subproject commit 4995a2f2723c401eb0ea3e10c81298906bf1422b diff --git a/3rdparty/SPIRV/SPIRV-Tools b/3rdparty/SPIRV/SPIRV-Tools index 895927bd3f..7826e1941e 160000 --- a/3rdparty/SPIRV/SPIRV-Tools +++ b/3rdparty/SPIRV/SPIRV-Tools @@ -1 +1 @@ -Subproject commit 895927bd3f2d653f40cebab55aa6c7eabde30a86 +Subproject commit 7826e1941eab1aa66fbe84c48b95921bff402a96 diff --git a/3rdparty/SPIRV/spirv.vcxproj b/3rdparty/SPIRV/spirv.vcxproj index 148df30120..baee852aad 100644 --- a/3rdparty/SPIRV/spirv.vcxproj +++ b/3rdparty/SPIRV/spirv.vcxproj @@ -39,9 +39,9 @@ "Visual Studio $(VisualStudioVersion.Substring(0,2))" call vsdevcmd.bat -arch=amd64 - cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers')) SPIRV-Tools -B build + cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers').Replace('\', '/')) SPIRV-Tools -B build call vsdevcmd.bat -arch=amd64 - cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers')) -S SPIRV-Tools -B build + cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers').Replace('\', '/')) -S SPIRV-Tools -B build $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\buildfiles\msvc\common_default.props'))