From 43655314ee5d749790e83d028677ab849e05c089 Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Thu, 15 Sep 2022 23:04:18 +0000 Subject: [PATCH] Roll vulkan-deps from fb10489972ad to fc12bd106db5 (12 revisions) Also, set vvl_spirv_headers_dir build override to fix the build. https://chromium.googlesource.com/vulkan-deps.git/+log/fb10489972ad..fc12bd106db5 Changed dependencies: * spirv-cross: https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross.git/+log/f6ca617825..6d3518e238 * vulkan-headers: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers.git/+log/88ebcb08cb..5177b119bb * vulkan-loader: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader.git/+log/2f87e2b3a5..3090fc12bd * vulkan-tools: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools.git/+log/f7dff1f7dd..5b4f221819 * vulkan-validation-layers: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers.git/+log/c53a4cb4e0..7bc6e19210 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/vulkan-deps-dawn-autoroll Please CC enga@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Dawn: https://bugs.chromium.org/p/dawn/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Bug: None Change-Id: Ie23bc22b4981e7b48082c0b43975e8805bfd2ff9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/102463 Auto-Submit: Austin Eng Reviewed-by: Loko Kung Kokoro: Kokoro Commit-Queue: Austin Eng Commit-Queue: Loko Kung --- DEPS | 2 +- build_overrides/vulkan_validation_layers.gni | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index f2a0cd315d..9ce5c98ec5 100644 --- a/DEPS +++ b/DEPS @@ -139,7 +139,7 @@ deps = { }, 'third_party/vulkan-deps': { - 'url': '{chromium_git}/vulkan-deps@fb10489972adbbe55d593e83476923d13960dbde', + 'url': '{chromium_git}/vulkan-deps@fc12bd106db567c0e1a5485175820fd4e53d6eac', 'condition': 'dawn_standalone', }, diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni index 9463e666d7..5f1a4ff21a 100644 --- a/build_overrides/vulkan_validation_layers.gni +++ b/build_overrides/vulkan_validation_layers.gni @@ -17,6 +17,7 @@ import("//build_overrides/vulkan_common.gni") # These are variables that are overridable by projects that include Dawn. # The values in this file are the defaults for when we are building from # Dawn's repository. +vvl_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src" vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src" vvl_glslang_dir = "//third_party/vulkan-deps/glslang/src"