From c4c4ff9eb4b51ec22f8608e7f2ef8028ad57f367 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 28 Jul 2020 21:57:18 +0000 Subject: [PATCH] Enable WGSL support by default Explictly turned off for Skia, since it does not yet have Tint in its DEPS. Roll third_party/tint/ e8c12f32f..c5cd8f5bd (3 commits) https://dawn.googlesource.com/tint/+log/e8c12f32f9a9..c5cd8f5bd382 $ git log e8c12f32f..c5cd8f5bd --date=short --no-merges --format='%ad %ae %s' 2020-07-28 rharrison Remove binutils from DEPS and pull in changes to build.gni from Dawn 2020-07-28 rharrison Get 'gn gen --check' passing 2020-07-28 idanr Fix Tint ninja build Created with: roll-dep third_party/tint BUG=tint:123 Change-Id: Icd26c2d1b7329c94afa6f23c5c057de8efaee3e8 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/25523 Commit-Queue: Ryan Harrison Reviewed-by: Austin Eng --- DEPS | 2 +- scripts/dawn_features.gni | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 24affe890d..3d47dab53f 100644 --- a/DEPS +++ b/DEPS @@ -90,7 +90,7 @@ deps = { # WGSL support 'third_party/tint': { - 'url': '{dawn_git}/tint@e8c12f32f9a9517100f819f5bce35ad8d6e0bc78', + 'url': '{dawn_git}/tint@c5cd8f5bd3823c7e4b0d1d26d5de3465a9159eec', 'condition': 'dawn_standalone', }, diff --git a/scripts/dawn_features.gni b/scripts/dawn_features.gni index 1cee17450f..9d3cbfcf25 100644 --- a/scripts/dawn_features.gni +++ b/scripts/dawn_features.gni @@ -69,9 +69,9 @@ declare_args() { # Whether Dawn should enable X11 support. dawn_use_x11 = is_linux && !is_chromeos - # Enable support WGSL for shaders. Currently this is - # experimental, and requires dawn_tint_dir to be set. - dawn_enable_wgsl = false + # Enable support WGSL for shaders. + # Turned off for Skia, because Tint is currently not part of its DEPS. + dawn_enable_wgsl = !defined(is_skia_standalone) } # GN does not allow reading a variable defined in the same declare_args().