From dbf9f7c39cbe44f9a627855a949018dc03214054 Mon Sep 17 00:00:00 2001 From: Le Quyen Date: Tue, 5 Nov 2019 09:36:15 +0000 Subject: [PATCH] Fix conflicts between ANGLE & Dawn's spirv-cross build config Recently, BUILD.gn has been added to spirv-cross repo: https://github.com/KhronosGroup/SPIRV-Cross/blob/master/gn/BUILD.gn However, it is incomplete, currently only inlcudes small config needed by ANGLE's metal backend. When building ANGLE and Dawn together with chromium, errors were thrown: ERROR at //third_party/spirv-cross/spirv-cross/spirv_common.hpp:21:11: Include not allowed. #include "spirv_cross_containers.hpp" ^------------------------- It is not in any dependency of //third_party/dawn/third_party:spirv_cross The include file is in the target(s): //third_party/spirv-cross/spirv-cross/gn:spirv_cross_sources which should somehow be reachable. ___________________ ERROR at //third_party/spirv-cross/spirv-cross/spirv_common.hpp:22:11: Include not allowed. #include "spirv_cross_error_handling.hpp" ^----------------------------- It is not in any dependency of //third_party/dawn/third_party:spirv_cross Bug: angleproject:2634 Change-Id: Idb328643db0b765ab228ee7d59d7996b6e6073e4 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/13020 Reviewed-by: Corentin Wallez Commit-Queue: Corentin Wallez --- DEPS | 2 +- third_party/BUILD.gn | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 9feaa2464e..19f76ca2a1 100644 --- a/DEPS +++ b/DEPS @@ -50,7 +50,7 @@ deps = { # SPIRV-Cross 'third_party/spirv-cross': { - 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@00189b19a5da553c668290a051604209586b2139', + 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@d253f41e17e27285756d031d8ba43bf370264e1f', 'condition': 'dawn_standalone', }, diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 7b0113a62c..69c5c3e719 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -58,6 +58,8 @@ static_library("spirv_cross") { "${spirv_cross_dir}/spirv_common.hpp", "${spirv_cross_dir}/spirv_cross.cpp", "${spirv_cross_dir}/spirv_cross.hpp", + "${spirv_cross_dir}/spirv_cross_containers.hpp", + "${spirv_cross_dir}/spirv_cross_error_handling.hpp", "${spirv_cross_dir}/spirv_cross_parsed_ir.cpp", "${spirv_cross_dir}/spirv_cross_parsed_ir.hpp", "${spirv_cross_dir}/spirv_parser.cpp", @@ -110,6 +112,8 @@ static_library("spirv_cross_full_for_fuzzers") { "${spirv_cross_dir}/spirv_common.hpp", "${spirv_cross_dir}/spirv_cross.cpp", "${spirv_cross_dir}/spirv_cross.hpp", + "${spirv_cross_dir}/spirv_cross_containers.hpp", + "${spirv_cross_dir}/spirv_cross_error_handling.hpp", "${spirv_cross_dir}/spirv_cross_parsed_ir.cpp", "${spirv_cross_dir}/spirv_cross_parsed_ir.hpp", "${spirv_cross_dir}/spirv_glsl.cpp",