From dfb62150dfe7659f87286c53664e0cecbf196fb9 Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Mon, 23 Jan 2023 20:33:42 +0000 Subject: [PATCH] Remove program_builder include from type/ The type/ folder had a hold over include of program_builder. The builder isn't actually used in the types so this CL removes the include and adds the relevant includes to fix building. Change-Id: I787b398fe149f483d007bb623ab3ed42850875c5 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/117581 Reviewed-by: Ben Clayton Kokoro: Kokoro Commit-Queue: Dan Sinclair --- src/tint/type/abstract_float.cc | 2 +- src/tint/type/abstract_int.cc | 2 +- src/tint/type/atomic.cc | 4 +++- src/tint/type/bool.cc | 2 +- src/tint/type/depth_multisampled_texture.cc | 4 +++- src/tint/type/depth_texture.cc | 4 +++- src/tint/type/external_texture.cc | 2 +- src/tint/type/f16.cc | 2 +- src/tint/type/f32.cc | 2 +- src/tint/type/i32.cc | 2 +- src/tint/type/matrix.cc | 4 +++- src/tint/type/multisampled_texture.cc | 4 +++- src/tint/type/pointer.cc | 4 +++- src/tint/type/reference.cc | 4 +++- src/tint/type/sampled_texture.cc | 4 +++- src/tint/type/sampler.cc | 2 +- src/tint/type/storage_texture.cc | 5 ++++- src/tint/type/u32.cc | 2 +- src/tint/type/vector.cc | 4 +++- src/tint/type/void.cc | 2 +- 20 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/tint/type/abstract_float.cc b/src/tint/type/abstract_float.cc index f3032e0376..46cbf154e3 100644 --- a/src/tint/type/abstract_float.cc +++ b/src/tint/type/abstract_float.cc @@ -14,7 +14,7 @@ #include "src/tint/type/abstract_float.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" #include "src/tint/utils/hash.h" TINT_INSTANTIATE_TYPEINFO(tint::type::AbstractFloat); diff --git a/src/tint/type/abstract_int.cc b/src/tint/type/abstract_int.cc index 806cdd3865..4b409372e3 100644 --- a/src/tint/type/abstract_int.cc +++ b/src/tint/type/abstract_int.cc @@ -14,7 +14,7 @@ #include "src/tint/type/abstract_int.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" #include "src/tint/utils/hash.h" TINT_INSTANTIATE_TYPEINFO(tint::type::AbstractInt); diff --git a/src/tint/type/atomic.cc b/src/tint/type/atomic.cc index 0daa7f51fb..045939476b 100644 --- a/src/tint/type/atomic.cc +++ b/src/tint/type/atomic.cc @@ -14,7 +14,9 @@ #include "src/tint/type/atomic.h" -#include "src/tint/program_builder.h" +#include "src/tint/debug.h" +#include "src/tint/diagnostic/diagnostic.h" +#include "src/tint/type/manager.h" #include "src/tint/type/reference.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/type/bool.cc b/src/tint/type/bool.cc index 4c3849c32f..31fcb270a3 100644 --- a/src/tint/type/bool.cc +++ b/src/tint/type/bool.cc @@ -14,7 +14,7 @@ #include "src/tint/type/bool.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Bool); diff --git a/src/tint/type/depth_multisampled_texture.cc b/src/tint/type/depth_multisampled_texture.cc index 43d30a8d9c..84d7c321db 100644 --- a/src/tint/type/depth_multisampled_texture.cc +++ b/src/tint/type/depth_multisampled_texture.cc @@ -14,7 +14,9 @@ #include "src/tint/type/depth_multisampled_texture.h" -#include "src/tint/program_builder.h" +#include "src/tint/debug.h" +#include "src/tint/diagnostic/diagnostic.h" +#include "src/tint/type/manager.h" #include "src/tint/type/texture_dimension.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/type/depth_texture.cc b/src/tint/type/depth_texture.cc index 214b407e3b..ca216e7389 100644 --- a/src/tint/type/depth_texture.cc +++ b/src/tint/type/depth_texture.cc @@ -14,7 +14,9 @@ #include "src/tint/type/depth_texture.h" -#include "src/tint/program_builder.h" +#include "src/tint/debug.h" +#include "src/tint/diagnostic/diagnostic.h" +#include "src/tint/type/manager.h" #include "src/tint/type/texture_dimension.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/type/external_texture.cc b/src/tint/type/external_texture.cc index bfd2edc471..986c2b487d 100644 --- a/src/tint/type/external_texture.cc +++ b/src/tint/type/external_texture.cc @@ -14,7 +14,7 @@ #include "src/tint/type/external_texture.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" #include "src/tint/type/texture_dimension.h" TINT_INSTANTIATE_TYPEINFO(tint::type::ExternalTexture); diff --git a/src/tint/type/f16.cc b/src/tint/type/f16.cc index 5ea9aca307..45b88ddcb8 100644 --- a/src/tint/type/f16.cc +++ b/src/tint/type/f16.cc @@ -14,7 +14,7 @@ #include "src/tint/type/f16.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" TINT_INSTANTIATE_TYPEINFO(tint::type::F16); diff --git a/src/tint/type/f32.cc b/src/tint/type/f32.cc index 91872a2366..8af826c11f 100644 --- a/src/tint/type/f32.cc +++ b/src/tint/type/f32.cc @@ -14,7 +14,7 @@ #include "src/tint/type/f32.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" TINT_INSTANTIATE_TYPEINFO(tint::type::F32); diff --git a/src/tint/type/i32.cc b/src/tint/type/i32.cc index 9fe0d95a24..9ca1c690b8 100644 --- a/src/tint/type/i32.cc +++ b/src/tint/type/i32.cc @@ -14,7 +14,7 @@ #include "src/tint/type/i32.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" TINT_INSTANTIATE_TYPEINFO(tint::type::I32); diff --git a/src/tint/type/matrix.cc b/src/tint/type/matrix.cc index 600f4b04f0..76970e6208 100644 --- a/src/tint/type/matrix.cc +++ b/src/tint/type/matrix.cc @@ -14,7 +14,9 @@ #include "src/tint/type/matrix.h" -#include "src/tint/program_builder.h" +#include "src/tint/debug.h" +#include "src/tint/diagnostic/diagnostic.h" +#include "src/tint/type/manager.h" #include "src/tint/type/vector.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/type/multisampled_texture.cc b/src/tint/type/multisampled_texture.cc index 801a891d58..182ae88af1 100644 --- a/src/tint/type/multisampled_texture.cc +++ b/src/tint/type/multisampled_texture.cc @@ -14,7 +14,9 @@ #include "src/tint/type/multisampled_texture.h" -#include "src/tint/program_builder.h" +#include "src/tint/debug.h" +#include "src/tint/diagnostic/diagnostic.h" +#include "src/tint/type/manager.h" #include "src/tint/type/texture_dimension.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/type/pointer.cc b/src/tint/type/pointer.cc index f00f4fb805..809d05b38f 100644 --- a/src/tint/type/pointer.cc +++ b/src/tint/type/pointer.cc @@ -14,7 +14,9 @@ #include "src/tint/type/pointer.h" -#include "src/tint/program_builder.h" +#include "src/tint/debug.h" +#include "src/tint/diagnostic/diagnostic.h" +#include "src/tint/type/manager.h" #include "src/tint/type/reference.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/type/reference.cc b/src/tint/type/reference.cc index 090d8d71c5..5951f3843a 100644 --- a/src/tint/type/reference.cc +++ b/src/tint/type/reference.cc @@ -14,7 +14,9 @@ #include "src/tint/type/reference.h" -#include "src/tint/program_builder.h" +#include "src/tint/debug.h" +#include "src/tint/diagnostic/diagnostic.h" +#include "src/tint/type/manager.h" #include "src/tint/utils/hash.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Reference); diff --git a/src/tint/type/sampled_texture.cc b/src/tint/type/sampled_texture.cc index 323aaa46eb..b3e737500f 100644 --- a/src/tint/type/sampled_texture.cc +++ b/src/tint/type/sampled_texture.cc @@ -14,7 +14,9 @@ #include "src/tint/type/sampled_texture.h" -#include "src/tint/program_builder.h" +#include "src/tint/debug.h" +#include "src/tint/diagnostic/diagnostic.h" +#include "src/tint/type/manager.h" #include "src/tint/type/texture_dimension.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/type/sampler.cc b/src/tint/type/sampler.cc index 6f8532a421..b7e0aa212b 100644 --- a/src/tint/type/sampler.cc +++ b/src/tint/type/sampler.cc @@ -14,7 +14,7 @@ #include "src/tint/type/sampler.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" #include "src/tint/utils/hash.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Sampler); diff --git a/src/tint/type/storage_texture.cc b/src/tint/type/storage_texture.cc index 427a063831..25beb74747 100644 --- a/src/tint/type/storage_texture.cc +++ b/src/tint/type/storage_texture.cc @@ -14,7 +14,10 @@ #include "src/tint/type/storage_texture.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/f32.h" +#include "src/tint/type/i32.h" +#include "src/tint/type/manager.h" +#include "src/tint/type/u32.h" #include "src/tint/utils/hash.h" TINT_INSTANTIATE_TYPEINFO(tint::type::StorageTexture); diff --git a/src/tint/type/u32.cc b/src/tint/type/u32.cc index a749f85349..249a47dda2 100644 --- a/src/tint/type/u32.cc +++ b/src/tint/type/u32.cc @@ -14,7 +14,7 @@ #include "src/tint/type/u32.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" TINT_INSTANTIATE_TYPEINFO(tint::type::U32); diff --git a/src/tint/type/vector.cc b/src/tint/type/vector.cc index acd952c196..146c1f4eb9 100644 --- a/src/tint/type/vector.cc +++ b/src/tint/type/vector.cc @@ -14,7 +14,9 @@ #include "src/tint/type/vector.h" -#include "src/tint/program_builder.h" +#include "src/tint/debug.h" +#include "src/tint/diagnostic/diagnostic.h" +#include "src/tint/type/manager.h" #include "src/tint/utils/hash.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Vector); diff --git a/src/tint/type/void.cc b/src/tint/type/void.cc index e29def139f..bfe2baf89f 100644 --- a/src/tint/type/void.cc +++ b/src/tint/type/void.cc @@ -14,7 +14,7 @@ #include "src/tint/type/void.h" -#include "src/tint/program_builder.h" +#include "src/tint/type/manager.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Void);