From c3bb5d6914c2ee8ef70ec3237186754c33014d3d Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Wed, 15 Jan 2020 09:35:48 -0700 Subject: [PATCH] Update to latest SPIRV-Tools, supporting Vulkan 1.2. --- SPIRV/SpvTools.cpp | 2 +- known_good.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp index 8db58c5..97bd4e7 100644 --- a/SPIRV/SpvTools.cpp +++ b/SPIRV/SpvTools.cpp @@ -68,7 +68,7 @@ spv_target_env MapToSpirvToolsEnv(const SpvVersion& spvVersion, spv::SpvBuildLog return spv_target_env::SPV_ENV_VULKAN_1_1; } case glslang::EShTargetVulkan_1_2: - return spv_target_env::SPV_ENV_UNIVERSAL_1_5; //?? should change to SPV_ENV_VULKAN_1_2, when available + return spv_target_env::SPV_ENV_VULKAN_1_2; default: break; } diff --git a/known_good.json b/known_good.json index ada57d7..60e2c2d 100644 --- a/known_good.json +++ b/known_good.json @@ -5,7 +5,7 @@ "site" : "github", "subrepo" : "KhronosGroup/SPIRV-Tools", "subdir" : "External/spirv-tools", - "commit" : "5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2" + "commit" : "323a81fc5e30e43a04e5e22af4cba98ca2a161e6" }, { "name" : "spirv-tools/external/spirv-headers", -- 2.7.4