0

Reland (2): "DEPS: recursedeps into Dawn to get Tint"

This is a reland of 2c526a7b10

Reland after Dawn's Gerrit config allows various service accounts
to create per-release branches in
https://dawn.googlesource.com/dawn/+/f44b34c329f1f9275d9622725df365e62e0d178e%5E%21/#F1

Original change's description:
> Reland: DEPS: recursedeps into Dawn to get Tint
>
> Reland after changes in Dawn that only deps on vulkan-deps if
> dawn_standalone is True.
>
> Sheriffs: If this commit is in the regression range of an official
> builder gclient flatten failure, it is the most likely culprit.
>
> Dawn and Tint are intrinsically linked as they implement both sides of
> WebGPU: the API side and the shading language side. To ease the
> development workflow of Tint, make Chromium recursedeps into Dawn.
>
> Without this CL changes in Tint rolled into Dawn aren't usable until
> they are also rolled in Chromium (Dawn CQ runs Chromium-based tests).
>
> Bug: tint:700
> Bug: chromium:1195554
> Change-Id: Iffb54ac167a4abc51e51548ba1e89f39f2f13aa2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2809396
> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
> Auto-Submit: Corentin Wallez <cwallez@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Cr-Commit-Position: refs/heads/master@{#870047}

Bug: tint:700
Bug: chromium:1196923
Change-Id: Id0e67164f33fa230cf673765e9b2e91e5536b515
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2814609
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#870909}
This commit is contained in:
Corentin Wallez
2021-04-09 09:50:59 +00:00
committed by Chromium LUCI CQ
parent 47ac1af09a
commit 5b4f4f288c
4 changed files with 8 additions and 11 deletions

@ -826,8 +826,8 @@ group("gn_all") {
"//third_party/dawn/src/fuzzers:dawn_fuzzers",
"//third_party/dawn/src/tests:dawn_end2end_tests",
"//third_party/dawn/src/tests:dawn_unittests",
"//third_party/tint/src/fuzzers",
"//third_party/tint/src/test:tint_unittests",
"//third_party/dawn/third_party/tint/fuzzers",
"//third_party/dawn/third_party/tint/test:tint_unittests",
]
}

12
DEPS

@ -190,6 +190,9 @@ vars = {
# By default, do not check out the re-client binaries.
'checkout_reclient': False,
# Make Dawn skip its standalone dependencies
'dawn_standalone': False,
# reclient CIPD package version
'reclient_version': 're_client_version:0.26.0.b455196',
@ -365,10 +368,6 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'tint_revision': '101f463992613b055e6ac6e9588023e4b0695ed6',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'resultdb_version': 'git_revision:65b41c1a56b49e7b33de8efb9d8fc993ff03851c',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
@ -843,9 +842,6 @@ deps = {
'src/third_party/dawn':
Var('dawn_git') + '/dawn.git' + '@' + Var('dawn_revision'),
'src/third_party/tint/src':
Var('dawn_git') + '/tint.git' + '@' + Var('tint_revision'),
'src/third_party/libjxl/src':
Var('chromium_git') + '/external/gitlab.com/wg1/jpeg-xl.git' + '@' + Var('libjxl_revision'),
@ -4456,6 +4452,8 @@ hooks = [
recursedeps = [
# ANGLE manages DEPS that it also owns the build files for, such as dEQP.
'src/third_party/angle',
# Dawn and Tint's revision are linked
'src/third_party/dawn',
'src/third_party/openscreen/src',
'src/third_party/vulkan-deps',
# src-internal has its own DEPS file to pull additional internal repos

@ -11,6 +11,5 @@ dawn_shaderc_dir = "//third_party/shaderc/src"
dawn_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src"
dawn_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
dawn_swiftshader_dir = "//third_party/swiftshader"
dawn_tint_dir = "//third_party/tint/src"
dawn_vulkan_validation_layers_dir =
"//third_party/vulkan-deps/vulkan-validation-layers/src"

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
tint_root_dir = "//third_party/tint/src"
tint_root_dir = "//third_party/dawn/third_party/tint"
tint_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
tint_googletest_dir = "//third_party/googletest/src"
tint_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"