Use Jamie's 7-layer burrito of Vulkan DEPS.
This allows us to roll all Vulkan- and SPIRV-related dependencies
simultaneously (which are often inter-dependent).
This change also implicitly rolls the dependencies to the revs in ANGLE.
Change-Id: I50a1e5b2ef706ffbfbc22f5783321820bb50ae96
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/36500
Commit-Queue: Stephen White <senorblanco@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/build_overrides/dawn.gni b/build_overrides/dawn.gni
index d84165f..3b913dd 100644
--- a/build_overrides/dawn.gni
+++ b/build_overrides/dawn.gni
@@ -32,9 +32,10 @@
dawn_glm_dir = "//third_party/glm"
dawn_googletest_dir = "//third_party/googletest"
dawn_shaderc_dir = "//third_party/shaderc"
-dawn_spirv_tools_dir = "//third_party/SPIRV-Tools"
-dawn_spirv_cross_dir = "//third_party/spirv-cross"
+dawn_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+dawn_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src"
dawn_swiftshader_dir = "//third_party/swiftshader"
dawn_tint_dir = "//third_party/tint"
-dawn_vulkan_loader_dir = "//third_party/vulkan-loader"
-dawn_vulkan_validation_layers_dir = "//third_party/vulkan-validation-layers"
+dawn_vulkan_loader_dir = "//third_party/vulkan-deps/vulkan-loader/src"
+dawn_vulkan_validation_layers_dir =
+ "//third_party/vulkan-deps/vulkan-validation-layers/src"
diff --git a/build_overrides/glslang.gni b/build_overrides/glslang.gni
index c1b60e0..69d968d 100644
--- a/build_overrides/glslang.gni
+++ b/build_overrides/glslang.gni
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-glslang_spirv_tools_dir = "//third_party/SPIRV-Tools"
+glslang_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
diff --git a/build_overrides/shaderc.gni b/build_overrides/shaderc.gni
index 3aecd21..fb0f62b 100644
--- a/build_overrides/shaderc.gni
+++ b/build_overrides/shaderc.gni
@@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-shaderc_glslang_dir = "//third_party/glslang"
-shaderc_spirv_tools_dir = "//third_party/SPIRV-Tools"
-shaderc_spirv_headers_dir = "//third_party/spirv-headers"
+shaderc_glslang_dir = "//third_party/vulkan-deps/glslang/src"
+shaderc_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+shaderc_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
diff --git a/build_overrides/spirv_tools.gni b/build_overrides/spirv_tools.gni
index 7e4559f..48e7b11 100644
--- a/build_overrides/spirv_tools.gni
+++ b/build_overrides/spirv_tools.gni
@@ -17,4 +17,4 @@
# Paths to SPIRV-Tools dependencies in Dawn
spirv_tools_googletest_dir = "//third_party/googletest"
-spirv_tools_spirv_headers_dir = "//third_party/spirv-headers"
+spirv_tools_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
diff --git a/build_overrides/swiftshader.gni b/build_overrides/swiftshader.gni
index 4153f72..1674d48 100644
--- a/build_overrides/swiftshader.gni
+++ b/build_overrides/swiftshader.gni
@@ -19,4 +19,4 @@
swiftshader_dir = "//third_party/swiftshader"
# Paths to SwiftShader dependencies in Dawn
-swiftshader_spirv_tools_dir = "//third_party/SPIRV-Tools"
+swiftshader_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
diff --git a/build_overrides/tint.gni b/build_overrides/tint.gni
index 9fe29de..24ca75c 100644
--- a/build_overrides/tint.gni
+++ b/build_overrides/tint.gni
@@ -13,9 +13,9 @@
# limitations under the License.
tint_root_dir = "//third_party/tint"
-tint_spirv_tools_dir = "//third_party/SPIRV-Tools"
+tint_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
tint_googletest_dir = "//third_party/googletest"
-tint_spirv_headers_dir = "//third_party/spirv-headers"
+tint_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
tint_build_spv_reader = true
tint_build_spv_writer = true
diff --git a/build_overrides/vulkan_loader.gni b/build_overrides/vulkan_loader.gni
index c38074f..7185dea 100644
--- a/build_overrides/vulkan_loader.gni
+++ b/build_overrides/vulkan_loader.gni
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-vulkan_headers_dir = "//third_party/vulkan-headers"
+vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
vulkan_gen_subdir = "vulkan_loader"
vulkan_loader_shared = true
diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni
index 491afbc..37193a8 100644
--- a/build_overrides/vulkan_validation_layers.gni
+++ b/build_overrides/vulkan_validation_layers.gni
@@ -15,9 +15,9 @@
# 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.
-vulkan_headers_dir = "//third_party/vulkan-headers"
-vvl_spirv_tools_dir = "//third_party/SPIRV-Tools"
-vvl_glslang_dir = "//third_party/glslang"
+vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
+vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+vvl_glslang_dir = "//third_party/vulkan-deps/glslang/src"
# Subdirectories for generated files
vulkan_data_subdir = "vulkandata"
