From 5b36d2c6126fce027438d5bd766251a300cfd2e7 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Tue, 9 Mar 2021 11:11:17 +0000 Subject: [PATCH] Remove all unnecessary includes All includes from .cc to .h are preserved, even when transitively included. It's clear that there are far too many includes in header files, and we should be more aggressive with forward declarations. tint:532 will continue to track this work. There are, however, plenty of includes that have accumulated over time which are no longer required directly or transitively, so this change starts with a clean slate of *required* includes. Bug: tint:532 Change-Id: Ie1718dad565f8309fa180ef91bcf3920e76dba18 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/44042 Commit-Queue: Ben Clayton Reviewed-by: Antonio Maiorano --- src/ast/access_decoration.cc | 1 - src/ast/access_decoration.h | 2 - src/ast/access_decoration_test.cc | 2 - src/ast/array_accessor_expression.cc | 1 - src/ast/array_accessor_expression.h | 4 -- src/ast/array_accessor_expression_test.cc | 3 - src/ast/array_decoration.cc | 4 -- src/ast/assignment_statement.cc | 1 - src/ast/assignment_statement.h | 4 -- src/ast/assignment_statement_test.cc | 1 - src/ast/binary_expression.cc | 1 - src/ast/binary_expression.h | 4 -- src/ast/binary_expression_test.cc | 5 -- src/ast/binding_decoration.cc | 1 - src/ast/binding_decoration.h | 2 - src/ast/binding_decoration_test.cc | 2 - src/ast/bitcast_expression.cc | 1 - src/ast/bitcast_expression.h | 5 -- src/ast/bitcast_expression_test.cc | 2 - src/ast/block_statement.cc | 1 - src/ast/block_statement.h | 2 - src/ast/block_statement_test.cc | 5 -- src/ast/bool_literal.cc | 1 - src/ast/bool_literal_test.cc | 6 -- src/ast/break_statement.cc | 1 - src/ast/builtin_decoration.cc | 1 - src/ast/builtin_decoration_test.cc | 2 - src/ast/call_expression.cc | 1 - src/ast/call_expression.h | 4 -- src/ast/call_expression_test.cc | 3 - src/ast/call_statement.cc | 2 - src/ast/call_statement.h | 3 - src/ast/call_statement_test.cc | 2 - src/ast/case_statement.cc | 1 - src/ast/case_statement.h | 4 -- src/ast/case_statement_test.cc | 4 -- src/ast/constant_id_decoration.cc | 1 - src/ast/constant_id_decoration.h | 1 - src/ast/constructor_expression.cc | 2 - src/ast/continue_statement.cc | 1 - src/ast/continue_statement.h | 3 - src/ast/decoration.h | 3 - src/ast/decoration_test.cc | 18 ------ src/ast/discard_statement.cc | 1 - src/ast/discard_statement_test.cc | 2 - src/ast/else_statement.cc | 1 - src/ast/else_statement.h | 3 - src/ast/else_statement_test.cc | 5 -- src/ast/expression.h | 1 - src/ast/fallthrough_statement.cc | 1 - src/ast/float_literal.cc | 2 - src/ast/float_literal_test.cc | 6 -- src/ast/function.cc | 7 --- src/ast/function.h | 8 --- src/ast/function_decoration.h | 2 - src/ast/function_test.cc | 6 -- src/ast/group_decoration.cc | 1 - src/ast/group_decoration.h | 2 - src/ast/group_decoration_test.cc | 2 - src/ast/identifier_expression.cc | 1 - src/ast/identifier_expression.h | 4 -- src/ast/identifier_expression_test.cc | 2 - src/ast/if_statement.cc | 2 - src/ast/if_statement.h | 4 -- src/ast/if_statement_test.cc | 1 - src/ast/int_literal_test.cc | 9 --- src/ast/intrinsic_texture_helper_test.cc | 4 -- src/ast/intrinsic_texture_helper_test.h | 3 - src/ast/literal.h | 1 - src/ast/location_decoration.cc | 1 - src/ast/location_decoration.h | 2 - src/ast/location_decoration_test.cc | 4 -- src/ast/loop_statement.cc | 1 - src/ast/loop_statement.h | 4 -- src/ast/loop_statement_test.cc | 3 - src/ast/member_accessor_expression.cc | 1 - src/ast/member_accessor_expression.h | 5 -- src/ast/member_accessor_expression_test.cc | 5 -- src/ast/module.cc | 5 -- src/ast/module.h | 3 - src/ast/module_clone_test.cc | 4 -- src/ast/module_test.cc | 11 ---- src/ast/node.cc | 2 - src/ast/node.h | 3 - src/ast/null_literal.cc | 1 - src/ast/null_literal_test.cc | 5 -- src/ast/return_statement.cc | 1 - src/ast/return_statement.h | 3 - src/ast/return_statement_test.cc | 3 - src/ast/scalar_constructor_expression.cc | 1 - src/ast/scalar_constructor_expression.h | 3 - src/ast/scalar_constructor_expression_test.cc | 4 -- src/ast/sint_literal.cc | 1 - src/ast/sint_literal_test.cc | 7 --- src/ast/stage_decoration.cc | 1 - src/ast/stage_decoration_test.cc | 2 - src/ast/statement.cc | 5 -- src/ast/statement.h | 1 - src/ast/stride_decoration.cc | 1 - src/ast/stride_decoration.h | 2 - src/ast/stride_decoration_test.cc | 2 - src/ast/struct.cc | 1 - src/ast/struct.h | 3 - src/ast/struct_block_decoration.cc | 1 - src/ast/struct_block_decoration.h | 2 - src/ast/struct_decoration.h | 2 - src/ast/struct_member.cc | 2 - src/ast/struct_member.h | 5 -- src/ast/struct_member_decoration.cc | 4 -- src/ast/struct_member_offset_decoration.cc | 1 - src/ast/struct_member_offset_decoration.h | 2 - .../struct_member_offset_decoration_test.cc | 2 - src/ast/struct_member_test.cc | 7 --- src/ast/struct_test.cc | 8 --- src/ast/switch_statement.cc | 2 - src/ast/switch_statement.h | 5 -- src/ast/switch_statement_test.cc | 6 -- src/ast/test_helper.h | 4 -- src/ast/type_constructor_expression.cc | 1 - src/ast/type_constructor_expression.h | 2 - src/ast/type_constructor_expression_test.cc | 9 --- src/ast/type_decoration.cc | 4 -- src/ast/uint_literal.cc | 1 - src/ast/uint_literal_test.cc | 6 -- src/ast/unary_op_expression.cc | 1 - src/ast/unary_op_expression.h | 4 -- src/ast/unary_op_expression_test.cc | 3 - src/ast/variable.cc | 3 - src/ast/variable.h | 5 -- src/ast/variable_decl_statement.cc | 1 - src/ast/variable_decl_statement.h | 4 -- src/ast/variable_decl_statement_test.cc | 2 - src/ast/variable_decoration.cc | 2 - src/ast/variable_test.cc | 5 -- src/ast/workgroup_decoration.cc | 1 - src/ast/workgroup_decoration.h | 2 - src/ast/workgroup_decoration_test.cc | 2 - src/castable.h | 3 - src/clone_context.cc | 3 - src/clone_context.h | 2 - src/clone_context_test.cc | 6 -- src/debug.cc | 8 --- src/debug.h | 1 - src/demangler.cc | 3 - src/diagnostic/diagnostic.h | 2 - src/diagnostic/formatter.cc | 1 - src/diagnostic/formatter.h | 1 - src/diagnostic/printer.cc | 2 - src/inspector/inspector.cc | 10 ---- src/inspector/inspector.h | 1 - src/inspector/inspector_test.cc | 39 ------------- src/intrinsic_table.cc | 5 -- src/intrinsic_table.h | 1 - src/intrinsic_table_test.cc | 1 - src/program.cc | 4 -- src/program.h | 2 - src/program_builder.cc | 6 -- src/program_builder.h | 10 ---- src/program_test.cc | 11 ---- src/reader/reader.h | 3 - src/reader/spirv/construct.h | 2 - src/reader/spirv/entry_point_info.h | 2 - src/reader/spirv/enum_converter.h | 3 +- src/reader/spirv/enum_converter_test.cc | 3 - src/reader/spirv/fail_stream_test.cc | 3 - src/reader/spirv/function.cc | 42 -------------- src/reader/spirv/function.h | 20 ------- src/reader/spirv/function_arithmetic_test.cc | 4 -- src/reader/spirv/function_bit_test.cc | 4 -- src/reader/spirv/function_call_test.cc | 4 -- src/reader/spirv/function_cfg_test.cc | 6 -- src/reader/spirv/function_composite_test.cc | 5 -- src/reader/spirv/function_conversion_test.cc | 4 -- src/reader/spirv/function_decl_test.cc | 4 -- .../spirv/function_glsl_std_450_test.cc | 5 -- src/reader/spirv/function_logical_test.cc | 4 -- src/reader/spirv/function_memory_test.cc | 5 -- src/reader/spirv/function_misc_test.cc | 5 -- src/reader/spirv/function_var_test.cc | 4 -- src/reader/spirv/namer.h | 1 - src/reader/spirv/namer_test.cc | 5 -- src/reader/spirv/parser_impl.cc | 56 +------------------ src/reader/spirv/parser_impl.h | 16 ------ ...ser_impl_convert_member_decoration_test.cc | 9 --- .../spirv/parser_impl_convert_type_test.cc | 17 ------ .../spirv/parser_impl_function_decl_test.cc | 6 -- .../spirv/parser_impl_get_decorations_test.cc | 2 - src/reader/spirv/parser_impl_handle_test.cc | 5 -- src/reader/spirv/parser_impl_import_test.cc | 4 -- .../spirv/parser_impl_module_var_test.cc | 5 -- .../spirv/parser_impl_named_types_test.cc | 12 ---- src/reader/spirv/parser_impl_test.cc | 5 -- src/reader/spirv/parser_impl_test_helper.h | 3 - .../spirv/parser_impl_user_name_test.cc | 4 -- src/reader/spirv/parser_test.cc | 3 - src/reader/spirv/spirv_tools_helpers_test.cc | 4 -- src/reader/spirv/spirv_tools_helpers_test.h | 1 - src/reader/spirv/usage.h | 1 - src/reader/spirv/usage_test.cc | 2 - src/reader/wgsl/lexer.cc | 5 -- src/reader/wgsl/lexer.h | 1 - src/reader/wgsl/parser.h | 1 - src/reader/wgsl/parser_impl.cc | 43 -------------- src/reader/wgsl/parser_impl.h | 23 -------- .../parser_impl_additive_expression_test.cc | 6 -- .../wgsl/parser_impl_and_expression_test.cc | 6 -- ...rser_impl_argument_expression_list_test.cc | 8 --- .../wgsl/parser_impl_assignment_stmt_test.cc | 9 --- src/reader/wgsl/parser_impl_body_stmt_test.cc | 2 - .../wgsl/parser_impl_break_stmt_test.cc | 3 - src/reader/wgsl/parser_impl_bug_cases_test.cc | 3 - src/reader/wgsl/parser_impl_call_stmt_test.cc | 6 -- src/reader/wgsl/parser_impl_case_body_test.cc | 2 - .../wgsl/parser_impl_const_expr_test.cc | 7 --- .../wgsl/parser_impl_const_literal_test.cc | 6 -- .../wgsl/parser_impl_continue_stmt_test.cc | 3 - .../wgsl/parser_impl_continuing_stmt_test.cc | 2 - .../parser_impl_depth_texture_type_test.cc | 2 - src/reader/wgsl/parser_impl_detail.h | 1 - src/reader/wgsl/parser_impl_else_stmt_test.cc | 3 - .../wgsl/parser_impl_elseif_stmt_test.cc | 5 -- .../parser_impl_equality_expression_test.cc | 6 -- src/reader/wgsl/parser_impl_error_msg_test.cc | 2 - .../wgsl/parser_impl_error_resync_test.cc | 2 - ...arser_impl_exclusive_or_expression_test.cc | 6 -- src/reader/wgsl/parser_impl_for_stmt_test.cc | 5 -- .../wgsl/parser_impl_function_decl_test.cc | 5 -- ...rser_impl_function_decoration_list_test.cc | 2 - .../parser_impl_function_decoration_test.cc | 2 - .../wgsl/parser_impl_function_header_test.cc | 5 -- .../parser_impl_function_type_decl_test.cc | 7 --- .../parser_impl_global_constant_decl_test.cc | 5 -- .../wgsl/parser_impl_global_decl_test.cc | 6 -- .../parser_impl_global_variable_decl_test.cc | 6 -- src/reader/wgsl/parser_impl_if_stmt_test.cc | 6 -- .../parser_impl_image_storage_type_test.cc | 3 - ...arser_impl_inclusive_or_expression_test.cc | 6 -- ...parser_impl_logical_and_expression_test.cc | 6 -- .../parser_impl_logical_or_expression_test.cc | 6 -- src/reader/wgsl/parser_impl_loop_stmt_test.cc | 2 - ...ser_impl_multiplicative_expression_test.cc | 6 -- .../wgsl/parser_impl_param_list_test.cc | 8 --- .../wgsl/parser_impl_paren_rhs_stmt_test.cc | 3 - .../wgsl/parser_impl_pipeline_stage_test.cc | 3 - .../parser_impl_postfix_expression_test.cc | 10 ---- .../parser_impl_primary_expression_test.cc | 12 ---- .../parser_impl_relational_expression_test.cc | 6 -- .../parser_impl_sampled_texture_type_test.cc | 3 - .../wgsl/parser_impl_sampler_type_test.cc | 3 - .../wgsl/parser_impl_shift_expression_test.cc | 6 -- src/reader/wgsl/parser_impl_statement_test.cc | 5 -- .../wgsl/parser_impl_statements_test.cc | 3 - .../wgsl/parser_impl_storage_class_test.cc | 3 - .../parser_impl_storage_texture_type_test.cc | 3 - .../wgsl/parser_impl_struct_body_decl_test.cc | 3 - .../wgsl/parser_impl_struct_decl_test.cc | 3 - ...parser_impl_struct_decoration_decl_test.cc | 2 - .../parser_impl_struct_decoration_test.cc | 3 - ...impl_struct_member_decoration_decl_test.cc | 3 - ...rser_impl_struct_member_decoration_test.cc | 3 - .../wgsl/parser_impl_struct_member_test.cc | 4 -- .../wgsl/parser_impl_switch_body_test.cc | 3 - .../wgsl/parser_impl_switch_stmt_test.cc | 4 -- src/reader/wgsl/parser_impl_test.cc | 4 -- src/reader/wgsl/parser_impl_test_helper.h | 1 - .../parser_impl_texture_sampler_types_test.cc | 7 --- .../wgsl/parser_impl_type_alias_test.cc | 6 -- src/reader/wgsl/parser_impl_type_decl_test.cc | 14 ----- .../wgsl/parser_impl_unary_expression_test.cc | 6 -- .../wgsl/parser_impl_variable_decl_test.cc | 4 -- ...rser_impl_variable_decoration_list_test.cc | 4 -- .../parser_impl_variable_decoration_test.cc | 6 -- .../parser_impl_variable_ident_decl_test.cc | 6 -- .../wgsl/parser_impl_variable_stmt_test.cc | 4 -- ...r_impl_variable_storage_decoration_test.cc | 3 - src/reader/wgsl/token.h | 3 - src/resolver/resolver.cc | 31 ---------- src/resolver/resolver.h | 5 -- src/resolver/resolver_test.cc | 41 -------------- src/scope_stack_test.cc | 3 - src/semantic/call_target.h | 1 - src/semantic/function.h | 1 - src/semantic/intrinsic.h | 1 - src/semantic/sem_call_target.cc | 1 - src/semantic/sem_expression.cc | 2 - src/semantic/sem_function.cc | 7 --- src/semantic/sem_statement.cc | 2 - src/semantic/type_mappings.h | 2 - src/semantic/variable.h | 3 - src/source.h | 3 - src/test_main.cc | 2 - src/traits.h | 1 - src/traits_test.cc | 2 - src/transform/bound_array_accessors.cc | 30 ---------- src/transform/bound_array_accessors.h | 6 -- src/transform/emit_vertex_point_size.cc | 10 ---- src/transform/first_index_offset.cc | 33 ----------- src/transform/first_index_offset.h | 2 - src/transform/hlsl.cc | 1 - src/transform/hlsl_test.cc | 4 -- src/transform/manager.cc | 2 - src/transform/manager.h | 2 - src/transform/msl_test.cc | 3 - src/transform/renamer.cc | 2 - src/transform/spirv.cc | 2 - src/transform/spirv_test.cc | 4 -- src/transform/test_helper.h | 2 - src/transform/transform.cc | 3 - src/transform/transform.h | 3 - src/transform/vertex_pulling.cc | 20 ------- src/transform/vertex_pulling.h | 5 -- src/type/access_control_type.cc | 3 - src/type/access_control_type_test.cc | 17 ------ src/type/alias_type.cc | 3 - src/type/alias_type.h | 1 - src/type/alias_type_test.cc | 18 ------ src/type/array_type.cc | 4 -- src/type/array_type.h | 3 - src/type/array_type_test.cc | 14 ----- src/type/bool_type.cc | 1 - src/type/bool_type_test.cc | 10 ---- src/type/depth_texture_type.cc | 4 -- src/type/depth_texture_type_test.cc | 9 --- src/type/f32_type.cc | 1 - src/type/f32_type_test.cc | 10 ---- src/type/i32_type.cc | 1 - src/type/i32_type_test.cc | 10 ---- src/type/matrix_type.cc | 5 -- src/type/matrix_type_test.cc | 10 ---- src/type/multisampled_texture_type.cc | 4 -- src/type/multisampled_texture_type_test.cc | 9 --- src/type/pointer_type.cc | 1 - src/type/pointer_type.h | 1 - src/type/pointer_type_test.cc | 10 ---- src/type/sampled_texture_type.cc | 4 -- src/type/sampled_texture_type_test.cc | 9 --- src/type/sampler_type.cc | 1 - src/type/sampler_type.h | 1 - src/type/sampler_type_test.cc | 11 ---- src/type/storage_texture_type.cc | 4 -- src/type/storage_texture_type_test.cc | 12 ---- src/type/struct_type.cc | 6 -- src/type/struct_type.h | 2 - src/type/struct_type_test.cc | 16 ------ src/type/test_helper.h | 2 - src/type/texture_type.cc | 6 -- src/type/type.cc | 9 +-- src/type/type_manager.cc | 2 - src/type/u32_type.cc | 1 - src/type/u32_type_test.cc | 11 ---- src/type/vector_type.cc | 4 -- src/type/vector_type_test.cc | 10 ---- src/type/void_type.cc | 1 - src/utils/command_posix.cc | 6 -- src/utils/tmpfile_posix.cc | 2 - src/utils/unique_vector.h | 2 +- src/validator/validator.h | 6 -- src/validator/validator_builtins_test.cc | 14 ----- src/validator/validator_control_block_test.cc | 15 ----- src/validator/validator_function_test.cc | 13 ----- src/validator/validator_impl.cc | 14 ----- src/validator/validator_impl.h | 8 --- src/validator/validator_test.cc | 38 ------------- src/validator/validator_test_helper.cc | 2 - src/validator/validator_test_helper.h | 2 - src/validator/validator_type_test.cc | 14 ----- src/writer/append_vector.cc | 4 -- src/writer/hlsl/generator.cc | 2 - src/writer/hlsl/generator.h | 2 - src/writer/hlsl/generator_impl.cc | 40 ------------- src/writer/hlsl/generator_impl.h | 11 ---- .../hlsl/generator_impl_alias_type_test.cc | 5 -- .../generator_impl_array_accessor_test.cc | 8 --- src/writer/hlsl/generator_impl_assign_test.cc | 6 -- src/writer/hlsl/generator_impl_binary_test.cc | 24 -------- .../hlsl/generator_impl_bitcast_test.cc | 8 --- src/writer/hlsl/generator_impl_block_test.cc | 4 -- src/writer/hlsl/generator_impl_break_test.cc | 5 -- src/writer/hlsl/generator_impl_call_test.cc | 7 --- src/writer/hlsl/generator_impl_case_test.cc | 8 --- src/writer/hlsl/generator_impl_cast_test.cc | 7 --- .../hlsl/generator_impl_constructor_test.cc | 14 ----- .../hlsl/generator_impl_continue_test.cc | 5 -- .../hlsl/generator_impl_discard_test.cc | 2 - ...tor_impl_function_entry_point_data_test.cc | 11 ---- .../hlsl/generator_impl_function_test.cc | 25 --------- .../hlsl/generator_impl_identifier_test.cc | 2 - src/writer/hlsl/generator_impl_if_test.cc | 5 -- src/writer/hlsl/generator_impl_import_test.cc | 15 ----- .../hlsl/generator_impl_intrinsic_test.cc | 7 --- .../generator_impl_intrinsic_texture_test.cc | 7 --- src/writer/hlsl/generator_impl_loop_test.cc | 11 ---- .../generator_impl_member_accessor_test.cc | 17 ------ .../generator_impl_module_constant_test.cc | 10 ---- src/writer/hlsl/generator_impl_return_test.cc | 6 -- .../hlsl/generator_impl_sanitizer_test.cc | 6 -- src/writer/hlsl/generator_impl_switch_test.cc | 9 --- src/writer/hlsl/generator_impl_test.cc | 6 -- src/writer/hlsl/generator_impl_type_test.cc | 17 ------ .../hlsl/generator_impl_unary_op_test.cc | 6 -- ...rator_impl_variable_decl_statement_test.cc | 10 ---- src/writer/hlsl/test_helper.h | 3 - src/writer/msl/generator.cc | 2 - src/writer/msl/generator.h | 1 - src/writer/msl/generator_impl.cc | 26 --------- src/writer/msl/generator_impl.h | 7 --- .../msl/generator_impl_alias_type_test.cc | 6 -- .../msl/generator_impl_array_accessor_test.cc | 10 ---- src/writer/msl/generator_impl_assign_test.cc | 8 --- src/writer/msl/generator_impl_binary_test.cc | 7 --- src/writer/msl/generator_impl_bitcast_test.cc | 8 --- src/writer/msl/generator_impl_block_test.cc | 6 -- src/writer/msl/generator_impl_break_test.cc | 7 --- src/writer/msl/generator_impl_call_test.cc | 9 --- src/writer/msl/generator_impl_case_test.cc | 10 ---- src/writer/msl/generator_impl_cast_test.cc | 9 --- .../msl/generator_impl_constructor_test.cc | 16 ------ .../msl/generator_impl_continue_test.cc | 7 --- src/writer/msl/generator_impl_discard_test.cc | 4 -- ...tor_impl_function_entry_point_data_test.cc | 15 ----- .../msl/generator_impl_function_test.cc | 29 ---------- .../msl/generator_impl_identifier_test.cc | 4 -- src/writer/msl/generator_impl_if_test.cc | 7 --- src/writer/msl/generator_impl_import_test.cc | 17 ------ .../msl/generator_impl_intrinsic_test.cc | 9 --- .../generator_impl_intrinsic_texture_test.cc | 7 --- src/writer/msl/generator_impl_loop_test.cc | 13 ----- .../generator_impl_member_accessor_test.cc | 7 --- .../generator_impl_module_constant_test.cc | 12 ---- src/writer/msl/generator_impl_return_test.cc | 8 --- src/writer/msl/generator_impl_switch_test.cc | 11 ---- src/writer/msl/generator_impl_test.cc | 24 -------- src/writer/msl/generator_impl_type_test.cc | 19 ------- .../msl/generator_impl_unary_op_test.cc | 8 --- ...rator_impl_variable_decl_statement_test.cc | 18 ------ src/writer/msl/test_helper.h | 2 - src/writer/spirv/binary_writer_test.cc | 7 --- src/writer/spirv/builder.cc | 53 ------------------ src/writer/spirv/builder.h | 18 ------ .../spirv/builder_accessor_expression_test.cc | 22 -------- src/writer/spirv/builder_assign_test.cc | 18 ------ .../spirv/builder_binary_expression_test.cc | 18 ------ .../spirv/builder_bitcast_expression_test.cc | 8 --- src/writer/spirv/builder_block_test.cc | 11 ---- src/writer/spirv/builder_call_test.cc | 14 ----- .../builder_constructor_expression_test.cc | 26 --------- src/writer/spirv/builder_discard_test.cc | 3 - .../spirv/builder_format_conversion_test.cc | 2 - .../spirv/builder_function_decoration_test.cc | 12 ---- src/writer/spirv/builder_function_test.cc | 20 ------- .../spirv/builder_function_variable_test.cc | 21 ------- .../spirv/builder_global_variable_test.cc | 25 --------- .../spirv/builder_ident_expression_test.cc | 14 ----- src/writer/spirv/builder_if_test.cc | 17 ------ src/writer/spirv/builder_intrinsic_test.cc | 29 ---------- .../spirv/builder_intrinsic_texture_test.cc | 7 --- src/writer/spirv/builder_literal_test.cc | 12 ---- src/writer/spirv/builder_loop_test.cc | 12 ---- src/writer/spirv/builder_return_test.cc | 11 ---- src/writer/spirv/builder_switch_test.cc | 15 ----- src/writer/spirv/builder_test.cc | 8 --- src/writer/spirv/builder_type_test.cc | 24 -------- .../spirv/builder_unary_op_expression_test.cc | 14 ----- src/writer/spirv/function.h | 3 - src/writer/spirv/generator.cc | 2 - src/writer/spirv/generator.h | 2 - src/writer/spirv/instruction_test.cc | 1 - src/writer/spirv/operand.cc | 2 - src/writer/spirv/spv_dump.h | 1 - src/writer/spirv/test_helper.h | 4 -- src/writer/text.cc | 2 - src/writer/text_generator.cc | 4 -- src/writer/wgsl/generator.cc | 2 - src/writer/wgsl/generator.h | 1 - src/writer/wgsl/generator_impl.cc | 35 ------------ src/writer/wgsl/generator_impl.h | 8 --- .../wgsl/generator_impl_alias_type_test.cc | 6 -- .../generator_impl_array_accessor_test.cc | 9 --- src/writer/wgsl/generator_impl_assign_test.cc | 7 --- src/writer/wgsl/generator_impl_binary_test.cc | 6 -- .../wgsl/generator_impl_bitcast_test.cc | 7 --- src/writer/wgsl/generator_impl_block_test.cc | 6 -- src/writer/wgsl/generator_impl_break_test.cc | 6 -- src/writer/wgsl/generator_impl_call_test.cc | 6 -- src/writer/wgsl/generator_impl_case_test.cc | 9 --- src/writer/wgsl/generator_impl_cast_test.cc | 7 --- .../wgsl/generator_impl_constructor_test.cc | 14 ----- .../wgsl/generator_impl_continue_test.cc | 6 -- .../wgsl/generator_impl_discard_test.cc | 3 - .../wgsl/generator_impl_entry_point_test.cc | 5 -- .../wgsl/generator_impl_fallthrough_test.cc | 3 - .../wgsl/generator_impl_function_test.cc | 13 ----- .../wgsl/generator_impl_global_decl_test.cc | 6 -- .../wgsl/generator_impl_identifier_test.cc | 2 - src/writer/wgsl/generator_impl_if_test.cc | 6 -- src/writer/wgsl/generator_impl_loop_test.cc | 6 -- .../generator_impl_member_accessor_test.cc | 6 -- src/writer/wgsl/generator_impl_return_test.cc | 7 --- src/writer/wgsl/generator_impl_switch_test.cc | 10 ---- src/writer/wgsl/generator_impl_test.cc | 9 --- src/writer/wgsl/generator_impl_type_test.cc | 21 ------- .../wgsl/generator_impl_unary_op_test.cc | 7 --- ...rator_impl_variable_decl_statement_test.cc | 8 --- .../wgsl/generator_impl_variable_test.cc | 11 ---- src/writer/writer.cc | 2 - src/writer/writer.h | 1 - 506 files changed, 5 insertions(+), 3276 deletions(-) diff --git a/src/ast/access_decoration.cc b/src/ast/access_decoration.cc index ed90ddc74d..b01c44b3ca 100644 --- a/src/ast/access_decoration.cc +++ b/src/ast/access_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/access_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::AccessDecoration); diff --git a/src/ast/access_decoration.h b/src/ast/access_decoration.h index 507b8f377d..9b77f2bf69 100644 --- a/src/ast/access_decoration.h +++ b/src/ast/access_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_ACCESS_DECORATION_H_ #define SRC_AST_ACCESS_DECORATION_H_ -#include - #include "src/ast/access_control.h" #include "src/ast/type_decoration.h" diff --git a/src/ast/access_decoration_test.cc b/src/ast/access_decoration_test.cc index 31b6e3d851..7fde9f7c44 100644 --- a/src/ast/access_decoration_test.cc +++ b/src/ast/access_decoration_test.cc @@ -14,8 +14,6 @@ #include "src/ast/access_decoration.h" -#include - #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/array_accessor_expression.cc b/src/ast/array_accessor_expression.cc index f82337f5f3..934055ec1d 100644 --- a/src/ast/array_accessor_expression.cc +++ b/src/ast/array_accessor_expression.cc @@ -14,7 +14,6 @@ #include "src/ast/array_accessor_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::ArrayAccessorExpression); diff --git a/src/ast/array_accessor_expression.h b/src/ast/array_accessor_expression.h index 81dae4b368..f6e8f1e17c 100644 --- a/src/ast/array_accessor_expression.h +++ b/src/ast/array_accessor_expression.h @@ -15,11 +15,7 @@ #ifndef SRC_AST_ARRAY_ACCESSOR_EXPRESSION_H_ #define SRC_AST_ARRAY_ACCESSOR_EXPRESSION_H_ -#include -#include - #include "src/ast/expression.h" -#include "src/ast/literal.h" namespace tint { namespace ast { diff --git a/src/ast/array_accessor_expression_test.cc b/src/ast/array_accessor_expression_test.cc index fbe3efd87a..671ec988c5 100644 --- a/src/ast/array_accessor_expression_test.cc +++ b/src/ast/array_accessor_expression_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/array_accessor_expression.h" - -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/array_decoration.cc b/src/ast/array_decoration.cc index 1da02afda7..9241f96dcb 100644 --- a/src/ast/array_decoration.cc +++ b/src/ast/array_decoration.cc @@ -14,10 +14,6 @@ #include "src/ast/array_decoration.h" -#include - -#include "src/ast/stride_decoration.h" - TINT_INSTANTIATE_TYPEINFO(tint::ast::ArrayDecoration); namespace tint { diff --git a/src/ast/assignment_statement.cc b/src/ast/assignment_statement.cc index f382948eab..3230499b97 100644 --- a/src/ast/assignment_statement.cc +++ b/src/ast/assignment_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/assignment_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::AssignmentStatement); diff --git a/src/ast/assignment_statement.h b/src/ast/assignment_statement.h index b8037759df..4368ee7771 100644 --- a/src/ast/assignment_statement.h +++ b/src/ast/assignment_statement.h @@ -15,11 +15,7 @@ #ifndef SRC_AST_ASSIGNMENT_STATEMENT_H_ #define SRC_AST_ASSIGNMENT_STATEMENT_H_ -#include -#include - #include "src/ast/expression.h" -#include "src/ast/literal.h" #include "src/ast/statement.h" namespace tint { diff --git a/src/ast/assignment_statement_test.cc b/src/ast/assignment_statement_test.cc index 046e3cd12b..3a0234f90d 100644 --- a/src/ast/assignment_statement_test.cc +++ b/src/ast/assignment_statement_test.cc @@ -14,7 +14,6 @@ #include "src/ast/assignment_statement.h" -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/binary_expression.cc b/src/ast/binary_expression.cc index a430e18496..83fbaac7fb 100644 --- a/src/ast/binary_expression.cc +++ b/src/ast/binary_expression.cc @@ -14,7 +14,6 @@ #include "src/ast/binary_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::BinaryExpression); diff --git a/src/ast/binary_expression.h b/src/ast/binary_expression.h index f02644315e..036eb5a413 100644 --- a/src/ast/binary_expression.h +++ b/src/ast/binary_expression.h @@ -15,11 +15,7 @@ #ifndef SRC_AST_BINARY_EXPRESSION_H_ #define SRC_AST_BINARY_EXPRESSION_H_ -#include -#include - #include "src/ast/expression.h" -#include "src/ast/literal.h" namespace tint { namespace ast { diff --git a/src/ast/binary_expression_test.cc b/src/ast/binary_expression_test.cc index d37435ce06..045231ecc9 100644 --- a/src/ast/binary_expression_test.cc +++ b/src/ast/binary_expression_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/binary_expression.h" - -#include - -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/binding_decoration.cc b/src/ast/binding_decoration.cc index b96c2aad34..3a385f6dbb 100644 --- a/src/ast/binding_decoration.cc +++ b/src/ast/binding_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/binding_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::BindingDecoration); diff --git a/src/ast/binding_decoration.h b/src/ast/binding_decoration.h index cae00429ea..08107ffc24 100644 --- a/src/ast/binding_decoration.h +++ b/src/ast/binding_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_BINDING_DECORATION_H_ #define SRC_AST_BINDING_DECORATION_H_ -#include - #include "src/ast/variable_decoration.h" namespace tint { diff --git a/src/ast/binding_decoration_test.cc b/src/ast/binding_decoration_test.cc index 1d4a08fed0..8f32660945 100644 --- a/src/ast/binding_decoration_test.cc +++ b/src/ast/binding_decoration_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/binding_decoration.h" - #include "src/ast/constant_id_decoration.h" #include "src/ast/test_helper.h" diff --git a/src/ast/bitcast_expression.cc b/src/ast/bitcast_expression.cc index a134c217b9..2b985f7c09 100644 --- a/src/ast/bitcast_expression.cc +++ b/src/ast/bitcast_expression.cc @@ -14,7 +14,6 @@ #include "src/ast/bitcast_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::BitcastExpression); diff --git a/src/ast/bitcast_expression.h b/src/ast/bitcast_expression.h index 7f9b93792e..d56dec8942 100644 --- a/src/ast/bitcast_expression.h +++ b/src/ast/bitcast_expression.h @@ -15,12 +15,7 @@ #ifndef SRC_AST_BITCAST_EXPRESSION_H_ #define SRC_AST_BITCAST_EXPRESSION_H_ -#include -#include - #include "src/ast/expression.h" -#include "src/ast/literal.h" -#include "src/type/type.h" namespace tint { namespace ast { diff --git a/src/ast/bitcast_expression_test.cc b/src/ast/bitcast_expression_test.cc index 1380400152..3f2cc7c00e 100644 --- a/src/ast/bitcast_expression_test.cc +++ b/src/ast/bitcast_expression_test.cc @@ -14,9 +14,7 @@ #include "src/ast/bitcast_expression.h" -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" -#include "src/type/f32_type.h" namespace tint { namespace ast { diff --git a/src/ast/block_statement.cc b/src/ast/block_statement.cc index d5d18dce5b..5ed4d04ba7 100644 --- a/src/ast/block_statement.cc +++ b/src/ast/block_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/block_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::BlockStatement); diff --git a/src/ast/block_statement.h b/src/ast/block_statement.h index a2cb102b22..f5653f955c 100644 --- a/src/ast/block_statement.h +++ b/src/ast/block_statement.h @@ -15,9 +15,7 @@ #ifndef SRC_AST_BLOCK_STATEMENT_H_ #define SRC_AST_BLOCK_STATEMENT_H_ -#include #include -#include #include "src/ast/statement.h" diff --git a/src/ast/block_statement_test.cc b/src/ast/block_statement_test.cc index ddbbcadb30..c4a583cc01 100644 --- a/src/ast/block_statement_test.cc +++ b/src/ast/block_statement_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/block_statement.h" - -#include -#include - #include "src/ast/discard_statement.h" #include "src/ast/if_statement.h" #include "src/ast/test_helper.h" diff --git a/src/ast/bool_literal.cc b/src/ast/bool_literal.cc index d689730b24..e6e2fb6549 100644 --- a/src/ast/bool_literal.cc +++ b/src/ast/bool_literal.cc @@ -14,7 +14,6 @@ #include "src/ast/bool_literal.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::BoolLiteral); diff --git a/src/ast/bool_literal_test.cc b/src/ast/bool_literal_test.cc index 59ee37a288..398ff84309 100644 --- a/src/ast/bool_literal_test.cc +++ b/src/ast/bool_literal_test.cc @@ -12,14 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/bool_literal.h" - -#include "src/ast/float_literal.h" #include "src/ast/null_literal.h" -#include "src/ast/sint_literal.h" #include "src/ast/test_helper.h" -#include "src/ast/uint_literal.h" -#include "src/type/bool_type.h" namespace tint { namespace ast { diff --git a/src/ast/break_statement.cc b/src/ast/break_statement.cc index 4346939ccc..9ec4e347ed 100644 --- a/src/ast/break_statement.cc +++ b/src/ast/break_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/break_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::BreakStatement); diff --git a/src/ast/builtin_decoration.cc b/src/ast/builtin_decoration.cc index 90b5e40ded..9ae92cca90 100644 --- a/src/ast/builtin_decoration.cc +++ b/src/ast/builtin_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/builtin_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::BuiltinDecoration); diff --git a/src/ast/builtin_decoration_test.cc b/src/ast/builtin_decoration_test.cc index a0fd15bd75..90f4670d7b 100644 --- a/src/ast/builtin_decoration_test.cc +++ b/src/ast/builtin_decoration_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/builtin_decoration.h" - #include "src/ast/constant_id_decoration.h" #include "src/ast/test_helper.h" diff --git a/src/ast/call_expression.cc b/src/ast/call_expression.cc index 8a85eb2347..628dae64b0 100644 --- a/src/ast/call_expression.cc +++ b/src/ast/call_expression.cc @@ -14,7 +14,6 @@ #include "src/ast/call_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::CallExpression); diff --git a/src/ast/call_expression.h b/src/ast/call_expression.h index 997d4c681d..b503d036d0 100644 --- a/src/ast/call_expression.h +++ b/src/ast/call_expression.h @@ -15,11 +15,7 @@ #ifndef SRC_AST_CALL_EXPRESSION_H_ #define SRC_AST_CALL_EXPRESSION_H_ -#include -#include - #include "src/ast/expression.h" -#include "src/ast/literal.h" namespace tint { namespace ast { diff --git a/src/ast/call_expression_test.cc b/src/ast/call_expression_test.cc index fd1800935e..e02d6bb7c4 100644 --- a/src/ast/call_expression_test.cc +++ b/src/ast/call_expression_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/call_expression.h" - -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/call_statement.cc b/src/ast/call_statement.cc index b5fedd3117..16ecfb127f 100644 --- a/src/ast/call_statement.cc +++ b/src/ast/call_statement.cc @@ -14,8 +14,6 @@ #include "src/ast/call_statement.h" -#include "src/ast/call_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::CallStatement); diff --git a/src/ast/call_statement.h b/src/ast/call_statement.h index 01698fb04f..dd2c837622 100644 --- a/src/ast/call_statement.h +++ b/src/ast/call_statement.h @@ -15,9 +15,6 @@ #ifndef SRC_AST_CALL_STATEMENT_H_ #define SRC_AST_CALL_STATEMENT_H_ -#include -#include - #include "src/ast/call_expression.h" #include "src/ast/statement.h" diff --git a/src/ast/call_statement_test.cc b/src/ast/call_statement_test.cc index 57b72e9828..2736463cc1 100644 --- a/src/ast/call_statement_test.cc +++ b/src/ast/call_statement_test.cc @@ -14,8 +14,6 @@ #include "src/ast/call_statement.h" -#include "src/ast/call_expression.h" -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/case_statement.cc b/src/ast/case_statement.cc index dd601268f6..5f4dc37b95 100644 --- a/src/ast/case_statement.cc +++ b/src/ast/case_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/case_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::CaseStatement); diff --git a/src/ast/case_statement.h b/src/ast/case_statement.h index e62a47a371..ef9c1ffecb 100644 --- a/src/ast/case_statement.h +++ b/src/ast/case_statement.h @@ -15,14 +15,10 @@ #ifndef SRC_AST_CASE_STATEMENT_H_ #define SRC_AST_CASE_STATEMENT_H_ -#include -#include #include #include "src/ast/block_statement.h" -#include "src/ast/expression.h" #include "src/ast/int_literal.h" -#include "src/ast/statement.h" namespace tint { namespace ast { diff --git a/src/ast/case_statement_test.cc b/src/ast/case_statement_test.cc index 301036cdce..2f9c74c402 100644 --- a/src/ast/case_statement_test.cc +++ b/src/ast/case_statement_test.cc @@ -16,11 +16,7 @@ #include "src/ast/discard_statement.h" #include "src/ast/if_statement.h" -#include "src/ast/sint_literal.h" #include "src/ast/test_helper.h" -#include "src/ast/uint_literal.h" -#include "src/type/i32_type.h" -#include "src/type/u32_type.h" namespace tint { namespace ast { diff --git a/src/ast/constant_id_decoration.cc b/src/ast/constant_id_decoration.cc index f8167036f3..d80a3aacb4 100644 --- a/src/ast/constant_id_decoration.cc +++ b/src/ast/constant_id_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/constant_id_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::ConstantIdDecoration); diff --git a/src/ast/constant_id_decoration.h b/src/ast/constant_id_decoration.h index faba01bab9..bc9c7c38e0 100644 --- a/src/ast/constant_id_decoration.h +++ b/src/ast/constant_id_decoration.h @@ -15,7 +15,6 @@ #ifndef SRC_AST_CONSTANT_ID_DECORATION_H_ #define SRC_AST_CONSTANT_ID_DECORATION_H_ -#include "src/ast/builtin.h" #include "src/ast/variable_decoration.h" namespace tint { diff --git a/src/ast/constructor_expression.cc b/src/ast/constructor_expression.cc index 7074cf95e1..9df22c6361 100644 --- a/src/ast/constructor_expression.cc +++ b/src/ast/constructor_expression.cc @@ -14,8 +14,6 @@ #include "src/ast/constructor_expression.h" -#include - TINT_INSTANTIATE_TYPEINFO(tint::ast::ConstructorExpression); namespace tint { diff --git a/src/ast/continue_statement.cc b/src/ast/continue_statement.cc index a82cd34c2b..f5d5201226 100644 --- a/src/ast/continue_statement.cc +++ b/src/ast/continue_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/continue_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::ContinueStatement); diff --git a/src/ast/continue_statement.h b/src/ast/continue_statement.h index df8a3a549c..512741fce7 100644 --- a/src/ast/continue_statement.h +++ b/src/ast/continue_statement.h @@ -15,9 +15,6 @@ #ifndef SRC_AST_CONTINUE_STATEMENT_H_ #define SRC_AST_CONTINUE_STATEMENT_H_ -#include -#include - #include "src/ast/statement.h" namespace tint { diff --git a/src/ast/decoration.h b/src/ast/decoration.h index 7a92d4ad15..378ad7e3b1 100644 --- a/src/ast/decoration.h +++ b/src/ast/decoration.h @@ -15,12 +15,9 @@ #ifndef SRC_AST_DECORATION_H_ #define SRC_AST_DECORATION_H_ -#include -#include #include #include "src/ast/node.h" -#include "src/source.h" namespace tint { namespace ast { diff --git a/src/ast/decoration_test.cc b/src/ast/decoration_test.cc index ea8ac2ac82..1bab2c019c 100644 --- a/src/ast/decoration_test.cc +++ b/src/ast/decoration_test.cc @@ -12,28 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/decoration.h" - -#include -#include -#include -#include - #include "src/ast/access_decoration.h" -#include "src/ast/array_decoration.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/builtin_decoration.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/function_decoration.h" -#include "src/ast/location_decoration.h" #include "src/ast/stage_decoration.h" -#include "src/ast/stride_decoration.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" #include "src/ast/test_helper.h" -#include "src/ast/type_decoration.h" -#include "src/ast/variable_decoration.h" #include "src/ast/workgroup_decoration.h" namespace tint { diff --git a/src/ast/discard_statement.cc b/src/ast/discard_statement.cc index e4a2c857bd..a33373ff6d 100644 --- a/src/ast/discard_statement.cc +++ b/src/ast/discard_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/discard_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::DiscardStatement); diff --git a/src/ast/discard_statement_test.cc b/src/ast/discard_statement_test.cc index 6f6b3c337c..8033abedc9 100644 --- a/src/ast/discard_statement_test.cc +++ b/src/ast/discard_statement_test.cc @@ -14,8 +14,6 @@ #include "src/ast/discard_statement.h" -#include - #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/else_statement.cc b/src/ast/else_statement.cc index 7643946a10..aa359e5174 100644 --- a/src/ast/else_statement.cc +++ b/src/ast/else_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/else_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::ElseStatement); diff --git a/src/ast/else_statement.h b/src/ast/else_statement.h index 95977dd916..9e3401918f 100644 --- a/src/ast/else_statement.h +++ b/src/ast/else_statement.h @@ -15,13 +15,10 @@ #ifndef SRC_AST_ELSE_STATEMENT_H_ #define SRC_AST_ELSE_STATEMENT_H_ -#include -#include #include #include "src/ast/block_statement.h" #include "src/ast/expression.h" -#include "src/ast/statement.h" namespace tint { namespace ast { diff --git a/src/ast/else_statement_test.cc b/src/ast/else_statement_test.cc index 95f3f0dce9..e17e599f5e 100644 --- a/src/ast/else_statement_test.cc +++ b/src/ast/else_statement_test.cc @@ -12,14 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/else_statement.h" - -#include "src/ast/bool_literal.h" #include "src/ast/discard_statement.h" #include "src/ast/if_statement.h" -#include "src/ast/scalar_constructor_expression.h" #include "src/ast/test_helper.h" -#include "src/type/bool_type.h" namespace tint { namespace ast { diff --git a/src/ast/expression.h b/src/ast/expression.h index 62a9a724f2..fbf1fe5900 100644 --- a/src/ast/expression.h +++ b/src/ast/expression.h @@ -15,7 +15,6 @@ #ifndef SRC_AST_EXPRESSION_H_ #define SRC_AST_EXPRESSION_H_ -#include #include #include diff --git a/src/ast/fallthrough_statement.cc b/src/ast/fallthrough_statement.cc index 5110928489..1dcf72df1a 100644 --- a/src/ast/fallthrough_statement.cc +++ b/src/ast/fallthrough_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/fallthrough_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::FallthroughStatement); diff --git a/src/ast/float_literal.cc b/src/ast/float_literal.cc index 421880a4f8..945416220c 100644 --- a/src/ast/float_literal.cc +++ b/src/ast/float_literal.cc @@ -15,9 +15,7 @@ #include "src/ast/float_literal.h" #include -#include -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::FloatLiteral); diff --git a/src/ast/float_literal_test.cc b/src/ast/float_literal_test.cc index 802b1249ee..4f7572cd83 100644 --- a/src/ast/float_literal_test.cc +++ b/src/ast/float_literal_test.cc @@ -12,14 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/float_literal.h" - -#include "src/ast/bool_literal.h" #include "src/ast/null_literal.h" -#include "src/ast/sint_literal.h" #include "src/ast/test_helper.h" -#include "src/ast/uint_literal.h" -#include "src/type/f32_type.h" namespace tint { namespace ast { diff --git a/src/ast/function.cc b/src/ast/function.cc index 81102486a1..5858867084 100644 --- a/src/ast/function.cc +++ b/src/ast/function.cc @@ -14,16 +14,9 @@ #include "src/ast/function.h" -#include - #include "src/ast/stage_decoration.h" -#include "src/ast/variable.h" #include "src/ast/workgroup_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" -#include "src/type/multisampled_texture_type.h" -#include "src/type/sampled_texture_type.h" -#include "src/type/texture_type.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::Function); diff --git a/src/ast/function.h b/src/ast/function.h index ca2f6f3bcf..8ac517e428 100644 --- a/src/ast/function.h +++ b/src/ast/function.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_FUNCTION_H_ #define SRC_AST_FUNCTION_H_ -#include -#include #include #include #include @@ -25,17 +23,11 @@ #include "src/ast/binding_decoration.h" #include "src/ast/block_statement.h" #include "src/ast/builtin_decoration.h" -#include "src/ast/expression.h" #include "src/ast/function_decoration.h" #include "src/ast/group_decoration.h" #include "src/ast/location_decoration.h" -#include "src/ast/node.h" #include "src/ast/pipeline_stage.h" -#include "src/ast/statement.h" #include "src/ast/variable.h" -#include "src/symbol.h" -#include "src/type/sampler_type.h" -#include "src/type/type.h" namespace tint { namespace ast { diff --git a/src/ast/function_decoration.h b/src/ast/function_decoration.h index 556a0d90eb..5a75e0e52b 100644 --- a/src/ast/function_decoration.h +++ b/src/ast/function_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_FUNCTION_DECORATION_H_ #define SRC_AST_FUNCTION_DECORATION_H_ -#include -#include #include #include "src/ast/decoration.h" diff --git a/src/ast/function_test.cc b/src/ast/function_test.cc index 2d65a45801..db7aee9146 100644 --- a/src/ast/function_test.cc +++ b/src/ast/function_test.cc @@ -12,15 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/function.h" - -#include "src/ast/builtin_decoration.h" #include "src/ast/discard_statement.h" -#include "src/ast/location_decoration.h" -#include "src/ast/pipeline_stage.h" #include "src/ast/stage_decoration.h" #include "src/ast/test_helper.h" -#include "src/ast/variable.h" #include "src/ast/workgroup_decoration.h" namespace tint { diff --git a/src/ast/group_decoration.cc b/src/ast/group_decoration.cc index c64d3951a4..d5318595cd 100644 --- a/src/ast/group_decoration.cc +++ b/src/ast/group_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/group_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::GroupDecoration); diff --git a/src/ast/group_decoration.h b/src/ast/group_decoration.h index aa219e3e03..431ef86939 100644 --- a/src/ast/group_decoration.h +++ b/src/ast/group_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_GROUP_DECORATION_H_ #define SRC_AST_GROUP_DECORATION_H_ -#include - #include "src/ast/variable_decoration.h" namespace tint { diff --git a/src/ast/group_decoration_test.cc b/src/ast/group_decoration_test.cc index f600467e10..9dfbdd482b 100644 --- a/src/ast/group_decoration_test.cc +++ b/src/ast/group_decoration_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/group_decoration.h" - #include "src/ast/constant_id_decoration.h" #include "src/ast/test_helper.h" diff --git a/src/ast/identifier_expression.cc b/src/ast/identifier_expression.cc index cd5c346cf2..1f8c671111 100644 --- a/src/ast/identifier_expression.cc +++ b/src/ast/identifier_expression.cc @@ -14,7 +14,6 @@ #include "src/ast/identifier_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::IdentifierExpression); diff --git a/src/ast/identifier_expression.h b/src/ast/identifier_expression.h index 7b4da0e758..2794599882 100644 --- a/src/ast/identifier_expression.h +++ b/src/ast/identifier_expression.h @@ -15,12 +15,8 @@ #ifndef SRC_AST_IDENTIFIER_EXPRESSION_H_ #define SRC_AST_IDENTIFIER_EXPRESSION_H_ -#include -#include - #include "src/ast/expression.h" #include "src/semantic/intrinsic.h" -#include "src/symbol.h" namespace tint { namespace ast { diff --git a/src/ast/identifier_expression_test.cc b/src/ast/identifier_expression_test.cc index ba9f5efdde..3d22e1d66a 100644 --- a/src/ast/identifier_expression_test.cc +++ b/src/ast/identifier_expression_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/identifier_expression.h" - #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/if_statement.cc b/src/ast/if_statement.cc index 94fc2df4f6..eee9e092cc 100644 --- a/src/ast/if_statement.cc +++ b/src/ast/if_statement.cc @@ -14,8 +14,6 @@ #include "src/ast/if_statement.h" -#include "src/ast/else_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::IfStatement); diff --git a/src/ast/if_statement.h b/src/ast/if_statement.h index 3397368326..4c578aa9c4 100644 --- a/src/ast/if_statement.h +++ b/src/ast/if_statement.h @@ -15,13 +15,9 @@ #ifndef SRC_AST_IF_STATEMENT_H_ #define SRC_AST_IF_STATEMENT_H_ -#include #include -#include "src/ast/block_statement.h" #include "src/ast/else_statement.h" -#include "src/ast/expression.h" -#include "src/ast/statement.h" namespace tint { namespace ast { diff --git a/src/ast/if_statement_test.cc b/src/ast/if_statement_test.cc index 03cfda5681..a222886c45 100644 --- a/src/ast/if_statement_test.cc +++ b/src/ast/if_statement_test.cc @@ -15,7 +15,6 @@ #include "src/ast/if_statement.h" #include "src/ast/discard_statement.h" -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/int_literal_test.cc b/src/ast/int_literal_test.cc index 58abbfb3ca..01ce5d269b 100644 --- a/src/ast/int_literal_test.cc +++ b/src/ast/int_literal_test.cc @@ -12,16 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/int_literal.h" - -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/null_literal.h" -#include "src/ast/sint_literal.h" #include "src/ast/test_helper.h" -#include "src/ast/uint_literal.h" -#include "src/type/i32_type.h" -#include "src/type/u32_type.h" namespace tint { namespace ast { diff --git a/src/ast/intrinsic_texture_helper_test.cc b/src/ast/intrinsic_texture_helper_test.cc index 7341228537..4a8748c12d 100644 --- a/src/ast/intrinsic_texture_helper_test.cc +++ b/src/ast/intrinsic_texture_helper_test.cc @@ -14,14 +14,10 @@ #include "src/ast/intrinsic_texture_helper_test.h" -#include "src/ast/type_constructor_expression.h" -#include "src/debug.h" -#include "src/program_builder.h" #include "src/type/access_control_type.h" #include "src/type/depth_texture_type.h" #include "src/type/multisampled_texture_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/storage_texture_type.h" namespace tint { namespace ast { diff --git a/src/ast/intrinsic_texture_helper_test.h b/src/ast/intrinsic_texture_helper_test.h index 91425af705..521d2c9fab 100644 --- a/src/ast/intrinsic_texture_helper_test.h +++ b/src/ast/intrinsic_texture_helper_test.h @@ -15,14 +15,11 @@ #ifndef SRC_AST_INTRINSIC_TEXTURE_HELPER_TEST_H_ #define SRC_AST_INTRINSIC_TEXTURE_HELPER_TEST_H_ -#include #include #include "src/ast/access_control.h" #include "src/program_builder.h" -#include "src/type/sampler_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/texture_type.h" namespace tint { namespace ast { diff --git a/src/ast/literal.h b/src/ast/literal.h index 96779d7690..826c0bcfab 100644 --- a/src/ast/literal.h +++ b/src/ast/literal.h @@ -18,7 +18,6 @@ #include #include "src/ast/node.h" -#include "src/type/type.h" namespace tint { namespace ast { diff --git a/src/ast/location_decoration.cc b/src/ast/location_decoration.cc index 0337f296c8..d6e7f2f143 100644 --- a/src/ast/location_decoration.cc +++ b/src/ast/location_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/location_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::LocationDecoration); diff --git a/src/ast/location_decoration.h b/src/ast/location_decoration.h index 44e2c08ef0..c4715e5f01 100644 --- a/src/ast/location_decoration.h +++ b/src/ast/location_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_LOCATION_DECORATION_H_ #define SRC_AST_LOCATION_DECORATION_H_ -#include - #include "src/ast/variable_decoration.h" namespace tint { diff --git a/src/ast/location_decoration_test.cc b/src/ast/location_decoration_test.cc index fe3bab438b..fae40f9ba9 100644 --- a/src/ast/location_decoration_test.cc +++ b/src/ast/location_decoration_test.cc @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/location_decoration.h" - -#include - #include "src/ast/constant_id_decoration.h" #include "src/ast/test_helper.h" diff --git a/src/ast/loop_statement.cc b/src/ast/loop_statement.cc index 98c99e4c41..66774a8ce4 100644 --- a/src/ast/loop_statement.cc +++ b/src/ast/loop_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/loop_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::LoopStatement); diff --git a/src/ast/loop_statement.h b/src/ast/loop_statement.h index ede2fc069d..c0bc2dc88e 100644 --- a/src/ast/loop_statement.h +++ b/src/ast/loop_statement.h @@ -15,11 +15,7 @@ #ifndef SRC_AST_LOOP_STATEMENT_H_ #define SRC_AST_LOOP_STATEMENT_H_ -#include -#include - #include "src/ast/block_statement.h" -#include "src/ast/statement.h" namespace tint { namespace ast { diff --git a/src/ast/loop_statement_test.cc b/src/ast/loop_statement_test.cc index c971a761f8..7577773a72 100644 --- a/src/ast/loop_statement_test.cc +++ b/src/ast/loop_statement_test.cc @@ -14,9 +14,6 @@ #include "src/ast/loop_statement.h" -#include -#include - #include "src/ast/discard_statement.h" #include "src/ast/if_statement.h" #include "src/ast/test_helper.h" diff --git a/src/ast/member_accessor_expression.cc b/src/ast/member_accessor_expression.cc index b632a612ef..7ad670789b 100644 --- a/src/ast/member_accessor_expression.cc +++ b/src/ast/member_accessor_expression.cc @@ -14,7 +14,6 @@ #include "src/ast/member_accessor_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::MemberAccessorExpression); diff --git a/src/ast/member_accessor_expression.h b/src/ast/member_accessor_expression.h index 45b4d6882e..b3a87aba06 100644 --- a/src/ast/member_accessor_expression.h +++ b/src/ast/member_accessor_expression.h @@ -15,12 +15,7 @@ #ifndef SRC_AST_MEMBER_ACCESSOR_EXPRESSION_H_ #define SRC_AST_MEMBER_ACCESSOR_EXPRESSION_H_ -#include -#include - -#include "src/ast/expression.h" #include "src/ast/identifier_expression.h" -#include "src/ast/literal.h" namespace tint { namespace ast { diff --git a/src/ast/member_accessor_expression_test.cc b/src/ast/member_accessor_expression_test.cc index a4cfc8080a..06f004f1d1 100644 --- a/src/ast/member_accessor_expression_test.cc +++ b/src/ast/member_accessor_expression_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/member_accessor_expression.h" - -#include - -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/module.cc b/src/ast/module.cc index 3791a18a18..ed23908333 100644 --- a/src/ast/module.cc +++ b/src/ast/module.cc @@ -14,14 +14,9 @@ #include "src/ast/module.h" -#include -#include #include -#include "src/debug.h" #include "src/program_builder.h" -#include "src/type/alias_type.h" -#include "src/type/struct_type.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::Module); diff --git a/src/ast/module.h b/src/ast/module.h index cd506a22fa..91a4f87040 100644 --- a/src/ast/module.h +++ b/src/ast/module.h @@ -19,9 +19,6 @@ #include #include "src/ast/function.h" -#include "src/ast/node.h" -#include "src/ast/variable.h" -#include "src/type/type.h" namespace tint { namespace ast { diff --git a/src/ast/module_clone_test.cc b/src/ast/module_clone_test.cc index 22ffbb9867..39095fdf66 100644 --- a/src/ast/module_clone_test.cc +++ b/src/ast/module_clone_test.cc @@ -15,10 +15,6 @@ #include #include "gtest/gtest.h" -#include "src/ast/case_statement.h" -#include "src/ast/module.h" -#include "src/program.h" -#include "src/program_builder.h" #include "src/reader/wgsl/parser.h" #include "src/writer/wgsl/generator.h" diff --git a/src/ast/module_test.cc b/src/ast/module_test.cc index 7d629a9cfb..b77435f8e5 100644 --- a/src/ast/module_test.cc +++ b/src/ast/module_test.cc @@ -12,18 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/module.h" - -#include -#include - -#include "gmock/gmock.h" -#include "src/ast/function.h" #include "src/ast/test_helper.h" -#include "src/ast/variable.h" -#include "src/type/alias_type.h" -#include "src/type/f32_type.h" -#include "src/type/struct_type.h" namespace tint { namespace ast { diff --git a/src/ast/node.cc b/src/ast/node.cc index 4be1becc1d..a29fabc0a1 100644 --- a/src/ast/node.cc +++ b/src/ast/node.cc @@ -14,8 +14,6 @@ #include "src/ast/node.h" -#include - TINT_INSTANTIATE_TYPEINFO(tint::ast::Node); namespace tint { diff --git a/src/ast/node.h b/src/ast/node.h index c29c5e52da..fad460f17c 100644 --- a/src/ast/node.h +++ b/src/ast/node.h @@ -15,12 +15,9 @@ #ifndef SRC_AST_NODE_H_ #define SRC_AST_NODE_H_ -#include #include -#include #include "src/clone_context.h" -#include "src/source.h" namespace tint { diff --git a/src/ast/null_literal.cc b/src/ast/null_literal.cc index ccbc75cd83..1594789f51 100644 --- a/src/ast/null_literal.cc +++ b/src/ast/null_literal.cc @@ -14,7 +14,6 @@ #include "src/ast/null_literal.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::NullLiteral); diff --git a/src/ast/null_literal_test.cc b/src/ast/null_literal_test.cc index bd99d716da..ae90f3d7b5 100644 --- a/src/ast/null_literal_test.cc +++ b/src/ast/null_literal_test.cc @@ -14,12 +14,7 @@ #include "src/ast/null_literal.h" -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/sint_literal.h" #include "src/ast/test_helper.h" -#include "src/ast/uint_literal.h" -#include "src/type/i32_type.h" namespace tint { namespace ast { diff --git a/src/ast/return_statement.cc b/src/ast/return_statement.cc index 81ec4f380b..38df855ea8 100644 --- a/src/ast/return_statement.cc +++ b/src/ast/return_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/return_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::ReturnStatement); diff --git a/src/ast/return_statement.h b/src/ast/return_statement.h index 9de729ef16..0079248d81 100644 --- a/src/ast/return_statement.h +++ b/src/ast/return_statement.h @@ -15,9 +15,6 @@ #ifndef SRC_AST_RETURN_STATEMENT_H_ #define SRC_AST_RETURN_STATEMENT_H_ -#include -#include - #include "src/ast/expression.h" #include "src/ast/statement.h" diff --git a/src/ast/return_statement_test.cc b/src/ast/return_statement_test.cc index fec6da63ef..81fd712660 100644 --- a/src/ast/return_statement_test.cc +++ b/src/ast/return_statement_test.cc @@ -14,9 +14,6 @@ #include "src/ast/return_statement.h" -#include - -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/scalar_constructor_expression.cc b/src/ast/scalar_constructor_expression.cc index bd7a0345d0..e82c17cd33 100644 --- a/src/ast/scalar_constructor_expression.cc +++ b/src/ast/scalar_constructor_expression.cc @@ -14,7 +14,6 @@ #include "src/ast/scalar_constructor_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::ScalarConstructorExpression); diff --git a/src/ast/scalar_constructor_expression.h b/src/ast/scalar_constructor_expression.h index ee437805bb..fe6c6d9fb5 100644 --- a/src/ast/scalar_constructor_expression.h +++ b/src/ast/scalar_constructor_expression.h @@ -15,9 +15,6 @@ #ifndef SRC_AST_SCALAR_CONSTRUCTOR_EXPRESSION_H_ #define SRC_AST_SCALAR_CONSTRUCTOR_EXPRESSION_H_ -#include -#include - #include "src/ast/constructor_expression.h" #include "src/ast/literal.h" diff --git a/src/ast/scalar_constructor_expression_test.cc b/src/ast/scalar_constructor_expression_test.cc index 1418b0a2a3..aadc5be2f1 100644 --- a/src/ast/scalar_constructor_expression_test.cc +++ b/src/ast/scalar_constructor_expression_test.cc @@ -12,11 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/scalar_constructor_expression.h" - -#include "src/ast/bool_literal.h" #include "src/ast/test_helper.h" -#include "src/type/bool_type.h" namespace tint { namespace ast { diff --git a/src/ast/sint_literal.cc b/src/ast/sint_literal.cc index 784e20437d..69fee9e71d 100644 --- a/src/ast/sint_literal.cc +++ b/src/ast/sint_literal.cc @@ -14,7 +14,6 @@ #include "src/ast/sint_literal.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::SintLiteral); diff --git a/src/ast/sint_literal_test.cc b/src/ast/sint_literal_test.cc index 3f9516de93..9ca7b9a508 100644 --- a/src/ast/sint_literal_test.cc +++ b/src/ast/sint_literal_test.cc @@ -12,15 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/sint_literal.h" - -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" #include "src/ast/null_literal.h" #include "src/ast/test_helper.h" -#include "src/ast/uint_literal.h" -#include "src/type/i32_type.h" -#include "src/type/u32_type.h" namespace tint { namespace ast { diff --git a/src/ast/stage_decoration.cc b/src/ast/stage_decoration.cc index d5bf1ad88a..77720c5753 100644 --- a/src/ast/stage_decoration.cc +++ b/src/ast/stage_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/stage_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::StageDecoration); diff --git a/src/ast/stage_decoration_test.cc b/src/ast/stage_decoration_test.cc index 5b0306ace4..ba1efa3d3c 100644 --- a/src/ast/stage_decoration_test.cc +++ b/src/ast/stage_decoration_test.cc @@ -14,8 +14,6 @@ #include "src/ast/stage_decoration.h" -#include - #include "src/ast/test_helper.h" #include "src/ast/workgroup_decoration.h" diff --git a/src/ast/statement.cc b/src/ast/statement.cc index 8ecb2b0daa..0283abe648 100644 --- a/src/ast/statement.cc +++ b/src/ast/statement.cc @@ -14,16 +14,11 @@ #include "src/ast/statement.h" -#include - #include "src/ast/assignment_statement.h" -#include "src/ast/block_statement.h" #include "src/ast/break_statement.h" #include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/continue_statement.h" #include "src/ast/discard_statement.h" -#include "src/ast/else_statement.h" #include "src/ast/fallthrough_statement.h" #include "src/ast/if_statement.h" #include "src/ast/loop_statement.h" diff --git a/src/ast/statement.h b/src/ast/statement.h index 14808d5722..53a6fd0fa4 100644 --- a/src/ast/statement.h +++ b/src/ast/statement.h @@ -15,7 +15,6 @@ #ifndef SRC_AST_STATEMENT_H_ #define SRC_AST_STATEMENT_H_ -#include #include #include "src/ast/node.h" diff --git a/src/ast/stride_decoration.cc b/src/ast/stride_decoration.cc index 8eb33e340c..6cf0c8fd47 100644 --- a/src/ast/stride_decoration.cc +++ b/src/ast/stride_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/stride_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::StrideDecoration); diff --git a/src/ast/stride_decoration.h b/src/ast/stride_decoration.h index d8ae8bb390..9b350dfa71 100644 --- a/src/ast/stride_decoration.h +++ b/src/ast/stride_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_STRIDE_DECORATION_H_ #define SRC_AST_STRIDE_DECORATION_H_ -#include - #include "src/ast/array_decoration.h" namespace tint { diff --git a/src/ast/stride_decoration_test.cc b/src/ast/stride_decoration_test.cc index 7046767acf..ae81a292e7 100644 --- a/src/ast/stride_decoration_test.cc +++ b/src/ast/stride_decoration_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/stride_decoration.h" - #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/struct.cc b/src/ast/struct.cc index f1445680e7..c21c17e534 100644 --- a/src/ast/struct.cc +++ b/src/ast/struct.cc @@ -15,7 +15,6 @@ #include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::Struct); diff --git a/src/ast/struct.h b/src/ast/struct.h index cff8c6e9e2..752ea055cd 100644 --- a/src/ast/struct.h +++ b/src/ast/struct.h @@ -15,11 +15,8 @@ #ifndef SRC_AST_STRUCT_H_ #define SRC_AST_STRUCT_H_ -#include -#include #include -#include "src/ast/node.h" #include "src/ast/struct_decoration.h" #include "src/ast/struct_member.h" diff --git a/src/ast/struct_block_decoration.cc b/src/ast/struct_block_decoration.cc index 6c116afed3..dfc3b0b09a 100644 --- a/src/ast/struct_block_decoration.cc +++ b/src/ast/struct_block_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/struct_block_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::StructBlockDecoration); diff --git a/src/ast/struct_block_decoration.h b/src/ast/struct_block_decoration.h index d18117a5fc..cd4bd4fc15 100644 --- a/src/ast/struct_block_decoration.h +++ b/src/ast/struct_block_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_STRUCT_BLOCK_DECORATION_H_ #define SRC_AST_STRUCT_BLOCK_DECORATION_H_ -#include -#include #include #include "src/ast/struct_decoration.h" diff --git a/src/ast/struct_decoration.h b/src/ast/struct_decoration.h index c8af9e712a..31c8e324c8 100644 --- a/src/ast/struct_decoration.h +++ b/src/ast/struct_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_STRUCT_DECORATION_H_ #define SRC_AST_STRUCT_DECORATION_H_ -#include -#include #include #include "src/ast/decoration.h" diff --git a/src/ast/struct_member.cc b/src/ast/struct_member.cc index 88b300fff2..f6146c1068 100644 --- a/src/ast/struct_member.cc +++ b/src/ast/struct_member.cc @@ -14,8 +14,6 @@ #include "src/ast/struct_member.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::StructMember); diff --git a/src/ast/struct_member.h b/src/ast/struct_member.h index 14411c7fab..92491e57cb 100644 --- a/src/ast/struct_member.h +++ b/src/ast/struct_member.h @@ -15,15 +15,10 @@ #ifndef SRC_AST_STRUCT_MEMBER_H_ #define SRC_AST_STRUCT_MEMBER_H_ -#include -#include #include #include -#include "src/ast/node.h" #include "src/ast/struct_member_decoration.h" -#include "src/symbol.h" -#include "src/type/type.h" namespace tint { namespace ast { diff --git a/src/ast/struct_member_decoration.cc b/src/ast/struct_member_decoration.cc index ff472c9861..1e5b818fcc 100644 --- a/src/ast/struct_member_decoration.cc +++ b/src/ast/struct_member_decoration.cc @@ -14,10 +14,6 @@ #include "src/ast/struct_member_decoration.h" -#include - -#include "src/ast/struct_member_offset_decoration.h" - TINT_INSTANTIATE_TYPEINFO(tint::ast::StructMemberDecoration); namespace tint { diff --git a/src/ast/struct_member_offset_decoration.cc b/src/ast/struct_member_offset_decoration.cc index 68cd7b3b62..4f9f736b71 100644 --- a/src/ast/struct_member_offset_decoration.cc +++ b/src/ast/struct_member_offset_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/struct_member_offset_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::StructMemberOffsetDecoration); diff --git a/src/ast/struct_member_offset_decoration.h b/src/ast/struct_member_offset_decoration.h index 96b207f95a..1052c69cd2 100644 --- a/src/ast/struct_member_offset_decoration.h +++ b/src/ast/struct_member_offset_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_STRUCT_MEMBER_OFFSET_DECORATION_H_ #define SRC_AST_STRUCT_MEMBER_OFFSET_DECORATION_H_ -#include - #include "src/ast/struct_member_decoration.h" namespace tint { diff --git a/src/ast/struct_member_offset_decoration_test.cc b/src/ast/struct_member_offset_decoration_test.cc index 196bebb372..9ebd0a9c4c 100644 --- a/src/ast/struct_member_offset_decoration_test.cc +++ b/src/ast/struct_member_offset_decoration_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/struct_member_offset_decoration.h" - #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/struct_member_test.cc b/src/ast/struct_member_test.cc index 3c2851bea1..1b835de6a2 100644 --- a/src/ast/struct_member_test.cc +++ b/src/ast/struct_member_test.cc @@ -12,14 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/struct_member.h" - -#include -#include - -#include "src/ast/struct_member_offset_decoration.h" #include "src/ast/test_helper.h" -#include "src/type/i32_type.h" namespace tint { namespace ast { diff --git a/src/ast/struct_test.cc b/src/ast/struct_test.cc index 8d5cc9f37b..f2bd221aee 100644 --- a/src/ast/struct_test.cc +++ b/src/ast/struct_test.cc @@ -12,16 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/struct.h" - -#include -#include -#include - #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member.h" #include "src/ast/test_helper.h" -#include "src/type/i32_type.h" namespace tint { namespace ast { diff --git a/src/ast/switch_statement.cc b/src/ast/switch_statement.cc index 3b2bf36f33..e196878fbf 100644 --- a/src/ast/switch_statement.cc +++ b/src/ast/switch_statement.cc @@ -14,8 +14,6 @@ #include "src/ast/switch_statement.h" -#include "src/ast/case_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::SwitchStatement); diff --git a/src/ast/switch_statement.h b/src/ast/switch_statement.h index 5a11cbdb36..d3d061d140 100644 --- a/src/ast/switch_statement.h +++ b/src/ast/switch_statement.h @@ -15,13 +15,8 @@ #ifndef SRC_AST_SWITCH_STATEMENT_H_ #define SRC_AST_SWITCH_STATEMENT_H_ -#include -#include - #include "src/ast/case_statement.h" #include "src/ast/expression.h" -#include "src/ast/literal.h" -#include "src/ast/statement.h" namespace tint { namespace ast { diff --git a/src/ast/switch_statement_test.cc b/src/ast/switch_statement_test.cc index cf455f0851..036cb8c283 100644 --- a/src/ast/switch_statement_test.cc +++ b/src/ast/switch_statement_test.cc @@ -14,13 +14,7 @@ #include "src/ast/switch_statement.h" -#include - -#include "src/ast/case_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/test_helper.h" -#include "src/type/i32_type.h" namespace tint { namespace ast { diff --git a/src/ast/test_helper.h b/src/ast/test_helper.h index ba072959a1..d7a229eabf 100644 --- a/src/ast/test_helper.h +++ b/src/ast/test_helper.h @@ -15,10 +15,6 @@ #ifndef SRC_AST_TEST_HELPER_H_ #define SRC_AST_TEST_HELPER_H_ -#include -#include -#include - #include "gtest/gtest.h" #include "src/program_builder.h" diff --git a/src/ast/type_constructor_expression.cc b/src/ast/type_constructor_expression.cc index d81bb349b1..c4f42ae30d 100644 --- a/src/ast/type_constructor_expression.cc +++ b/src/ast/type_constructor_expression.cc @@ -14,7 +14,6 @@ #include "src/ast/type_constructor_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::TypeConstructorExpression); diff --git a/src/ast/type_constructor_expression.h b/src/ast/type_constructor_expression.h index da05b9a043..30c5bbefa3 100644 --- a/src/ast/type_constructor_expression.h +++ b/src/ast/type_constructor_expression.h @@ -15,11 +15,9 @@ #ifndef SRC_AST_TYPE_CONSTRUCTOR_EXPRESSION_H_ #define SRC_AST_TYPE_CONSTRUCTOR_EXPRESSION_H_ -#include #include #include "src/ast/constructor_expression.h" -#include "src/type/type.h" namespace tint { namespace ast { diff --git a/src/ast/type_constructor_expression_test.cc b/src/ast/type_constructor_expression_test.cc index c09ea2ffff..d392294804 100644 --- a/src/ast/type_constructor_expression_test.cc +++ b/src/ast/type_constructor_expression_test.cc @@ -12,16 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/type_constructor_expression.h" - -#include -#include - -#include "src/ast/constructor_expression.h" -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" -#include "src/type/f32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace ast { diff --git a/src/ast/type_decoration.cc b/src/ast/type_decoration.cc index 03e458464c..8b7d45788a 100644 --- a/src/ast/type_decoration.cc +++ b/src/ast/type_decoration.cc @@ -14,10 +14,6 @@ #include "src/ast/type_decoration.h" -#include - -#include "src/ast/access_decoration.h" - TINT_INSTANTIATE_TYPEINFO(tint::ast::TypeDecoration); namespace tint { diff --git a/src/ast/uint_literal.cc b/src/ast/uint_literal.cc index db0338044a..5d981cc931 100644 --- a/src/ast/uint_literal.cc +++ b/src/ast/uint_literal.cc @@ -14,7 +14,6 @@ #include "src/ast/uint_literal.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::UintLiteral); diff --git a/src/ast/uint_literal_test.cc b/src/ast/uint_literal_test.cc index 3da63b8381..a1b09a43cc 100644 --- a/src/ast/uint_literal_test.cc +++ b/src/ast/uint_literal_test.cc @@ -12,14 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/uint_literal.h" - -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" #include "src/ast/null_literal.h" -#include "src/ast/sint_literal.h" #include "src/ast/test_helper.h" -#include "src/type/u32_type.h" namespace tint { namespace ast { diff --git a/src/ast/unary_op_expression.cc b/src/ast/unary_op_expression.cc index 10907c7b3e..3e5305b375 100644 --- a/src/ast/unary_op_expression.cc +++ b/src/ast/unary_op_expression.cc @@ -14,7 +14,6 @@ #include "src/ast/unary_op_expression.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::UnaryOpExpression); diff --git a/src/ast/unary_op_expression.h b/src/ast/unary_op_expression.h index 7e8cc585e8..60c97f027e 100644 --- a/src/ast/unary_op_expression.h +++ b/src/ast/unary_op_expression.h @@ -15,11 +15,7 @@ #ifndef SRC_AST_UNARY_OP_EXPRESSION_H_ #define SRC_AST_UNARY_OP_EXPRESSION_H_ -#include -#include - #include "src/ast/expression.h" -#include "src/ast/literal.h" #include "src/ast/unary_op.h" namespace tint { diff --git a/src/ast/unary_op_expression_test.cc b/src/ast/unary_op_expression_test.cc index fbd24ad2bf..8ac60829aa 100644 --- a/src/ast/unary_op_expression_test.cc +++ b/src/ast/unary_op_expression_test.cc @@ -14,9 +14,6 @@ #include "src/ast/unary_op_expression.h" -#include - -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" namespace tint { diff --git a/src/ast/variable.cc b/src/ast/variable.cc index 042d4123a0..0af22c03cf 100644 --- a/src/ast/variable.cc +++ b/src/ast/variable.cc @@ -14,10 +14,7 @@ #include "src/ast/variable.h" -#include - #include "src/ast/constant_id_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" #include "src/semantic/variable.h" diff --git a/src/ast/variable.h b/src/ast/variable.h index fe88217fe4..e5bcb0a6df 100644 --- a/src/ast/variable.h +++ b/src/ast/variable.h @@ -15,17 +15,12 @@ #ifndef SRC_AST_VARIABLE_H_ #define SRC_AST_VARIABLE_H_ -#include -#include #include #include #include "src/ast/expression.h" -#include "src/ast/node.h" #include "src/ast/storage_class.h" #include "src/ast/variable_decoration.h" -#include "src/symbol.h" -#include "src/type/type.h" namespace tint { namespace ast { diff --git a/src/ast/variable_decl_statement.cc b/src/ast/variable_decl_statement.cc index c0780c5fa1..61d6121ae1 100644 --- a/src/ast/variable_decl_statement.cc +++ b/src/ast/variable_decl_statement.cc @@ -14,7 +14,6 @@ #include "src/ast/variable_decl_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::VariableDeclStatement); diff --git a/src/ast/variable_decl_statement.h b/src/ast/variable_decl_statement.h index edb52f670d..10de4a9d3f 100644 --- a/src/ast/variable_decl_statement.h +++ b/src/ast/variable_decl_statement.h @@ -15,10 +15,6 @@ #ifndef SRC_AST_VARIABLE_DECL_STATEMENT_H_ #define SRC_AST_VARIABLE_DECL_STATEMENT_H_ -#include -#include - -#include "src/ast/expression.h" #include "src/ast/statement.h" #include "src/ast/variable.h" diff --git a/src/ast/variable_decl_statement_test.cc b/src/ast/variable_decl_statement_test.cc index 15e9eb56cc..d3ebbb69ac 100644 --- a/src/ast/variable_decl_statement_test.cc +++ b/src/ast/variable_decl_statement_test.cc @@ -15,8 +15,6 @@ #include "src/ast/variable_decl_statement.h" #include "src/ast/test_helper.h" -#include "src/ast/variable.h" -#include "src/type/f32_type.h" namespace tint { namespace ast { diff --git a/src/ast/variable_decoration.cc b/src/ast/variable_decoration.cc index 4500817f38..93e57941d9 100644 --- a/src/ast/variable_decoration.cc +++ b/src/ast/variable_decoration.cc @@ -14,8 +14,6 @@ #include "src/ast/variable_decoration.h" -#include - TINT_INSTANTIATE_TYPEINFO(tint::ast::VariableDecoration); namespace tint { diff --git a/src/ast/variable_test.cc b/src/ast/variable_test.cc index 6f4369af7d..61760244b5 100644 --- a/src/ast/variable_test.cc +++ b/src/ast/variable_test.cc @@ -12,13 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/variable.h" - #include "src/ast/constant_id_decoration.h" -#include "src/ast/identifier_expression.h" #include "src/ast/test_helper.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" namespace tint { namespace ast { diff --git a/src/ast/workgroup_decoration.cc b/src/ast/workgroup_decoration.cc index 8d4362c84c..9e915758f2 100644 --- a/src/ast/workgroup_decoration.cc +++ b/src/ast/workgroup_decoration.cc @@ -14,7 +14,6 @@ #include "src/ast/workgroup_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::WorkgroupDecoration); diff --git a/src/ast/workgroup_decoration.h b/src/ast/workgroup_decoration.h index a4f9953909..16fe42a07e 100644 --- a/src/ast/workgroup_decoration.h +++ b/src/ast/workgroup_decoration.h @@ -15,8 +15,6 @@ #ifndef SRC_AST_WORKGROUP_DECORATION_H_ #define SRC_AST_WORKGROUP_DECORATION_H_ -#include - #include #include "src/ast/function_decoration.h" diff --git a/src/ast/workgroup_decoration_test.cc b/src/ast/workgroup_decoration_test.cc index f45a0ba4a6..f4f01263e5 100644 --- a/src/ast/workgroup_decoration_test.cc +++ b/src/ast/workgroup_decoration_test.cc @@ -14,8 +14,6 @@ #include "src/ast/workgroup_decoration.h" -#include - #include "src/ast/stage_decoration.h" #include "src/ast/test_helper.h" diff --git a/src/castable.h b/src/castable.h index 23be942076..c5d88c323f 100644 --- a/src/castable.h +++ b/src/castable.h @@ -15,9 +15,6 @@ #ifndef SRC_CASTABLE_H_ #define SRC_CASTABLE_H_ -#include -#include -#include #include namespace tint { diff --git a/src/clone_context.cc b/src/clone_context.cc index edc6e8b323..06a28e1502 100644 --- a/src/clone_context.cc +++ b/src/clone_context.cc @@ -14,9 +14,6 @@ #include "src/clone_context.h" -#include "src/ast/function.h" -#include "src/ast/module.h" -#include "src/program.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::Cloneable); diff --git a/src/clone_context.h b/src/clone_context.h index 94851c728f..beb7e15032 100644 --- a/src/clone_context.h +++ b/src/clone_context.h @@ -15,7 +15,6 @@ #ifndef SRC_CLONE_CONTEXT_H_ #define SRC_CLONE_CONTEXT_H_ -#include #include #include #include @@ -23,7 +22,6 @@ #include "src/castable.h" #include "src/debug.h" -#include "src/source.h" #include "src/symbol.h" #include "src/traits.h" diff --git a/src/clone_context_test.cc b/src/clone_context_test.cc index 99e11373ed..529a18bcf6 100644 --- a/src/clone_context_test.cc +++ b/src/clone_context_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/clone_context.h" - -#include -#include -#include - #include "gtest/gtest-spi.h" #include "src/program_builder.h" diff --git a/src/debug.cc b/src/debug.cc index 2ac9ce7274..7f20d0908f 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -14,14 +14,6 @@ #include "src/debug.h" -#include - -#include -#include -#include - -#include "src/diagnostic/diagnostic.h" - namespace tint { namespace { diff --git a/src/debug.h b/src/debug.h index 80c597fd00..f057fc0880 100644 --- a/src/debug.h +++ b/src/debug.h @@ -15,7 +15,6 @@ #ifndef SRC_DEBUG_H_ #define SRC_DEBUG_H_ -#include #include #include "src/diagnostic/diagnostic.h" diff --git a/src/demangler.cc b/src/demangler.cc index a85f9bdfde..5e89029e05 100644 --- a/src/demangler.cc +++ b/src/demangler.cc @@ -14,9 +14,6 @@ #include "src/demangler.h" -#include - -#include "src/ast/module.h" #include "src/program.h" namespace tint { diff --git a/src/diagnostic/diagnostic.h b/src/diagnostic/diagnostic.h index b3b53db77f..a067855a69 100644 --- a/src/diagnostic/diagnostic.h +++ b/src/diagnostic/diagnostic.h @@ -15,8 +15,6 @@ #ifndef SRC_DIAGNOSTIC_DIAGNOSTIC_H_ #define SRC_DIAGNOSTIC_DIAGNOSTIC_H_ -#include -#include #include #include #include diff --git a/src/diagnostic/formatter.cc b/src/diagnostic/formatter.cc index 4acecab420..ccf85a9d67 100644 --- a/src/diagnostic/formatter.cc +++ b/src/diagnostic/formatter.cc @@ -15,7 +15,6 @@ #include "src/diagnostic/formatter.h" #include -#include #include #include "src/diagnostic/diagnostic.h" diff --git a/src/diagnostic/formatter.h b/src/diagnostic/formatter.h index 8ed06398c4..7e037cb9be 100644 --- a/src/diagnostic/formatter.h +++ b/src/diagnostic/formatter.h @@ -15,7 +15,6 @@ #ifndef SRC_DIAGNOSTIC_FORMATTER_H_ #define SRC_DIAGNOSTIC_FORMATTER_H_ -#include #include namespace tint { diff --git a/src/diagnostic/printer.cc b/src/diagnostic/printer.cc index 47faa58946..adb4b1b4ec 100644 --- a/src/diagnostic/printer.cc +++ b/src/diagnostic/printer.cc @@ -14,8 +14,6 @@ #include "src/diagnostic/printer.h" -#include - namespace tint { namespace diag { diff --git a/src/inspector/inspector.cc b/src/inspector/inspector.cc index f0b302e21a..170e72c920 100644 --- a/src/inspector/inspector.cc +++ b/src/inspector/inspector.cc @@ -14,26 +14,18 @@ #include "src/inspector/inspector.h" -#include -#include #include #include "src/ast/bool_literal.h" -#include "src/ast/constructor_expression.h" #include "src/ast/float_literal.h" -#include "src/ast/function.h" #include "src/ast/module.h" -#include "src/ast/null_literal.h" #include "src/ast/scalar_constructor_expression.h" #include "src/ast/sint_literal.h" #include "src/ast/uint_literal.h" -#include "src/ast/variable.h" -#include "src/program.h" #include "src/semantic/function.h" #include "src/semantic/variable.h" #include "src/type/access_control_type.h" #include "src/type/array_type.h" -#include "src/type/depth_texture_type.h" #include "src/type/f32_type.h" #include "src/type/i32_type.h" #include "src/type/matrix_type.h" @@ -41,8 +33,6 @@ #include "src/type/sampled_texture_type.h" #include "src/type/storage_texture_type.h" #include "src/type/struct_type.h" -#include "src/type/texture_type.h" -#include "src/type/type.h" #include "src/type/u32_type.h" #include "src/type/vector_type.h" diff --git a/src/inspector/inspector.h b/src/inspector/inspector.h index 96f85e7c1c..d1c047ade1 100644 --- a/src/inspector/inspector.h +++ b/src/inspector/inspector.h @@ -21,7 +21,6 @@ #include #include -#include "src/ast/pipeline_stage.h" #include "src/inspector/entry_point.h" #include "src/inspector/scalar.h" #include "src/program.h" diff --git a/src/inspector/inspector_test.cc b/src/inspector/inspector_test.cc index 1b8613b149..8622c8f9fa 100644 --- a/src/inspector/inspector_test.cc +++ b/src/inspector/inspector_test.cc @@ -12,54 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/inspector/inspector.h" - -#include - #include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/bool_literal.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/float_literal.h" -#include "src/ast/function.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/null_literal.h" -#include "src/ast/pipeline_stage.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/stride_decoration.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/uint_literal.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" -#include "src/ast/variable_decoration.h" #include "src/ast/workgroup_decoration.h" -#include "src/program_builder.h" -#include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" #include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/struct_type.h" -#include "src/type/type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" #include "tint/tint.h" namespace tint { diff --git a/src/intrinsic_table.cc b/src/intrinsic_table.cc index c9dc2bfb72..87adf7ea6b 100644 --- a/src/intrinsic_table.cc +++ b/src/intrinsic_table.cc @@ -16,17 +16,12 @@ #include #include -#include #include #include -#include "src/block_allocator.h" -#include "src/debug.h" #include "src/program_builder.h" -#include "src/semantic/intrinsic.h" #include "src/type/access_control_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" #include "src/type/multisampled_texture_type.h" #include "src/type/sampled_texture_type.h" #include "src/type/storage_texture_type.h" diff --git a/src/intrinsic_table.h b/src/intrinsic_table.h index e0771ef08e..167dcc4305 100644 --- a/src/intrinsic_table.h +++ b/src/intrinsic_table.h @@ -19,7 +19,6 @@ #include #include -#include "src/diagnostic/diagnostic.h" #include "src/semantic/intrinsic.h" namespace tint { diff --git a/src/intrinsic_table_test.cc b/src/intrinsic_table_test.cc index 7f377b4a3c..1cf1868ab1 100644 --- a/src/intrinsic_table_test.cc +++ b/src/intrinsic_table_test.cc @@ -15,7 +15,6 @@ #include "src/intrinsic_table.h" #include "gmock/gmock.h" -#include "gtest/gtest.h" #include "src/program_builder.h" #include "src/type/access_control_type.h" #include "src/type/depth_texture_type.h" diff --git a/src/program.cc b/src/program.cc index 71fc7fe1d7..f341e8acf2 100644 --- a/src/program.cc +++ b/src/program.cc @@ -14,13 +14,9 @@ #include "src/program.h" -#include #include -#include "src/ast/module.h" -#include "src/clone_context.h" #include "src/demangler.h" -#include "src/program_builder.h" #include "src/resolver/resolver.h" #include "src/semantic/expression.h" diff --git a/src/program.h b/src/program.h index b4b4b83df1..efb0d350e6 100644 --- a/src/program.h +++ b/src/program.h @@ -18,9 +18,7 @@ #include #include "src/ast/function.h" -#include "src/diagnostic/diagnostic.h" #include "src/semantic/info.h" -#include "src/semantic/node.h" #include "src/symbol_table.h" #include "src/type/type_manager.h" diff --git a/src/program_builder.cc b/src/program_builder.cc index 57e8464300..37e78bf9f8 100644 --- a/src/program_builder.cc +++ b/src/program_builder.cc @@ -14,16 +14,10 @@ #include "src/program_builder.h" -#include - -#include - #include "src/ast/assignment_statement.h" #include "src/ast/variable_decl_statement.h" -#include "src/clone_context.h" #include "src/demangler.h" #include "src/semantic/expression.h" -#include "src/type/struct_type.h" namespace tint { diff --git a/src/program_builder.h b/src/program_builder.h index 984e392ad8..a5c2c41326 100644 --- a/src/program_builder.h +++ b/src/program_builder.h @@ -23,9 +23,7 @@ #include "src/ast/binary_expression.h" #include "src/ast/bool_literal.h" #include "src/ast/call_expression.h" -#include "src/ast/expression.h" #include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" #include "src/ast/if_statement.h" #include "src/ast/loop_statement.h" #include "src/ast/member_accessor_expression.h" @@ -33,18 +31,11 @@ #include "src/ast/scalar_constructor_expression.h" #include "src/ast/sint_literal.h" #include "src/ast/stride_decoration.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" #include "src/ast/struct_member_offset_decoration.h" #include "src/ast/type_constructor_expression.h" #include "src/ast/uint_literal.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/diagnostic/diagnostic.h" #include "src/program.h" -#include "src/semantic/info.h" -#include "src/semantic/node.h" -#include "src/symbol_table.h" #include "src/type/alias_type.h" #include "src/type/array_type.h" #include "src/type/bool_type.h" @@ -53,7 +44,6 @@ #include "src/type/matrix_type.h" #include "src/type/pointer_type.h" #include "src/type/struct_type.h" -#include "src/type/type_manager.h" #include "src/type/u32_type.h" #include "src/type/vector_type.h" #include "src/type/void_type.h" diff --git a/src/program_test.cc b/src/program_test.cc index dd4e844c22..daa2a70628 100644 --- a/src/program_test.cc +++ b/src/program_test.cc @@ -12,19 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/program.h" - -#include -#include - -#include "gmock/gmock.h" -#include "src/ast/function.h" #include "src/ast/return_statement.h" #include "src/ast/test_helper.h" -#include "src/ast/variable.h" -#include "src/type/alias_type.h" -#include "src/type/f32_type.h" -#include "src/type/struct_type.h" namespace tint { namespace { diff --git a/src/reader/reader.h b/src/reader/reader.h index 402a2c538b..6ea79d15cc 100644 --- a/src/reader/reader.h +++ b/src/reader/reader.h @@ -16,10 +16,7 @@ #define SRC_READER_READER_H_ #include -#include -#include "src/diagnostic/diagnostic.h" -#include "src/diagnostic/formatter.h" #include "src/program.h" namespace tint { diff --git a/src/reader/spirv/construct.h b/src/reader/spirv/construct.h index ab3c12feb2..0347bc3925 100644 --- a/src/reader/spirv/construct.h +++ b/src/reader/spirv/construct.h @@ -15,9 +15,7 @@ #ifndef SRC_READER_SPIRV_CONSTRUCT_H_ #define SRC_READER_SPIRV_CONSTRUCT_H_ -#include #include -#include #include #include #include diff --git a/src/reader/spirv/entry_point_info.h b/src/reader/spirv/entry_point_info.h index 8256794e1f..bf6f5c0173 100644 --- a/src/reader/spirv/entry_point_info.h +++ b/src/reader/spirv/entry_point_info.h @@ -17,8 +17,6 @@ #include -#include "src/ast/pipeline_stage.h" - namespace tint { namespace reader { namespace spirv { diff --git a/src/reader/spirv/enum_converter.h b/src/reader/spirv/enum_converter.h index c5545d0c04..7c9d4f77a2 100644 --- a/src/reader/spirv/enum_converter.h +++ b/src/reader/spirv/enum_converter.h @@ -19,9 +19,8 @@ #include "src/ast/builtin.h" #include "src/ast/pipeline_stage.h" #include "src/ast/storage_class.h" -#include "src/type/storage_texture_type.h" -#include "src/type/texture_type.h" #include "src/reader/spirv/fail_stream.h" +#include "src/type/storage_texture_type.h" namespace tint { namespace reader { diff --git a/src/reader/spirv/enum_converter_test.cc b/src/reader/spirv/enum_converter_test.cc index 588c5e057c..670e63d408 100644 --- a/src/reader/spirv/enum_converter_test.cc +++ b/src/reader/spirv/enum_converter_test.cc @@ -14,12 +14,9 @@ #include "src/reader/spirv/enum_converter.h" -#include #include #include "gmock/gmock.h" -#include "spirv/unified1/spirv.h" -#include "src/ast/pipeline_stage.h" namespace tint { namespace reader { diff --git a/src/reader/spirv/fail_stream_test.cc b/src/reader/spirv/fail_stream_test.cc index 7ee2ab7bff..b533bdbb2d 100644 --- a/src/reader/spirv/fail_stream_test.cc +++ b/src/reader/spirv/fail_stream_test.cc @@ -14,9 +14,6 @@ #include "src/reader/spirv/fail_stream.h" -#include -#include - #include "gmock/gmock.h" namespace tint { diff --git a/src/reader/spirv/function.cc b/src/reader/spirv/function.cc index 663d5cd403..01e1a92674 100644 --- a/src/reader/spirv/function.cc +++ b/src/reader/spirv/function.cc @@ -16,65 +16,23 @@ #include #include -#include -#include -#include -#include -#include -#include -#include "source/opt/basic_block.h" -#include "source/opt/function.h" -#include "source/opt/instruction.h" -#include "source/opt/module.h" -#include "spirv/unified1/GLSL.std.450.h" -#include "src/ast/array_accessor_expression.h" #include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" #include "src/ast/bitcast_expression.h" -#include "src/ast/bool_literal.h" #include "src/ast/break_statement.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/continue_statement.h" #include "src/ast/discard_statement.h" -#include "src/ast/else_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" #include "src/ast/if_statement.h" #include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" #include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/storage_class.h" #include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/ast/unary_op.h" #include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/reader/spirv/construct.h" -#include "src/reader/spirv/fail_stream.h" -#include "src/reader/spirv/parser_impl.h" -#include "src/semantic/intrinsic.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/storage_texture_type.h" -#include "src/type/texture_type.h" -#include "src/type/type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" // Terms: // CFG: the control flow graph of the function, where basic blocks are the diff --git a/src/reader/spirv/function.h b/src/reader/spirv/function.h index 5ac476b70e..086a02eab8 100644 --- a/src/reader/spirv/function.h +++ b/src/reader/spirv/function.h @@ -15,36 +15,16 @@ #ifndef SRC_READER_SPIRV_FUNCTION_H_ #define SRC_READER_SPIRV_FUNCTION_H_ -#include #include -#include #include #include #include #include #include -#include "source/opt/basic_block.h" -#include "source/opt/constants.h" -#include "source/opt/function.h" -#include "source/opt/instruction.h" -#include "source/opt/ir_context.h" -#include "source/opt/type_manager.h" -#include "src/ast/case_statement.h" -#include "src/ast/expression.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/module.h" -#include "src/ast/statement.h" -#include "src/ast/storage_class.h" #include "src/program_builder.h" #include "src/reader/spirv/construct.h" -#include "src/reader/spirv/entry_point_info.h" -#include "src/reader/spirv/fail_stream.h" -#include "src/reader/spirv/namer.h" #include "src/reader/spirv/parser_impl.h" -#include "src/type/i32_type.h" -#include "src/type/texture_type.h" -#include "src/type/u32_type.h" namespace tint { namespace reader { diff --git a/src/reader/spirv/function_arithmetic_test.cc b/src/reader/spirv/function_arithmetic_test.cc index cfe77bc8cf..9396ca3391 100644 --- a/src/reader/spirv/function_arithmetic_test.cc +++ b/src/reader/spirv/function_arithmetic_test.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_bit_test.cc b/src/reader/spirv/function_bit_test.cc index 000ef597c5..d1db30b27c 100644 --- a/src/reader/spirv/function_bit_test.cc +++ b/src/reader/spirv/function_bit_test.cc @@ -11,12 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_call_test.cc b/src/reader/spirv/function_call_test.cc index 9b97b1e15d..fbe67b849e 100644 --- a/src/reader/spirv/function_call_test.cc +++ b/src/reader/spirv/function_call_test.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_cfg_test.cc b/src/reader/spirv/function_cfg_test.cc index 2cc9a84ecb..d5a5756751 100644 --- a/src/reader/spirv/function_cfg_test.cc +++ b/src/reader/spirv/function_cfg_test.cc @@ -12,14 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include - #include "gmock/gmock.h" -#include "src/reader/spirv/construct.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_composite_test.cc b/src/reader/spirv/function_composite_test.cc index 1517c8abc1..1478c5e347 100644 --- a/src/reader/spirv/function_composite_test.cc +++ b/src/reader/spirv/function_composite_test.cc @@ -12,13 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" -#include "src/reader/spirv/fail_stream.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_conversion_test.cc b/src/reader/spirv/function_conversion_test.cc index ec1bf40492..fb650001fd 100644 --- a/src/reader/spirv/function_conversion_test.cc +++ b/src/reader/spirv/function_conversion_test.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_decl_test.cc b/src/reader/spirv/function_decl_test.cc index f7f5d617bc..420e520f06 100644 --- a/src/reader/spirv/function_decl_test.cc +++ b/src/reader/spirv/function_decl_test.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_glsl_std_450_test.cc b/src/reader/spirv/function_glsl_std_450_test.cc index d0c43f1cc5..da3b7b0ab3 100644 --- a/src/reader/spirv/function_glsl_std_450_test.cc +++ b/src/reader/spirv/function_glsl_std_450_test.cc @@ -12,13 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" -#include "src/reader/spirv/fail_stream.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_logical_test.cc b/src/reader/spirv/function_logical_test.cc index e1c12c8b02..134cbdcfb1 100644 --- a/src/reader/spirv/function_logical_test.cc +++ b/src/reader/spirv/function_logical_test.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_memory_test.cc b/src/reader/spirv/function_memory_test.cc index b42cb4b0a8..5d3b255900 100644 --- a/src/reader/spirv/function_memory_test.cc +++ b/src/reader/spirv/function_memory_test.cc @@ -12,13 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" -#include "src/demangler.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_misc_test.cc b/src/reader/spirv/function_misc_test.cc index 8cf1b369e9..efc249aa55 100644 --- a/src/reader/spirv/function_misc_test.cc +++ b/src/reader/spirv/function_misc_test.cc @@ -12,13 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" -#include "src/ast/identifier_expression.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/function_var_test.cc b/src/reader/spirv/function_var_test.cc index ca6f49a2e5..790586c569 100644 --- a/src/reader/spirv/function_var_test.cc +++ b/src/reader/spirv/function_var_test.cc @@ -12,12 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/namer.h b/src/reader/spirv/namer.h index 715e3d0163..c889e83a79 100644 --- a/src/reader/spirv/namer.h +++ b/src/reader/spirv/namer.h @@ -15,7 +15,6 @@ #ifndef SRC_READER_SPIRV_NAMER_H_ #define SRC_READER_SPIRV_NAMER_H_ -#include #include #include #include diff --git a/src/reader/spirv/namer_test.cc b/src/reader/spirv/namer_test.cc index 9ebc3a709e..027223a612 100644 --- a/src/reader/spirv/namer_test.cc +++ b/src/reader/spirv/namer_test.cc @@ -14,12 +14,7 @@ #include "src/reader/spirv/namer.h" -#include -#include -#include - #include "gmock/gmock.h" -#include "src/reader/spirv/fail_stream.h" namespace tint { namespace reader { diff --git a/src/reader/spirv/parser_impl.cc b/src/reader/spirv/parser_impl.cc index 9a2855fd13..729e33ddf6 100644 --- a/src/reader/spirv/parser_impl.cc +++ b/src/reader/spirv/parser_impl.cc @@ -14,71 +14,17 @@ #include "src/reader/spirv/parser_impl.h" -#include -#include #include -#include -#include -#include -#include -#include -#include -#include "source/opt/basic_block.h" #include "source/opt/build_module.h" -#include "source/opt/constants.h" -#include "source/opt/decoration_manager.h" -#include "source/opt/function.h" -#include "source/opt/instruction.h" -#include "source/opt/module.h" -#include "source/opt/type_manager.h" -#include "source/opt/types.h" -#include "spirv-tools/libspirv.hpp" -#include "src/ast/binary_expression.h" -#include "src/ast/binding_decoration.h" #include "src/ast/bitcast_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/builtin.h" -#include "src/ast/builtin_decoration.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/float_literal.h" -#include "src/ast/group_decoration.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/stride_decoration.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" -#include "src/ast/variable_decoration.h" -#include "src/reader/spirv/enum_converter.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/usage.h" #include "src/type/access_control_type.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" #include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" namespace tint { namespace reader { @@ -575,7 +521,7 @@ Source ParserImpl::GetSourceForInst( if (where == inst_source_.end()) { return {}; } - return Source{where->second}; + return Source{where->second }; } bool ParserImpl::ParseInternalModuleExceptFunctions() { diff --git a/src/reader/spirv/parser_impl.h b/src/reader/spirv/parser_impl.h index cdfa25648f..0747ca9697 100644 --- a/src/reader/spirv/parser_impl.h +++ b/src/reader/spirv/parser_impl.h @@ -15,36 +15,20 @@ #ifndef SRC_READER_SPIRV_PARSER_IMPL_H_ #define SRC_READER_SPIRV_PARSER_IMPL_H_ -#include #include -#include #include #include #include #include #include -#include "source/opt/constants.h" -#include "source/opt/decoration_manager.h" #include "source/opt/ir_context.h" -#include "source/opt/module.h" -#include "source/opt/type_manager.h" -#include "source/opt/types.h" -#include "spirv-tools/libspirv.hpp" -#include "src/ast/expression.h" -#include "src/ast/struct_member_decoration.h" #include "src/program_builder.h" #include "src/reader/reader.h" #include "src/reader/spirv/entry_point_info.h" #include "src/reader/spirv/enum_converter.h" -#include "src/reader/spirv/fail_stream.h" #include "src/reader/spirv/namer.h" #include "src/reader/spirv/usage.h" -#include "src/source.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/pointer_type.h" -#include "src/type/type.h" /// This is the implementation of the SPIR-V parser for Tint. diff --git a/src/reader/spirv/parser_impl_convert_member_decoration_test.cc b/src/reader/spirv/parser_impl_convert_member_decoration_test.cc index 0551710772..bd77db45f8 100644 --- a/src/reader/spirv/parser_impl_convert_member_decoration_test.cc +++ b/src/reader/spirv/parser_impl_convert_member_decoration_test.cc @@ -12,17 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include - #include "gmock/gmock.h" -#include "spirv/unified1/spirv.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" -#include "src/reader/spirv/spirv_tools_helpers_test.h" namespace tint { namespace reader { diff --git a/src/reader/spirv/parser_impl_convert_type_test.cc b/src/reader/spirv/parser_impl_convert_type_test.cc index cdabeb2a9b..e4d2fbaeee 100644 --- a/src/reader/spirv/parser_impl_convert_type_test.cc +++ b/src/reader/spirv/parser_impl_convert_type_test.cc @@ -12,26 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include - #include "gmock/gmock.h" -#include "src/ast/struct.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" -#include "src/type/type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" namespace tint { namespace reader { diff --git a/src/reader/spirv/parser_impl_function_decl_test.cc b/src/reader/spirv/parser_impl_function_decl_test.cc index d0320afe76..ab9da9d92a 100644 --- a/src/reader/spirv/parser_impl_function_decl_test.cc +++ b/src/reader/spirv/parser_impl_function_decl_test.cc @@ -12,13 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include - #include "gmock/gmock.h" -#include "src/ast/module.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/parser_impl_get_decorations_test.cc b/src/reader/spirv/parser_impl_get_decorations_test.cc index 113a7a79f3..315a46c7df 100644 --- a/src/reader/spirv/parser_impl_get_decorations_test.cc +++ b/src/reader/spirv/parser_impl_get_decorations_test.cc @@ -13,8 +13,6 @@ // limitations under the License. #include "gmock/gmock.h" -#include "spirv/unified1/spirv.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/parser_impl_handle_test.cc b/src/reader/spirv/parser_impl_handle_test.cc index 279514db63..ea2f2b8332 100644 --- a/src/reader/spirv/parser_impl_handle_test.cc +++ b/src/reader/spirv/parser_impl_handle_test.cc @@ -12,13 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" -#include "src/demangler.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/parser_impl_import_test.cc b/src/reader/spirv/parser_impl_import_test.cc index d45b83f7c0..a20ca08328 100644 --- a/src/reader/spirv/parser_impl_import_test.cc +++ b/src/reader/spirv/parser_impl_import_test.cc @@ -12,11 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/parser_impl_module_var_test.cc b/src/reader/spirv/parser_impl_module_var_test.cc index e22cb8450a..3af4662e04 100644 --- a/src/reader/spirv/parser_impl_module_var_test.cc +++ b/src/reader/spirv/parser_impl_module_var_test.cc @@ -12,13 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "gmock/gmock.h" -#include "src/ast/module.h" -#include "src/demangler.h" #include "src/reader/spirv/function.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/parser_impl_named_types_test.cc b/src/reader/spirv/parser_impl_named_types_test.cc index c62b71b51a..9f029d80ea 100644 --- a/src/reader/spirv/parser_impl_named_types_test.cc +++ b/src/reader/spirv/parser_impl_named_types_test.cc @@ -12,21 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include - #include "gmock/gmock.h" -#include "src/ast/module.h" -#include "src/ast/struct.h" -#include "src/demangler.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" -#include "src/type/array_type.h" -#include "src/type/matrix_type.h" -#include "src/type/struct_type.h" -#include "src/type/vector_type.h" namespace tint { namespace reader { diff --git a/src/reader/spirv/parser_impl_test.cc b/src/reader/spirv/parser_impl_test.cc index 026cfe7f14..72c8446dd1 100644 --- a/src/reader/spirv/parser_impl_test.cc +++ b/src/reader/spirv/parser_impl_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/reader/spirv/parser_impl.h" - -#include -#include - #include "gmock/gmock.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/parser_impl_test_helper.h b/src/reader/spirv/parser_impl_test_helper.h index e41bdbeaab..0c79ab83e9 100644 --- a/src/reader/spirv/parser_impl_test_helper.h +++ b/src/reader/spirv/parser_impl_test_helper.h @@ -16,12 +16,9 @@ #define SRC_READER_SPIRV_PARSER_IMPL_TEST_HELPER_H_ #include -#include #include #include -#include "gtest/gtest.h" -#include "source/opt/ir_context.h" #include "src/demangler.h" #include "src/reader/spirv/parser_impl.h" diff --git a/src/reader/spirv/parser_impl_user_name_test.cc b/src/reader/spirv/parser_impl_user_name_test.cc index a7f50da8d8..4c0922993e 100644 --- a/src/reader/spirv/parser_impl_user_name_test.cc +++ b/src/reader/spirv/parser_impl_user_name_test.cc @@ -12,11 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "gmock/gmock.h" -#include "src/reader/spirv/parser_impl.h" #include "src/reader/spirv/parser_impl_test_helper.h" #include "src/reader/spirv/spirv_tools_helpers_test.h" diff --git a/src/reader/spirv/parser_test.cc b/src/reader/spirv/parser_test.cc index 3da0fbcf97..cb7c49abc1 100644 --- a/src/reader/spirv/parser_test.cc +++ b/src/reader/spirv/parser_test.cc @@ -14,9 +14,6 @@ #include "src/reader/spirv/parser.h" -#include -#include - #include "gtest/gtest.h" namespace tint { diff --git a/src/reader/spirv/spirv_tools_helpers_test.cc b/src/reader/spirv/spirv_tools_helpers_test.cc index 4849a7a3a7..a74f2df930 100644 --- a/src/reader/spirv/spirv_tools_helpers_test.cc +++ b/src/reader/spirv/spirv_tools_helpers_test.cc @@ -14,10 +14,6 @@ #include "src/reader/spirv/spirv_tools_helpers_test.h" -#include -#include -#include - #include "gtest/gtest.h" #include "spirv-tools/libspirv.hpp" diff --git a/src/reader/spirv/spirv_tools_helpers_test.h b/src/reader/spirv/spirv_tools_helpers_test.h index 654d85a936..050614f823 100644 --- a/src/reader/spirv/spirv_tools_helpers_test.h +++ b/src/reader/spirv/spirv_tools_helpers_test.h @@ -15,7 +15,6 @@ #ifndef SRC_READER_SPIRV_SPIRV_TOOLS_HELPERS_TEST_H_ #define SRC_READER_SPIRV_SPIRV_TOOLS_HELPERS_TEST_H_ -#include #include #include diff --git a/src/reader/spirv/usage.h b/src/reader/spirv/usage.h index ff6a8efd8a..92e6f1fdc5 100644 --- a/src/reader/spirv/usage.h +++ b/src/reader/spirv/usage.h @@ -15,7 +15,6 @@ #ifndef SRC_READER_SPIRV_USAGE_H_ #define SRC_READER_SPIRV_USAGE_H_ -#include #include namespace tint { diff --git a/src/reader/spirv/usage_test.cc b/src/reader/spirv/usage_test.cc index ef50656585..6ed12bcd2f 100644 --- a/src/reader/spirv/usage_test.cc +++ b/src/reader/spirv/usage_test.cc @@ -13,12 +13,10 @@ // limitations under the License. #include -#include #include #include "gmock/gmock.h" #include "src/reader/spirv/parser_impl_test_helper.h" -#include "src/reader/spirv/usage.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/lexer.cc b/src/reader/wgsl/lexer.cc index bdee707525..76cc3e9c60 100644 --- a/src/reader/wgsl/lexer.cc +++ b/src/reader/wgsl/lexer.cc @@ -14,11 +14,6 @@ #include "src/reader/wgsl/lexer.h" -#include -#include -#include - -#include #include namespace tint { diff --git a/src/reader/wgsl/lexer.h b/src/reader/wgsl/lexer.h index b7a6d1f34c..cec632e5f4 100644 --- a/src/reader/wgsl/lexer.h +++ b/src/reader/wgsl/lexer.h @@ -18,7 +18,6 @@ #include #include "src/reader/wgsl/token.h" -#include "src/source.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser.h b/src/reader/wgsl/parser.h index 4d83dcb8f1..f913c11e8a 100644 --- a/src/reader/wgsl/parser.h +++ b/src/reader/wgsl/parser.h @@ -16,7 +16,6 @@ #define SRC_READER_WGSL_PARSER_H_ #include "src/program.h" -#include "src/source.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl.cc b/src/reader/wgsl/parser_impl.cc index fee71dadeb..420b528a18 100644 --- a/src/reader/wgsl/parser_impl.cc +++ b/src/reader/wgsl/parser_impl.cc @@ -14,63 +14,20 @@ #include "src/reader/wgsl/parser_impl.h" -#include -#include - #include "src/ast/access_decoration.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/binary_expression.h" -#include "src/ast/binding_decoration.h" #include "src/ast/bitcast_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/break_statement.h" -#include "src/ast/builtin_decoration.h" -#include "src/ast/call_expression.h" -#include "src/ast/case_statement.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/continue_statement.h" #include "src/ast/discard_statement.h" -#include "src/ast/else_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/group_decoration.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/location_decoration.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/stride_decoration.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/type_decoration.h" -#include "src/ast/uint_literal.h" -#include "src/ast/unary_op.h" #include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" #include "src/ast/workgroup_decoration.h" #include "src/reader/wgsl/lexer.h" #include "src/type/access_control_type.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" #include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl.h b/src/reader/wgsl/parser_impl.h index e6008a12b3..7ac2169c89 100644 --- a/src/reader/wgsl/parser_impl.h +++ b/src/reader/wgsl/parser_impl.h @@ -15,50 +15,27 @@ #ifndef SRC_READER_WGSL_PARSER_IMPL_H_ #define SRC_READER_WGSL_PARSER_IMPL_H_ -#include #include #include #include -#include #include #include #include #include "src/ast/access_control.h" -#include "src/ast/array_decoration.h" #include "src/ast/assignment_statement.h" #include "src/ast/break_statement.h" -#include "src/ast/builtin.h" #include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" -#include "src/ast/constructor_expression.h" #include "src/ast/continue_statement.h" -#include "src/ast/else_statement.h" -#include "src/ast/function.h" #include "src/ast/if_statement.h" -#include "src/ast/literal.h" #include "src/ast/loop_statement.h" -#include "src/ast/pipeline_stage.h" #include "src/ast/return_statement.h" -#include "src/ast/statement.h" -#include "src/ast/storage_class.h" -#include "src/ast/struct.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" #include "src/ast/switch_statement.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/ast/variable_decoration.h" -#include "src/diagnostic/diagnostic.h" -#include "src/diagnostic/formatter.h" #include "src/program_builder.h" #include "src/reader/wgsl/parser_impl_detail.h" #include "src/reader/wgsl/token.h" #include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/texture_type.h" -#include "src/type/type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_additive_expression_test.cc b/src/reader/wgsl/parser_impl_additive_expression_test.cc index 9360c7e2c7..0a650fd97a 100644 --- a/src/reader/wgsl/parser_impl_additive_expression_test.cc +++ b/src/reader/wgsl/parser_impl_additive_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_and_expression_test.cc b/src/reader/wgsl/parser_impl_and_expression_test.cc index 5c0d2d0285..baebcdaea5 100644 --- a/src/reader/wgsl/parser_impl_and_expression_test.cc +++ b/src/reader/wgsl/parser_impl_and_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_argument_expression_list_test.cc b/src/reader/wgsl/parser_impl_argument_expression_list_test.cc index 457a322bf4..926abc023a 100644 --- a/src/reader/wgsl/parser_impl_argument_expression_list_test.cc +++ b/src/reader/wgsl/parser_impl_argument_expression_list_test.cc @@ -12,14 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/binary_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/unary_op_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_assignment_stmt_test.cc b/src/reader/wgsl/parser_impl_assignment_stmt_test.cc index c762153993..07c59e948e 100644 --- a/src/reader/wgsl/parser_impl_assignment_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_assignment_stmt_test.cc @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/literal.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_body_stmt_test.cc b/src/reader/wgsl/parser_impl_body_stmt_test.cc index b5413ef84d..29acc7fcf0 100644 --- a/src/reader/wgsl/parser_impl_body_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_body_stmt_test.cc @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/discard_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_break_stmt_test.cc b/src/reader/wgsl/parser_impl_break_stmt_test.cc index 1c7b0d7310..c13525f2df 100644 --- a/src/reader/wgsl/parser_impl_break_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_break_stmt_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/break_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_bug_cases_test.cc b/src/reader/wgsl/parser_impl_bug_cases_test.cc index 891c6822ef..7d91001d74 100644 --- a/src/reader/wgsl/parser_impl_bug_cases_test.cc +++ b/src/reader/wgsl/parser_impl_bug_cases_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/break_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_call_stmt_test.cc b/src/reader/wgsl/parser_impl_call_stmt_test.cc index 07f5b1d42e..e7f9ee4128 100644 --- a/src/reader/wgsl/parser_impl_call_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_call_stmt_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/call_expression.h" -#include "src/ast/call_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_case_body_test.cc b/src/reader/wgsl/parser_impl_case_body_test.cc index f3bc05c47c..6edf7c5092 100644 --- a/src/reader/wgsl/parser_impl_case_body_test.cc +++ b/src/reader/wgsl/parser_impl_case_body_test.cc @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/fallthrough_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_const_expr_test.cc b/src/reader/wgsl/parser_impl_const_expr_test.cc index b3d302053d..0b9d2f450e 100644 --- a/src/reader/wgsl/parser_impl_const_expr_test.cc +++ b/src/reader/wgsl/parser_impl_const_expr_test.cc @@ -12,14 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/type_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/vector_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_const_literal_test.cc b/src/reader/wgsl/parser_impl_const_literal_test.cc index 51ee92a1a2..da619252fb 100644 --- a/src/reader/wgsl/parser_impl_const_literal_test.cc +++ b/src/reader/wgsl/parser_impl_const_literal_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/sint_literal.h" -#include "src/ast/uint_literal.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_continue_stmt_test.cc b/src/reader/wgsl/parser_impl_continue_stmt_test.cc index e9b72a15b4..9a27322114 100644 --- a/src/reader/wgsl/parser_impl_continue_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_continue_stmt_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/continue_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_continuing_stmt_test.cc b/src/reader/wgsl/parser_impl_continuing_stmt_test.cc index 983d98f580..22706e93ba 100644 --- a/src/reader/wgsl/parser_impl_continuing_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_continuing_stmt_test.cc @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/discard_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_depth_texture_type_test.cc b/src/reader/wgsl/parser_impl_depth_texture_type_test.cc index 05da40148d..9113040375 100644 --- a/src/reader/wgsl/parser_impl_depth_texture_type_test.cc +++ b/src/reader/wgsl/parser_impl_depth_texture_type_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" #include "src/type/depth_texture_type.h" diff --git a/src/reader/wgsl/parser_impl_detail.h b/src/reader/wgsl/parser_impl_detail.h index b19a523317..6d5d144438 100644 --- a/src/reader/wgsl/parser_impl_detail.h +++ b/src/reader/wgsl/parser_impl_detail.h @@ -16,7 +16,6 @@ #define SRC_READER_WGSL_PARSER_IMPL_DETAIL_H_ #include -#include namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_else_stmt_test.cc b/src/reader/wgsl/parser_impl_else_stmt_test.cc index a0e86a0cee..bd883fd061 100644 --- a/src/reader/wgsl/parser_impl_else_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_else_stmt_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/else_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_elseif_stmt_test.cc b/src/reader/wgsl/parser_impl_elseif_stmt_test.cc index 150c7ea33a..15dab84f40 100644 --- a/src/reader/wgsl/parser_impl_elseif_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_elseif_stmt_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/else_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_equality_expression_test.cc b/src/reader/wgsl/parser_impl_equality_expression_test.cc index 693bef442a..d23f6b6807 100644 --- a/src/reader/wgsl/parser_impl_equality_expression_test.cc +++ b/src/reader/wgsl/parser_impl_equality_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_error_msg_test.cc b/src/reader/wgsl/parser_impl_error_msg_test.cc index e5ffb302f7..3fae7f63fa 100644 --- a/src/reader/wgsl/parser_impl_error_msg_test.cc +++ b/src/reader/wgsl/parser_impl_error_msg_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_error_resync_test.cc b/src/reader/wgsl/parser_impl_error_resync_test.cc index 010b5455b9..ff25da4ffa 100644 --- a/src/reader/wgsl/parser_impl_error_resync_test.cc +++ b/src/reader/wgsl/parser_impl_error_resync_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_exclusive_or_expression_test.cc b/src/reader/wgsl/parser_impl_exclusive_or_expression_test.cc index c28d2143a6..08608c87e2 100644 --- a/src/reader/wgsl/parser_impl_exclusive_or_expression_test.cc +++ b/src/reader/wgsl/parser_impl_exclusive_or_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_for_stmt_test.cc b/src/reader/wgsl/parser_impl_for_stmt_test.cc index ad2a0b7b40..ad77324bf2 100644 --- a/src/reader/wgsl/parser_impl_for_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_for_stmt_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/block_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_function_decl_test.cc b/src/reader/wgsl/parser_impl_function_decl_test.cc index 637a3ff403..86d0330701 100644 --- a/src/reader/wgsl/parser_impl_function_decl_test.cc +++ b/src/reader/wgsl/parser_impl_function_decl_test.cc @@ -12,13 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/function.h" #include "src/ast/workgroup_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/type.h" -#include "src/type/void_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_function_decoration_list_test.cc b/src/reader/wgsl/parser_impl_function_decoration_list_test.cc index 9fd25c585a..debee2fde6 100644 --- a/src/reader/wgsl/parser_impl_function_decoration_list_test.cc +++ b/src/reader/wgsl/parser_impl_function_decoration_list_test.cc @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/workgroup_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_function_decoration_test.cc b/src/reader/wgsl/parser_impl_function_decoration_test.cc index 13b9d4563d..e45f606297 100644 --- a/src/reader/wgsl/parser_impl_function_decoration_test.cc +++ b/src/reader/wgsl/parser_impl_function_decoration_test.cc @@ -12,10 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/stage_decoration.h" #include "src/ast/workgroup_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_function_header_test.cc b/src/reader/wgsl/parser_impl_function_header_test.cc index 01e9b9204b..cedceb04e1 100644 --- a/src/reader/wgsl/parser_impl_function_header_test.cc +++ b/src/reader/wgsl/parser_impl_function_header_test.cc @@ -12,12 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/function.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/type.h" -#include "src/type/void_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_function_type_decl_test.cc b/src/reader/wgsl/parser_impl_function_type_decl_test.cc index c080945cd0..2779849565 100644 --- a/src/reader/wgsl/parser_impl_function_type_decl_test.cc +++ b/src/reader/wgsl/parser_impl_function_type_decl_test.cc @@ -12,14 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/f32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_global_constant_decl_test.cc b/src/reader/wgsl/parser_impl_global_constant_decl_test.cc index 2025e3b645..c6f93d5699 100644 --- a/src/reader/wgsl/parser_impl_global_constant_decl_test.cc +++ b/src/reader/wgsl/parser_impl_global_constant_decl_test.cc @@ -12,12 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/f32_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_global_decl_test.cc b/src/reader/wgsl/parser_impl_global_decl_test.cc index 22beb2bc1a..08a7a5021d 100644 --- a/src/reader/wgsl/parser_impl_global_decl_test.cc +++ b/src/reader/wgsl/parser_impl_global_decl_test.cc @@ -12,13 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/module.h" -#include "src/program.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/array_type.h" -#include "src/type/struct_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_global_variable_decl_test.cc b/src/reader/wgsl/parser_impl_global_variable_decl_test.cc index 941d043efb..89d6909687 100644 --- a/src/reader/wgsl/parser_impl_global_variable_decl_test.cc +++ b/src/reader/wgsl/parser_impl_global_variable_decl_test.cc @@ -12,13 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/f32_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_if_stmt_test.cc b/src/reader/wgsl/parser_impl_if_stmt_test.cc index efd4248145..7be5ec62de 100644 --- a/src/reader/wgsl/parser_impl_if_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_if_stmt_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/else_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_image_storage_type_test.cc b/src/reader/wgsl/parser_impl_image_storage_type_test.cc index 7f125499ab..872df127e0 100644 --- a/src/reader/wgsl/parser_impl_image_storage_type_test.cc +++ b/src/reader/wgsl/parser_impl_image_storage_type_test.cc @@ -12,10 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/texture_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_inclusive_or_expression_test.cc b/src/reader/wgsl/parser_impl_inclusive_or_expression_test.cc index 61506458ee..8fee841ea8 100644 --- a/src/reader/wgsl/parser_impl_inclusive_or_expression_test.cc +++ b/src/reader/wgsl/parser_impl_inclusive_or_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_logical_and_expression_test.cc b/src/reader/wgsl/parser_impl_logical_and_expression_test.cc index bec0731306..f987321a81 100644 --- a/src/reader/wgsl/parser_impl_logical_and_expression_test.cc +++ b/src/reader/wgsl/parser_impl_logical_and_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_logical_or_expression_test.cc b/src/reader/wgsl/parser_impl_logical_or_expression_test.cc index 5c8e534d6a..aa1e0948f0 100644 --- a/src/reader/wgsl/parser_impl_logical_or_expression_test.cc +++ b/src/reader/wgsl/parser_impl_logical_or_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_loop_stmt_test.cc b/src/reader/wgsl/parser_impl_loop_stmt_test.cc index 2a0ba20341..b55aa91a09 100644 --- a/src/reader/wgsl/parser_impl_loop_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_loop_stmt_test.cc @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/discard_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_multiplicative_expression_test.cc b/src/reader/wgsl/parser_impl_multiplicative_expression_test.cc index a6887e60c4..05a3b760b1 100644 --- a/src/reader/wgsl/parser_impl_multiplicative_expression_test.cc +++ b/src/reader/wgsl/parser_impl_multiplicative_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_param_list_test.cc b/src/reader/wgsl/parser_impl_param_list_test.cc index cbe37535e7..d4ebd036bf 100644 --- a/src/reader/wgsl/parser_impl_param_list_test.cc +++ b/src/reader/wgsl/parser_impl_param_list_test.cc @@ -12,15 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/variable.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_paren_rhs_stmt_test.cc b/src/reader/wgsl/parser_impl_paren_rhs_stmt_test.cc index b56de58cef..0f59cad26c 100644 --- a/src/reader/wgsl/parser_impl_paren_rhs_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_paren_rhs_stmt_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_pipeline_stage_test.cc b/src/reader/wgsl/parser_impl_pipeline_stage_test.cc index 009d24cc7e..fbc21f454a 100644 --- a/src/reader/wgsl/parser_impl_pipeline_stage_test.cc +++ b/src/reader/wgsl/parser_impl_pipeline_stage_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/pipeline_stage.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_postfix_expression_test.cc b/src/reader/wgsl/parser_impl_postfix_expression_test.cc index 6bf2531680..0b6eafa752 100644 --- a/src/reader/wgsl/parser_impl_postfix_expression_test.cc +++ b/src/reader/wgsl/parser_impl_postfix_expression_test.cc @@ -12,16 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/binary_expression.h" -#include "src/ast/call_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/unary_op_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_primary_expression_test.cc b/src/reader/wgsl/parser_impl_primary_expression_test.cc index bd775d6c36..596c1173f5 100644 --- a/src/reader/wgsl/parser_impl_primary_expression_test.cc +++ b/src/reader/wgsl/parser_impl_primary_expression_test.cc @@ -12,20 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/binary_expression.h" #include "src/ast/bitcast_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/unary_op_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_relational_expression_test.cc b/src/reader/wgsl/parser_impl_relational_expression_test.cc index 77ed9129cb..80584875b3 100644 --- a/src/reader/wgsl/parser_impl_relational_expression_test.cc +++ b/src/reader/wgsl/parser_impl_relational_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_sampled_texture_type_test.cc b/src/reader/wgsl/parser_impl_sampled_texture_type_test.cc index 4c1e956cba..5c31846697 100644 --- a/src/reader/wgsl/parser_impl_sampled_texture_type_test.cc +++ b/src/reader/wgsl/parser_impl_sampled_texture_type_test.cc @@ -12,10 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/texture_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_sampler_type_test.cc b/src/reader/wgsl/parser_impl_sampler_type_test.cc index ce98c32616..46b3d3bffc 100644 --- a/src/reader/wgsl/parser_impl_sampler_type_test.cc +++ b/src/reader/wgsl/parser_impl_sampler_type_test.cc @@ -12,10 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/sampler_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_shift_expression_test.cc b/src/reader/wgsl/parser_impl_shift_expression_test.cc index e93822e97a..e4d93e9ef4 100644 --- a/src/reader/wgsl/parser_impl_shift_expression_test.cc +++ b/src/reader/wgsl/parser_impl_shift_expression_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_statement_test.cc b/src/reader/wgsl/parser_impl_statement_test.cc index e2bfd20e9c..8c79b0d699 100644 --- a/src/reader/wgsl/parser_impl_statement_test.cc +++ b/src/reader/wgsl/parser_impl_statement_test.cc @@ -12,12 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" #include "src/ast/discard_statement.h" -#include "src/ast/return_statement.h" -#include "src/ast/statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_statements_test.cc b/src/reader/wgsl/parser_impl_statements_test.cc index d33176c5ee..643d35f899 100644 --- a/src/reader/wgsl/parser_impl_statements_test.cc +++ b/src/reader/wgsl/parser_impl_statements_test.cc @@ -12,10 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/discard_statement.h" -#include "src/ast/statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_storage_class_test.cc b/src/reader/wgsl/parser_impl_storage_class_test.cc index ac37fa8117..13fce4a333 100644 --- a/src/reader/wgsl/parser_impl_storage_class_test.cc +++ b/src/reader/wgsl/parser_impl_storage_class_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/storage_class.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_storage_texture_type_test.cc b/src/reader/wgsl/parser_impl_storage_texture_type_test.cc index 448162fcfd..223c1879a9 100644 --- a/src/reader/wgsl/parser_impl_storage_texture_type_test.cc +++ b/src/reader/wgsl/parser_impl_storage_texture_type_test.cc @@ -12,10 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/storage_texture_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_struct_body_decl_test.cc b/src/reader/wgsl/parser_impl_struct_body_decl_test.cc index 7693fd9fb4..c7f588b48b 100644 --- a/src/reader/wgsl/parser_impl_struct_body_decl_test.cc +++ b/src/reader/wgsl/parser_impl_struct_body_decl_test.cc @@ -12,10 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/i32_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_struct_decl_test.cc b/src/reader/wgsl/parser_impl_struct_decl_test.cc index 219bb3b5bb..0980087b49 100644 --- a/src/reader/wgsl/parser_impl_struct_decl_test.cc +++ b/src/reader/wgsl/parser_impl_struct_decl_test.cc @@ -12,11 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/struct_block_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/struct_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_struct_decoration_decl_test.cc b/src/reader/wgsl/parser_impl_struct_decoration_decl_test.cc index 5ef5f82964..8a5c4f7e34 100644 --- a/src/reader/wgsl/parser_impl_struct_decoration_decl_test.cc +++ b/src/reader/wgsl/parser_impl_struct_decoration_decl_test.cc @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/struct_block_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_struct_decoration_test.cc b/src/reader/wgsl/parser_impl_struct_decoration_test.cc index e6e2cf63e7..15a5d25efe 100644 --- a/src/reader/wgsl/parser_impl_struct_decoration_test.cc +++ b/src/reader/wgsl/parser_impl_struct_decoration_test.cc @@ -12,10 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_struct_member_decoration_decl_test.cc b/src/reader/wgsl/parser_impl_struct_member_decoration_decl_test.cc index 9d9081be28..4b88e78139 100644 --- a/src/reader/wgsl/parser_impl_struct_member_decoration_decl_test.cc +++ b/src/reader/wgsl/parser_impl_struct_member_decoration_decl_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_struct_member_decoration_test.cc b/src/reader/wgsl/parser_impl_struct_member_decoration_test.cc index 450c3a2fbd..c15fdf11ab 100644 --- a/src/reader/wgsl/parser_impl_struct_member_decoration_test.cc +++ b/src/reader/wgsl/parser_impl_struct_member_decoration_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_struct_member_test.cc b/src/reader/wgsl/parser_impl_struct_member_test.cc index e8fd7eafe3..911c3be118 100644 --- a/src/reader/wgsl/parser_impl_struct_member_test.cc +++ b/src/reader/wgsl/parser_impl_struct_member_test.cc @@ -12,11 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/i32_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_switch_body_test.cc b/src/reader/wgsl/parser_impl_switch_body_test.cc index b596149d4f..7fb43928c1 100644 --- a/src/reader/wgsl/parser_impl_switch_body_test.cc +++ b/src/reader/wgsl/parser_impl_switch_body_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/case_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_switch_stmt_test.cc b/src/reader/wgsl/parser_impl_switch_stmt_test.cc index 9d2bfbbb36..5d73e04eab 100644 --- a/src/reader/wgsl/parser_impl_switch_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_switch_stmt_test.cc @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/case_statement.h" -#include "src/ast/switch_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_test.cc b/src/reader/wgsl/parser_impl_test.cc index ff0b0f522a..d85eeaac76 100644 --- a/src/reader/wgsl/parser_impl_test.cc +++ b/src/reader/wgsl/parser_impl_test.cc @@ -12,11 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/reader/wgsl/parser_impl.h" - -#include "gtest/gtest.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/i32_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_test_helper.h b/src/reader/wgsl/parser_impl_test_helper.h index b61709eff7..0b301cb993 100644 --- a/src/reader/wgsl/parser_impl_test_helper.h +++ b/src/reader/wgsl/parser_impl_test_helper.h @@ -21,7 +21,6 @@ #include #include "gtest/gtest.h" -#include "src/program_builder.h" #include "src/reader/wgsl/parser_impl.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_texture_sampler_types_test.cc b/src/reader/wgsl/parser_impl_texture_sampler_types_test.cc index 0023a1ca7a..1cf9aabf18 100644 --- a/src/reader/wgsl/parser_impl_texture_sampler_types_test.cc +++ b/src/reader/wgsl/parser_impl_texture_sampler_types_test.cc @@ -12,17 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/access_control_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" #include "src/type/multisampled_texture_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/u32_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_type_alias_test.cc b/src/reader/wgsl/parser_impl_type_alias_test.cc index 2610eacdb0..17e28192e6 100644 --- a/src/reader/wgsl/parser_impl_type_alias_test.cc +++ b/src/reader/wgsl/parser_impl_type_alias_test.cc @@ -12,13 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_type_decl_test.cc b/src/reader/wgsl/parser_impl_type_decl_test.cc index c3c08e0fd2..ab4d9f2896 100644 --- a/src/reader/wgsl/parser_impl_type_decl_test.cc +++ b/src/reader/wgsl/parser_impl_type_decl_test.cc @@ -12,22 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/stride_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_unary_expression_test.cc b/src/reader/wgsl/parser_impl_unary_expression_test.cc index 51561e5b7e..c971a1d283 100644 --- a/src/reader/wgsl/parser_impl_unary_expression_test.cc +++ b/src/reader/wgsl/parser_impl_unary_expression_test.cc @@ -12,13 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/unary_op_expression.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_variable_decl_test.cc b/src/reader/wgsl/parser_impl_variable_decl_test.cc index 51189d5c9c..6fd1418ac5 100644 --- a/src/reader/wgsl/parser_impl_variable_decl_test.cc +++ b/src/reader/wgsl/parser_impl_variable_decl_test.cc @@ -12,11 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/variable.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" -#include "src/type/f32_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_variable_decoration_list_test.cc b/src/reader/wgsl/parser_impl_variable_decoration_list_test.cc index 3ad378c7b8..f5f33e0ab3 100644 --- a/src/reader/wgsl/parser_impl_variable_decoration_list_test.cc +++ b/src/reader/wgsl/parser_impl_variable_decoration_list_test.cc @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/builtin_decoration.h" -#include "src/ast/location_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_variable_decoration_test.cc b/src/reader/wgsl/parser_impl_variable_decoration_test.cc index d1d076f300..f73d3d5d4c 100644 --- a/src/reader/wgsl/parser_impl_variable_decoration_test.cc +++ b/src/reader/wgsl/parser_impl_variable_decoration_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/builtin_decoration.h" -#include "src/ast/group_decoration.h" -#include "src/ast/location_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_variable_ident_decl_test.cc b/src/reader/wgsl/parser_impl_variable_ident_decl_test.cc index df9aaec4cd..4555eeb03f 100644 --- a/src/reader/wgsl/parser_impl_variable_ident_decl_test.cc +++ b/src/reader/wgsl/parser_impl_variable_ident_decl_test.cc @@ -12,15 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" #include "src/type/access_control_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" namespace tint { namespace reader { diff --git a/src/reader/wgsl/parser_impl_variable_stmt_test.cc b/src/reader/wgsl/parser_impl_variable_stmt_test.cc index 1a6ed5faf5..c3e4d272d3 100644 --- a/src/reader/wgsl/parser_impl_variable_stmt_test.cc +++ b/src/reader/wgsl/parser_impl_variable_stmt_test.cc @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/statement.h" -#include "src/ast/variable_decl_statement.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/parser_impl_variable_storage_decoration_test.cc b/src/reader/wgsl/parser_impl_variable_storage_decoration_test.cc index aebbb96a0c..a015b332e9 100644 --- a/src/reader/wgsl/parser_impl_variable_storage_decoration_test.cc +++ b/src/reader/wgsl/parser_impl_variable_storage_decoration_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/storage_class.h" -#include "src/reader/wgsl/parser_impl.h" #include "src/reader/wgsl/parser_impl_test_helper.h" namespace tint { diff --git a/src/reader/wgsl/token.h b/src/reader/wgsl/token.h index e27edd9246..13e582e890 100644 --- a/src/reader/wgsl/token.h +++ b/src/reader/wgsl/token.h @@ -15,9 +15,6 @@ #ifndef SRC_READER_WGSL_TOKEN_H_ #define SRC_READER_WGSL_TOKEN_H_ -#include - -#include #include #include "src/source.h" diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc index c652bbd77d..cfb3e19d9d 100644 --- a/src/resolver/resolver.cc +++ b/src/resolver/resolver.cc @@ -15,57 +15,26 @@ #include "src/resolver/resolver.h" #include -#include #include -#include -#include "src/ast/array_accessor_expression.h" #include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" #include "src/ast/bitcast_expression.h" -#include "src/ast/block_statement.h" #include "src/ast/break_statement.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/continue_statement.h" #include "src/ast/discard_statement.h" -#include "src/ast/else_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/identifier_expression.h" #include "src/ast/if_statement.h" #include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" #include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" #include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" #include "src/ast/unary_op_expression.h" #include "src/ast/variable_decl_statement.h" -#include "src/diagnostic/formatter.h" -#include "src/program_builder.h" #include "src/semantic/call.h" -#include "src/semantic/expression.h" #include "src/semantic/function.h" -#include "src/semantic/intrinsic.h" #include "src/semantic/member_accessor_expression.h" #include "src/semantic/statement.h" #include "src/semantic/variable.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" -#include "src/type/sampled_texture_type.h" -#include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" namespace tint { namespace { diff --git a/src/resolver/resolver.h b/src/resolver/resolver.h index 2099c41fc7..f07fab5d5d 100644 --- a/src/resolver/resolver.h +++ b/src/resolver/resolver.h @@ -18,16 +18,11 @@ #include #include #include -#include #include -#include "src/ast/module.h" -#include "src/diagnostic/diagnostic.h" #include "src/intrinsic_table.h" #include "src/program_builder.h" #include "src/scope_stack.h" -#include "src/semantic/intrinsic.h" -#include "src/type/storage_texture_type.h" #include "src/utils/unique_vector.h" namespace tint { diff --git a/src/resolver/resolver_test.cc b/src/resolver/resolver_test.cc index ab45029d11..d7c971d9a9 100644 --- a/src/resolver/resolver_test.cc +++ b/src/resolver/resolver_test.cc @@ -14,67 +14,26 @@ #include "src/resolver/resolver.h" -#include -#include -#include -#include - #include "gmock/gmock.h" -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" #include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" #include "src/ast/bitcast_expression.h" -#include "src/ast/block_statement.h" -#include "src/ast/bool_literal.h" -#include "src/ast/break_statement.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/continue_statement.h" -#include "src/ast/else_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" #include "src/ast/if_statement.h" #include "src/ast/intrinsic_texture_helper_test.h" #include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/pipeline_stage.h" #include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" #include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" #include "src/ast/unary_op_expression.h" #include "src/ast/variable_decl_statement.h" -#include "src/program_builder.h" #include "src/semantic/call.h" -#include "src/semantic/expression.h" #include "src/semantic/function.h" #include "src/semantic/member_accessor_expression.h" #include "src/semantic/statement.h" #include "src/semantic/variable.h" #include "src/type/access_control_type.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" using ::testing::ElementsAre; using ::testing::HasSubstr; diff --git a/src/scope_stack_test.cc b/src/scope_stack_test.cc index 584af02ab6..c373359963 100644 --- a/src/scope_stack_test.cc +++ b/src/scope_stack_test.cc @@ -14,10 +14,7 @@ #include "src/scope_stack.h" #include "gtest/gtest.h" -#include "src/ast/variable.h" #include "src/program_builder.h" -#include "src/symbol.h" -#include "src/type/f32_type.h" namespace tint { namespace { diff --git a/src/semantic/call_target.h b/src/semantic/call_target.h index ce0587e4e3..16834736aa 100644 --- a/src/semantic/call_target.h +++ b/src/semantic/call_target.h @@ -15,7 +15,6 @@ #ifndef SRC_SEMANTIC_CALL_TARGET_H_ #define SRC_SEMANTIC_CALL_TARGET_H_ -#include #include #include "src/semantic/node.h" diff --git a/src/semantic/function.h b/src/semantic/function.h index c8d119cc89..7cff7664e0 100644 --- a/src/semantic/function.h +++ b/src/semantic/function.h @@ -19,7 +19,6 @@ #include #include "src/semantic/call_target.h" -#include "src/type/sampler_type.h" namespace tint { diff --git a/src/semantic/intrinsic.h b/src/semantic/intrinsic.h index 4bb01347d2..e8ec3a21c9 100644 --- a/src/semantic/intrinsic.h +++ b/src/semantic/intrinsic.h @@ -15,7 +15,6 @@ #ifndef SRC_SEMANTIC_INTRINSIC_H_ #define SRC_SEMANTIC_INTRINSIC_H_ -#include #include #include "src/semantic/call_target.h" diff --git a/src/semantic/sem_call_target.cc b/src/semantic/sem_call_target.cc index 10c48177d5..263c797cb9 100644 --- a/src/semantic/sem_call_target.cc +++ b/src/semantic/sem_call_target.cc @@ -15,7 +15,6 @@ #include "src/semantic/call_target.h" #include "src/symbol_table.h" -#include "src/type/type.h" TINT_INSTANTIATE_TYPEINFO(tint::semantic::CallTarget); diff --git a/src/semantic/sem_expression.cc b/src/semantic/sem_expression.cc index 3f8b89afb6..466781b411 100644 --- a/src/semantic/sem_expression.cc +++ b/src/semantic/sem_expression.cc @@ -14,8 +14,6 @@ #include "src/semantic/expression.h" -#include "src/type/type.h" - TINT_INSTANTIATE_TYPEINFO(tint::semantic::Expression); namespace tint { diff --git a/src/semantic/sem_function.cc b/src/semantic/sem_function.cc index 83c90c3549..4ae8885a1e 100644 --- a/src/semantic/sem_function.cc +++ b/src/semantic/sem_function.cc @@ -14,19 +14,12 @@ #include "src/semantic/function.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/builtin_decoration.h" #include "src/ast/function.h" -#include "src/ast/group_decoration.h" -#include "src/ast/location_decoration.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decoration.h" #include "src/semantic/variable.h" #include "src/type/depth_texture_type.h" #include "src/type/multisampled_texture_type.h" #include "src/type/sampled_texture_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/texture_type.h" TINT_INSTANTIATE_TYPEINFO(tint::semantic::Function); diff --git a/src/semantic/sem_statement.cc b/src/semantic/sem_statement.cc index b9daf6cd04..a614b42d4b 100644 --- a/src/semantic/sem_statement.cc +++ b/src/semantic/sem_statement.cc @@ -14,8 +14,6 @@ #include "src/semantic/statement.h" -#include "src/type/type.h" - TINT_INSTANTIATE_TYPEINFO(tint::semantic::Statement); namespace tint { diff --git a/src/semantic/type_mappings.h b/src/semantic/type_mappings.h index 36ad538412..6b1c331433 100644 --- a/src/semantic/type_mappings.h +++ b/src/semantic/type_mappings.h @@ -15,8 +15,6 @@ #ifndef SRC_SEMANTIC_TYPE_MAPPINGS_H_ #define SRC_SEMANTIC_TYPE_MAPPINGS_H_ -#include - namespace tint { // Forward declarations diff --git a/src/semantic/variable.h b/src/semantic/variable.h index 3808b8911c..96f023a42d 100644 --- a/src/semantic/variable.h +++ b/src/semantic/variable.h @@ -15,13 +15,10 @@ #ifndef SRC_SEMANTIC_VARIABLE_H_ #define SRC_SEMANTIC_VARIABLE_H_ -#include #include #include "src/ast/storage_class.h" #include "src/semantic/expression.h" -#include "src/semantic/node.h" -#include "src/type/sampler_type.h" namespace tint { diff --git a/src/source.h b/src/source.h index 381d7371d0..f56953c85d 100644 --- a/src/source.h +++ b/src/source.h @@ -16,9 +16,6 @@ #ifndef SRC_SOURCE_H_ #define SRC_SOURCE_H_ -#include - -#include #include #include diff --git a/src/test_main.cc b/src/test_main.cc index 30e2645d9b..8e56b05305 100644 --- a/src/test_main.cc +++ b/src/test_main.cc @@ -13,8 +13,6 @@ // limitations under the License. #include "gmock/gmock.h" -#include "gtest/gtest.h" -#include "src/debug.h" #include "src/utils/command.h" #include "src/writer/hlsl/test_helper.h" diff --git a/src/traits.h b/src/traits.h index d28e975aaf..f35fe0f026 100644 --- a/src/traits.h +++ b/src/traits.h @@ -16,7 +16,6 @@ #define SRC_TRAITS_H_ #include -#include namespace tint { namespace traits { diff --git a/src/traits_test.cc b/src/traits_test.cc index 8ce565c177..b598298ff6 100644 --- a/src/traits_test.cc +++ b/src/traits_test.cc @@ -14,8 +14,6 @@ #include "src/traits.h" -#include - #include "gtest/gtest.h" namespace tint { diff --git a/src/transform/bound_array_accessors.cc b/src/transform/bound_array_accessors.cc index ec0a768fdc..bbb50d7f1d 100644 --- a/src/transform/bound_array_accessors.cc +++ b/src/transform/bound_array_accessors.cc @@ -15,40 +15,10 @@ #include "src/transform/bound_array_accessors.h" #include -#include #include -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/block_statement.h" -#include "src/ast/break_statement.h" -#include "src/ast/call_expression.h" -#include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" -#include "src/ast/continue_statement.h" -#include "src/ast/discard_statement.h" -#include "src/ast/else_statement.h" -#include "src/ast/fallthrough_statement.h" -#include "src/ast/if_statement.h" -#include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" -#include "src/clone_context.h" #include "src/program_builder.h" #include "src/semantic/expression.h" -#include "src/type/array_type.h" -#include "src/type/matrix_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace transform { diff --git a/src/transform/bound_array_accessors.h b/src/transform/bound_array_accessors.h index 22e0ffd2b0..d0d0a9fb29 100644 --- a/src/transform/bound_array_accessors.h +++ b/src/transform/bound_array_accessors.h @@ -15,13 +15,7 @@ #ifndef SRC_TRANSFORM_BOUND_ARRAY_ACCESSORS_H_ #define SRC_TRANSFORM_BOUND_ARRAY_ACCESSORS_H_ -#include - #include "src/ast/array_accessor_expression.h" -#include "src/ast/expression.h" -#include "src/ast/statement.h" -#include "src/program.h" -#include "src/scope_stack.h" #include "src/transform/transform.h" namespace tint { diff --git a/src/transform/emit_vertex_point_size.cc b/src/transform/emit_vertex_point_size.cc index 0dcc50a4b2..319999f2da 100644 --- a/src/transform/emit_vertex_point_size.cc +++ b/src/transform/emit_vertex_point_size.cc @@ -14,20 +14,10 @@ #include "src/transform/emit_vertex_point_size.h" -#include #include #include "src/ast/assignment_statement.h" -#include "src/ast/block_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/variable.h" -#include "src/clone_context.h" -#include "src/program.h" #include "src/program_builder.h" -#include "src/type/f32_type.h" -#include "src/type/type_manager.h" namespace tint { namespace transform { diff --git a/src/transform/first_index_offset.cc b/src/transform/first_index_offset.cc index 6c2ecd0235..6ad4a740ca 100644 --- a/src/transform/first_index_offset.cc +++ b/src/transform/first_index_offset.cc @@ -14,45 +14,12 @@ #include "src/transform/first_index_offset.h" -#include #include #include -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/break_statement.h" -#include "src/ast/builtin_decoration.h" -#include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" -#include "src/ast/constructor_expression.h" -#include "src/ast/else_statement.h" -#include "src/ast/expression.h" -#include "src/ast/fallthrough_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" -#include "src/ast/variable_decoration.h" -#include "src/clone_context.h" -#include "src/program.h" #include "src/program_builder.h" #include "src/semantic/function.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" TINT_INSTANTIATE_TYPEINFO(tint::transform::FirstIndexOffset::Data); diff --git a/src/transform/first_index_offset.h b/src/transform/first_index_offset.h index 290e078659..f2d04ecd58 100644 --- a/src/transform/first_index_offset.h +++ b/src/transform/first_index_offset.h @@ -18,8 +18,6 @@ #include #include "src/ast/variable_decl_statement.h" -#include "src/program.h" -#include "src/symbol.h" #include "src/transform/transform.h" namespace tint { diff --git a/src/transform/hlsl.cc b/src/transform/hlsl.cc index af67bcc383..f634b72f62 100644 --- a/src/transform/hlsl.cc +++ b/src/transform/hlsl.cc @@ -20,7 +20,6 @@ #include "src/program_builder.h" #include "src/semantic/expression.h" #include "src/semantic/statement.h" -#include "src/type/array_type.h" namespace tint { namespace transform { diff --git a/src/transform/hlsl_test.cc b/src/transform/hlsl_test.cc index 3eca722253..57340f1e24 100644 --- a/src/transform/hlsl_test.cc +++ b/src/transform/hlsl_test.cc @@ -14,10 +14,6 @@ #include "src/transform/hlsl.h" -#include -#include -#include - #include "src/transform/test_helper.h" namespace tint { diff --git a/src/transform/manager.cc b/src/transform/manager.cc index e89f1465fa..4f4fb73c4f 100644 --- a/src/transform/manager.cc +++ b/src/transform/manager.cc @@ -14,8 +14,6 @@ #include "src/transform/manager.h" -#include "src/program_builder.h" - namespace tint { namespace transform { diff --git a/src/transform/manager.h b/src/transform/manager.h index f2f43417f0..1351b0a40c 100644 --- a/src/transform/manager.h +++ b/src/transform/manager.h @@ -16,11 +16,9 @@ #define SRC_TRANSFORM_MANAGER_H_ #include -#include #include #include -#include "src/diagnostic/diagnostic.h" #include "src/transform/transform.h" namespace tint { diff --git a/src/transform/msl_test.cc b/src/transform/msl_test.cc index 5390ab243c..c38feb4e43 100644 --- a/src/transform/msl_test.cc +++ b/src/transform/msl_test.cc @@ -14,10 +14,7 @@ #include "src/transform/msl.h" -#include #include -#include -#include #include "src/transform/test_helper.h" diff --git a/src/transform/renamer.cc b/src/transform/renamer.cc index b9b74043cd..b6f31a0e1b 100644 --- a/src/transform/renamer.cc +++ b/src/transform/renamer.cc @@ -18,10 +18,8 @@ #include #include -#include "src/ast/member_accessor_expression.h" #include "src/program_builder.h" #include "src/semantic/call.h" -#include "src/semantic/intrinsic.h" #include "src/semantic/member_accessor_expression.h" TINT_INSTANTIATE_TYPEINFO(tint::transform::Renamer::Data); diff --git a/src/transform/spirv.cc b/src/transform/spirv.cc index a5a1228236..37c002b913 100644 --- a/src/transform/spirv.cc +++ b/src/transform/spirv.cc @@ -17,9 +17,7 @@ #include #include -#include "src/ast/variable.h" #include "src/program_builder.h" -#include "src/semantic/expression.h" #include "src/semantic/variable.h" namespace tint { diff --git a/src/transform/spirv_test.cc b/src/transform/spirv_test.cc index 4740a419d7..d1876d883d 100644 --- a/src/transform/spirv_test.cc +++ b/src/transform/spirv_test.cc @@ -14,10 +14,6 @@ #include "src/transform/spirv.h" -#include -#include -#include - #include "src/transform/test_helper.h" namespace tint { diff --git a/src/transform/test_helper.h b/src/transform/test_helper.h index 3b062d22e3..aa6ae963fe 100644 --- a/src/transform/test_helper.h +++ b/src/transform/test_helper.h @@ -21,8 +21,6 @@ #include #include "gtest/gtest.h" -#include "src/program.h" -#include "src/program_builder.h" #include "src/reader/wgsl/parser.h" #include "src/transform/manager.h" #include "src/writer/wgsl/generator.h" diff --git a/src/transform/transform.cc b/src/transform/transform.cc index e0ab4c9db7..e1e8210847 100644 --- a/src/transform/transform.cc +++ b/src/transform/transform.cc @@ -16,9 +16,6 @@ #include -#include "src/ast/block_statement.h" -#include "src/ast/function.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::transform::Data); diff --git a/src/transform/transform.h b/src/transform/transform.h index c82bcf65a3..6e51c0441a 100644 --- a/src/transform/transform.h +++ b/src/transform/transform.h @@ -16,12 +16,9 @@ #define SRC_TRANSFORM_TRANSFORM_H_ #include -#include -#include #include #include -#include "src/diagnostic/diagnostic.h" #include "src/program.h" namespace tint { diff --git a/src/transform/vertex_pulling.cc b/src/transform/vertex_pulling.cc index 3f7f13865a..71e3578625 100644 --- a/src/transform/vertex_pulling.cc +++ b/src/transform/vertex_pulling.cc @@ -16,32 +16,12 @@ #include -#include "src/ast/array_accessor_expression.h" #include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" #include "src/ast/bitcast_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/stride_decoration.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/clone_context.h" -#include "src/program.h" #include "src/program_builder.h" #include "src/semantic/variable.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace transform { diff --git a/src/transform/vertex_pulling.h b/src/transform/vertex_pulling.h index ac29cf7a84..bf219899b9 100644 --- a/src/transform/vertex_pulling.h +++ b/src/transform/vertex_pulling.h @@ -20,11 +20,6 @@ #include #include -#include "src/ast/expression.h" -#include "src/ast/function.h" -#include "src/ast/statement.h" -#include "src/ast/variable.h" -#include "src/program.h" #include "src/transform/transform.h" namespace tint { diff --git a/src/type/access_control_type.cc b/src/type/access_control_type.cc index cdf034ae4f..43c7924207 100644 --- a/src/type/access_control_type.cc +++ b/src/type/access_control_type.cc @@ -14,9 +14,6 @@ #include "src/type/access_control_type.h" -#include - -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::AccessControl); diff --git a/src/type/access_control_type_test.cc b/src/type/access_control_type_test.cc index d398fcae60..b6c29c126c 100644 --- a/src/type/access_control_type_test.cc +++ b/src/type/access_control_type_test.cc @@ -14,25 +14,8 @@ #include "src/type/access_control_type.h" -#include -#include - -#include "src/ast/storage_class.h" -#include "src/ast/stride_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/alias_type.cc b/src/type/alias_type.cc index 346db1d67a..f5e2d2a18c 100644 --- a/src/type/alias_type.cc +++ b/src/type/alias_type.cc @@ -14,9 +14,6 @@ #include "src/type/alias_type.h" -#include - -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Alias); diff --git a/src/type/alias_type.h b/src/type/alias_type.h index 57e44d99bd..53619503f2 100644 --- a/src/type/alias_type.h +++ b/src/type/alias_type.h @@ -17,7 +17,6 @@ #include -#include "src/symbol.h" #include "src/type/type.h" namespace tint { diff --git a/src/type/alias_type_test.cc b/src/type/alias_type_test.cc index 470f390f69..13690dd97f 100644 --- a/src/type/alias_type_test.cc +++ b/src/type/alias_type_test.cc @@ -12,27 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/alias_type.h" - -#include -#include - -#include "src/ast/storage_class.h" -#include "src/ast/stride_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/array_type.cc b/src/type/array_type.cc index 914b3f5f3b..6d0b82590f 100644 --- a/src/type/array_type.cc +++ b/src/type/array_type.cc @@ -15,12 +15,8 @@ #include "src/type/array_type.h" #include -#include -#include "src/ast/stride_decoration.h" -#include "src/clone_context.h" #include "src/program_builder.h" -#include "src/type/vector_type.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Array); diff --git a/src/type/array_type.h b/src/type/array_type.h index 1fccc27e50..27bc891056 100644 --- a/src/type/array_type.h +++ b/src/type/array_type.h @@ -15,10 +15,7 @@ #ifndef SRC_TYPE_ARRAY_TYPE_H_ #define SRC_TYPE_ARRAY_TYPE_H_ -#include - #include -#include #include "src/ast/array_decoration.h" #include "src/type/type.h" diff --git a/src/type/array_type_test.cc b/src/type/array_type_test.cc index 85c0655bd8..8e2b07e6a8 100644 --- a/src/type/array_type_test.cc +++ b/src/type/array_type_test.cc @@ -12,23 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/array_type.h" - -#include -#include - -#include "src/ast/stride_decoration.h" #include "src/type/access_control_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/bool_type.cc b/src/type/bool_type.cc index b0e6a2c604..b21227d60f 100644 --- a/src/type/bool_type.cc +++ b/src/type/bool_type.cc @@ -14,7 +14,6 @@ #include "src/type/bool_type.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Bool); diff --git a/src/type/bool_type_test.cc b/src/type/bool_type_test.cc index 49a18f1455..3a9fd2c52b 100644 --- a/src/type/bool_type_test.cc +++ b/src/type/bool_type_test.cc @@ -12,19 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/bool_type.h" - #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/depth_texture_type.cc b/src/type/depth_texture_type.cc index 1a8573dd79..e8dc4ff30a 100644 --- a/src/type/depth_texture_type.cc +++ b/src/type/depth_texture_type.cc @@ -14,10 +14,6 @@ #include "src/type/depth_texture_type.h" -#include -#include - -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::DepthTexture); diff --git a/src/type/depth_texture_type_test.cc b/src/type/depth_texture_type_test.cc index 730393011b..ebb20da807 100644 --- a/src/type/depth_texture_type_test.cc +++ b/src/type/depth_texture_type_test.cc @@ -17,17 +17,8 @@ #include "src/type/test_helper.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/f32_type.cc b/src/type/f32_type.cc index 53dfc247aa..8bd02ab085 100644 --- a/src/type/f32_type.cc +++ b/src/type/f32_type.cc @@ -14,7 +14,6 @@ #include "src/type/f32_type.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::F32); diff --git a/src/type/f32_type_test.cc b/src/type/f32_type_test.cc index 92fca648c5..d02d1b90bd 100644 --- a/src/type/f32_type_test.cc +++ b/src/type/f32_type_test.cc @@ -12,19 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/f32_type.h" - #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/i32_type.cc b/src/type/i32_type.cc index 11c61f9667..78a7a7d1e9 100644 --- a/src/type/i32_type.cc +++ b/src/type/i32_type.cc @@ -14,7 +14,6 @@ #include "src/type/i32_type.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::I32); diff --git a/src/type/i32_type_test.cc b/src/type/i32_type_test.cc index 60df02f74a..788ea586f2 100644 --- a/src/type/i32_type_test.cc +++ b/src/type/i32_type_test.cc @@ -12,19 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/i32_type.h" - #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/matrix_type.cc b/src/type/matrix_type.cc index 8fbd2fd882..4d6293c2d2 100644 --- a/src/type/matrix_type.cc +++ b/src/type/matrix_type.cc @@ -14,12 +14,7 @@ #include "src/type/matrix_type.h" -#include - -#include "src/clone_context.h" #include "src/program_builder.h" -#include "src/type/array_type.h" -#include "src/type/vector_type.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Matrix); diff --git a/src/type/matrix_type_test.cc b/src/type/matrix_type_test.cc index e7b6227735..73a7d0f37f 100644 --- a/src/type/matrix_type_test.cc +++ b/src/type/matrix_type_test.cc @@ -12,19 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/matrix_type.h" - #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/multisampled_texture_type.cc b/src/type/multisampled_texture_type.cc index 8568c98939..7037b91f3b 100644 --- a/src/type/multisampled_texture_type.cc +++ b/src/type/multisampled_texture_type.cc @@ -14,10 +14,6 @@ #include "src/type/multisampled_texture_type.h" -#include -#include - -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::MultisampledTexture); diff --git a/src/type/multisampled_texture_type_test.cc b/src/type/multisampled_texture_type_test.cc index d4ac2ee727..caeb3fae0c 100644 --- a/src/type/multisampled_texture_type_test.cc +++ b/src/type/multisampled_texture_type_test.cc @@ -15,19 +15,10 @@ #include "src/type/multisampled_texture_type.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/pointer_type.cc b/src/type/pointer_type.cc index 7a7a635555..7f989669b9 100644 --- a/src/type/pointer_type.cc +++ b/src/type/pointer_type.cc @@ -14,7 +14,6 @@ #include "src/type/pointer_type.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Pointer); diff --git a/src/type/pointer_type.h b/src/type/pointer_type.h index 9df8e73bb2..abbef7fe1b 100644 --- a/src/type/pointer_type.h +++ b/src/type/pointer_type.h @@ -15,7 +15,6 @@ #ifndef SRC_TYPE_POINTER_TYPE_H_ #define SRC_TYPE_POINTER_TYPE_H_ -#include #include #include "src/ast/storage_class.h" diff --git a/src/type/pointer_type_test.cc b/src/type/pointer_type_test.cc index dd48053e22..f79211c245 100644 --- a/src/type/pointer_type_test.cc +++ b/src/type/pointer_type_test.cc @@ -12,19 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/pointer_type.h" - #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/sampled_texture_type.cc b/src/type/sampled_texture_type.cc index 937c331f55..50649ac3e3 100644 --- a/src/type/sampled_texture_type.cc +++ b/src/type/sampled_texture_type.cc @@ -14,10 +14,6 @@ #include "src/type/sampled_texture_type.h" -#include -#include - -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::SampledTexture); diff --git a/src/type/sampled_texture_type_test.cc b/src/type/sampled_texture_type_test.cc index 7eee0faaaf..5034fb8100 100644 --- a/src/type/sampled_texture_type_test.cc +++ b/src/type/sampled_texture_type_test.cc @@ -15,18 +15,9 @@ #include "src/type/sampled_texture_type.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/sampler_type.cc b/src/type/sampler_type.cc index b0058269f0..abfa64dfcf 100644 --- a/src/type/sampler_type.cc +++ b/src/type/sampler_type.cc @@ -14,7 +14,6 @@ #include "src/type/sampler_type.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Sampler); diff --git a/src/type/sampler_type.h b/src/type/sampler_type.h index 486446be51..f74d873970 100644 --- a/src/type/sampler_type.h +++ b/src/type/sampler_type.h @@ -15,7 +15,6 @@ #ifndef SRC_TYPE_SAMPLER_TYPE_H_ #define SRC_TYPE_SAMPLER_TYPE_H_ -#include #include #include "src/type/type.h" diff --git a/src/type/sampler_type_test.cc b/src/type/sampler_type_test.cc index 2b3184b681..1912857cc2 100644 --- a/src/type/sampler_type_test.cc +++ b/src/type/sampler_type_test.cc @@ -12,20 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/sampler_type.h" - #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/storage_texture_type.cc b/src/type/storage_texture_type.cc index 488eb7aabe..c430ea6c0d 100644 --- a/src/type/storage_texture_type.cc +++ b/src/type/storage_texture_type.cc @@ -14,10 +14,6 @@ #include "src/type/storage_texture_type.h" -#include -#include - -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::StorageTexture); diff --git a/src/type/storage_texture_type_test.cc b/src/type/storage_texture_type_test.cc index 22966f7ac5..d7af8010cc 100644 --- a/src/type/storage_texture_type_test.cc +++ b/src/type/storage_texture_type_test.cc @@ -14,22 +14,10 @@ #include "src/type/storage_texture_type.h" -#include - -#include "src/ast/identifier_expression.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/struct_type.cc b/src/type/struct_type.cc index b8c50e6813..c1bf774bf9 100644 --- a/src/type/struct_type.cc +++ b/src/type/struct_type.cc @@ -15,14 +15,8 @@ #include "src/type/struct_type.h" #include -#include -#include "src/clone_context.h" #include "src/program_builder.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/matrix_type.h" -#include "src/type/vector_type.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Struct); diff --git a/src/type/struct_type.h b/src/type/struct_type.h index eb0c37dfe8..bec67828b8 100644 --- a/src/type/struct_type.h +++ b/src/type/struct_type.h @@ -15,11 +15,9 @@ #ifndef SRC_TYPE_STRUCT_TYPE_H_ #define SRC_TYPE_STRUCT_TYPE_H_ -#include #include #include "src/ast/struct.h" -#include "src/symbol.h" #include "src/type/type.h" namespace tint { diff --git a/src/type/struct_type_test.cc b/src/type/struct_type_test.cc index 44195873f4..368362e2c7 100644 --- a/src/type/struct_type_test.cc +++ b/src/type/struct_type_test.cc @@ -12,25 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/struct_type.h" - -#include - -#include "src/ast/stride_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/test_helper.h b/src/type/test_helper.h index e09e9c39ff..1c08c60b36 100644 --- a/src/type/test_helper.h +++ b/src/type/test_helper.h @@ -15,8 +15,6 @@ #ifndef SRC_TYPE_TEST_HELPER_H_ #define SRC_TYPE_TEST_HELPER_H_ -#include -#include #include #include "gtest/gtest.h" diff --git a/src/type/texture_type.cc b/src/type/texture_type.cc index 8f55ad753b..1f66a37131 100644 --- a/src/type/texture_type.cc +++ b/src/type/texture_type.cc @@ -14,12 +14,6 @@ #include "src/type/texture_type.h" -#include -#include - -#include "src/type/multisampled_texture_type.h" -#include "src/type/sampled_texture_type.h" - TINT_INSTANTIATE_TYPEINFO(tint::type::Texture); namespace tint { diff --git a/src/type/type.cc b/src/type/type.cc index b6cb59d061..2f6e0dcde6 100644 --- a/src/type/type.cc +++ b/src/type/type.cc @@ -14,22 +14,17 @@ #include "src/type/type.h" -#include - #include "src/type/access_control_type.h" #include "src/type/alias_type.h" -#include "src/type/array_type.h" #include "src/type/bool_type.h" #include "src/type/f32_type.h" #include "src/type/i32_type.h" #include "src/type/matrix_type.h" #include "src/type/pointer_type.h" #include "src/type/sampler_type.h" -#include "src/type/struct_type.h" #include "src/type/texture_type.h" #include "src/type/u32_type.h" #include "src/type/vector_type.h" -#include "src/type/void_type.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Type); @@ -61,9 +56,9 @@ Type* Type::UnwrapIfNeeded() { auto* where = this; while (true) { if (auto* alias = where->As()) { - where = alias->type(); + where = alias->type(); } else if (auto* access = where->As()) { - where = access->type(); + where = access->type(); } else { break; } diff --git a/src/type/type_manager.cc b/src/type/type_manager.cc index a9b1121f38..1f6833d1e9 100644 --- a/src/type/type_manager.cc +++ b/src/type/type_manager.cc @@ -14,8 +14,6 @@ #include "src/type/type_manager.h" -#include - namespace tint { namespace type { diff --git a/src/type/u32_type.cc b/src/type/u32_type.cc index 407538b62c..c2f029c69c 100644 --- a/src/type/u32_type.cc +++ b/src/type/u32_type.cc @@ -14,7 +14,6 @@ #include "src/type/u32_type.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::U32); diff --git a/src/type/u32_type_test.cc b/src/type/u32_type_test.cc index b9de713e23..5b6db5aaab 100644 --- a/src/type/u32_type_test.cc +++ b/src/type/u32_type_test.cc @@ -12,20 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/u32_type.h" - #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/sampler_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/vector_type.h" namespace tint { namespace type { diff --git a/src/type/vector_type.cc b/src/type/vector_type.cc index cb1ff731a7..3a8078fdfc 100644 --- a/src/type/vector_type.cc +++ b/src/type/vector_type.cc @@ -14,10 +14,6 @@ #include "src/type/vector_type.h" -#include -#include - -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Vector); diff --git a/src/type/vector_type_test.cc b/src/type/vector_type_test.cc index 51dfa4bb48..8f13b68b55 100644 --- a/src/type/vector_type_test.cc +++ b/src/type/vector_type_test.cc @@ -12,19 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/type/vector_type.h" - #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" #include "src/type/test_helper.h" #include "src/type/texture_type.h" -#include "src/type/u32_type.h" namespace tint { namespace type { diff --git a/src/type/void_type.cc b/src/type/void_type.cc index df750af04e..f615a20cb9 100644 --- a/src/type/void_type.cc +++ b/src/type/void_type.cc @@ -14,7 +14,6 @@ #include "src/type/void_type.h" -#include "src/clone_context.h" #include "src/program_builder.h" TINT_INSTANTIATE_TYPEINFO(tint::type::Void); diff --git a/src/utils/command_posix.cc b/src/utils/command_posix.cc index b387b60d5a..6ec2a9834e 100644 --- a/src/utils/command_posix.cc +++ b/src/utils/command_posix.cc @@ -14,16 +14,10 @@ #include "src/utils/command.h" -#include -#include -#include #include #include -#include #include #include -#include -#include #include #include diff --git a/src/utils/tmpfile_posix.cc b/src/utils/tmpfile_posix.cc index 7486896098..5bf78045d1 100644 --- a/src/utils/tmpfile_posix.cc +++ b/src/utils/tmpfile_posix.cc @@ -14,9 +14,7 @@ #include "src/utils/tmpfile.h" -#include #include -#include namespace tint { namespace utils { diff --git a/src/utils/unique_vector.h b/src/utils/unique_vector.h index 36016eec0e..5f8ce348a5 100644 --- a/src/utils/unique_vector.h +++ b/src/utils/unique_vector.h @@ -47,7 +47,7 @@ struct UniqueVector { ConstIterator end() const { return vector.end(); } /// @returns a const reference to the internal vector - operator const std::vector &() const { return vector; } + operator const std::vector&() const { return vector; } private: std::vector vector; diff --git a/src/validator/validator.h b/src/validator/validator.h index 65b9777852..b6e6804327 100644 --- a/src/validator/validator.h +++ b/src/validator/validator.h @@ -15,14 +15,8 @@ #ifndef SRC_VALIDATOR_VALIDATOR_H_ #define SRC_VALIDATOR_VALIDATOR_H_ -#include #include -#include "src/ast/assignment_statement.h" -#include "src/ast/expression.h" -#include "src/ast/statement.h" -#include "src/diagnostic/diagnostic.h" -#include "src/diagnostic/formatter.h" #include "src/program.h" namespace tint { diff --git a/src/validator/validator_builtins_test.cc b/src/validator/validator_builtins_test.cc index b4e5e0e8ce..c65393bdcd 100644 --- a/src/validator/validator_builtins_test.cc +++ b/src/validator/validator_builtins_test.cc @@ -12,20 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/struct.h" -#include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable_decl_statement.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" -#include "src/validator/validator_impl.h" #include "src/validator/validator_test_helper.h" namespace tint { diff --git a/src/validator/validator_control_block_test.cc b/src/validator/validator_control_block_test.cc index 047eedeac8..fcca90c85c 100644 --- a/src/validator/validator_control_block_test.cc +++ b/src/validator/validator_control_block_test.cc @@ -12,22 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "spirv/unified1/GLSL.std.450.h" -#include "src/ast/case_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/switch_statement.h" -#include "src/ast/uint_literal.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" -#include "src/type/alias_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/u32_type.h" -#include "src/validator/validator_impl.h" #include "src/validator/validator_test_helper.h" namespace tint { diff --git a/src/validator/validator_function_test.cc b/src/validator/validator_function_test.cc index 45133b015a..eb212d91ce 100644 --- a/src/validator/validator_function_test.cc +++ b/src/validator/validator_function_test.cc @@ -12,20 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "spirv/unified1/GLSL.std.450.h" -#include "src/ast/call_statement.h" -#include "src/ast/pipeline_stage.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/void_type.h" -#include "src/validator/validator_impl.h" #include "src/validator/validator_test_helper.h" namespace tint { diff --git a/src/validator/validator_impl.cc b/src/validator/validator_impl.cc index a6d9e3576c..ec46aa6c61 100644 --- a/src/validator/validator_impl.cc +++ b/src/validator/validator_impl.cc @@ -14,32 +14,18 @@ #include "src/validator/validator_impl.h" -#include -#include #include #include "src/ast/call_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/function.h" -#include "src/ast/int_literal.h" -#include "src/ast/module.h" #include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/struct.h" -#include "src/ast/switch_statement.h" #include "src/ast/uint_literal.h" -#include "src/ast/variable_decl_statement.h" -#include "src/debug.h" #include "src/semantic/call.h" -#include "src/semantic/expression.h" #include "src/semantic/function.h" -#include "src/semantic/intrinsic.h" #include "src/semantic/variable.h" #include "src/type/alias_type.h" #include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" #include "src/type/matrix_type.h" #include "src/type/pointer_type.h" #include "src/type/struct_type.h" diff --git a/src/validator/validator_impl.h b/src/validator/validator_impl.h index 0ad3330df1..e5f02c3428 100644 --- a/src/validator/validator_impl.h +++ b/src/validator/validator_impl.h @@ -16,22 +16,14 @@ #define SRC_VALIDATOR_VALIDATOR_IMPL_H_ #include -#include #include -#include #include "src/ast/assignment_statement.h" -#include "src/ast/call_expression.h" -#include "src/ast/expression.h" #include "src/ast/identifier_expression.h" #include "src/ast/module.h" #include "src/ast/return_statement.h" -#include "src/ast/statement.h" #include "src/ast/switch_statement.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/diagnostic/diagnostic.h" -#include "src/diagnostic/formatter.h" #include "src/program.h" #include "src/scope_stack.h" diff --git a/src/validator/validator_test.cc b/src/validator/validator_test.cc index e2aaef7f24..f4c8cefb8e 100644 --- a/src/validator/validator_test.cc +++ b/src/validator/validator_test.cc @@ -12,46 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "spirv/unified1/GLSL.std.450.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/break_statement.h" -#include "src/ast/call_expression.h" -#include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" -#include "src/ast/continue_statement.h" -#include "src/ast/else_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" #include "src/ast/if_statement.h" -#include "src/ast/int_literal.h" -#include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/pipeline_stage.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" -#include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" -#include "src/validator/validator_impl.h" #include "src/validator/validator_test_helper.h" namespace tint { diff --git a/src/validator/validator_test_helper.cc b/src/validator/validator_test_helper.cc index df539ae080..2efa3b9659 100644 --- a/src/validator/validator_test_helper.cc +++ b/src/validator/validator_test_helper.cc @@ -14,8 +14,6 @@ #include "src/validator/validator_test_helper.h" -#include - namespace tint { ValidatorTestHelper::ValidatorTestHelper() = default; diff --git a/src/validator/validator_test_helper.h b/src/validator/validator_test_helper.h index e8297c2a41..36e49a5d9b 100644 --- a/src/validator/validator_test_helper.h +++ b/src/validator/validator_test_helper.h @@ -15,7 +15,6 @@ #ifndef SRC_VALIDATOR_VALIDATOR_TEST_HELPER_H_ #define SRC_VALIDATOR_VALIDATOR_TEST_HELPER_H_ -#include #include #include #include @@ -23,7 +22,6 @@ #include "gtest/gtest.h" #include "src/program_builder.h" #include "src/semantic/expression.h" -#include "src/type/void_type.h" #include "src/validator/validator_impl.h" namespace tint { diff --git a/src/validator/validator_type_test.cc b/src/validator/validator_type_test.cc index d61934ced0..455e42fc6e 100644 --- a/src/validator/validator_type_test.cc +++ b/src/validator/validator_type_test.cc @@ -12,23 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable_decl_statement.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" -#include "src/validator/validator_impl.h" #include "src/validator/validator_test_helper.h" -#include "src/ast/pipeline_stage.h" #include "src/ast/stage_decoration.h" namespace tint { namespace { diff --git a/src/writer/append_vector.cc b/src/writer/append_vector.cc index 95085ec38d..1b1a10decd 100644 --- a/src/writer/append_vector.cc +++ b/src/writer/append_vector.cc @@ -16,11 +16,7 @@ #include -#include "src/ast/expression.h" -#include "src/ast/type_constructor_expression.h" #include "src/semantic/expression.h" -#include "src/semantic/info.h" -#include "src/type/vector_type.h" namespace tint { namespace writer { diff --git a/src/writer/hlsl/generator.cc b/src/writer/hlsl/generator.cc index 15f2ee857f..b3538fb1fb 100644 --- a/src/writer/hlsl/generator.cc +++ b/src/writer/hlsl/generator.cc @@ -14,8 +14,6 @@ #include "src/writer/hlsl/generator.h" -#include - namespace tint { namespace writer { namespace hlsl { diff --git a/src/writer/hlsl/generator.h b/src/writer/hlsl/generator.h index 63e6c3dc66..68313dade2 100644 --- a/src/writer/hlsl/generator.h +++ b/src/writer/hlsl/generator.h @@ -16,10 +16,8 @@ #define SRC_WRITER_HLSL_GENERATOR_H_ #include -#include #include -#include "src/program.h" #include "src/writer/hlsl/generator_impl.h" #include "src/writer/text.h" diff --git a/src/writer/hlsl/generator_impl.cc b/src/writer/hlsl/generator_impl.cc index 7fb193dde9..a8cf820dbc 100644 --- a/src/writer/hlsl/generator_impl.cc +++ b/src/writer/hlsl/generator_impl.cc @@ -14,60 +14,20 @@ #include "src/writer/hlsl/generator_impl.h" -#include -#include #include #include -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/else_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/module.h" -#include "src/ast/return_statement.h" -#include "src/ast/sint_literal.h" -#include "src/ast/struct.h" -#include "src/ast/switch_statement.h" -#include "src/ast/uint_literal.h" -#include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/debug.h" -#include "src/program_builder.h" #include "src/semantic/call.h" -#include "src/semantic/expression.h" #include "src/semantic/function.h" #include "src/semantic/member_accessor_expression.h" #include "src/semantic/variable.h" #include "src/type/access_control_type.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" #include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" -#include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" #include "src/writer/append_vector.h" #include "src/writer/float_to_string.h" diff --git a/src/writer/hlsl/generator_impl.h b/src/writer/hlsl/generator_impl.h index 48cfafd294..c967e553cb 100644 --- a/src/writer/hlsl/generator_impl.h +++ b/src/writer/hlsl/generator_impl.h @@ -19,29 +19,18 @@ #include #include -#include "src/ast/array_accessor_expression.h" #include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" #include "src/ast/bitcast_expression.h" #include "src/ast/break_statement.h" -#include "src/ast/call_expression.h" -#include "src/ast/case_statement.h" #include "src/ast/continue_statement.h" #include "src/ast/discard_statement.h" -#include "src/ast/identifier_expression.h" #include "src/ast/if_statement.h" -#include "src/ast/literal.h" #include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" #include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" #include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" #include "src/ast/unary_op_expression.h" #include "src/program_builder.h" #include "src/scope_stack.h" -#include "src/semantic/intrinsic.h" -#include "src/type/struct_type.h" #include "src/writer/hlsl/namer.h" #include "src/writer/text_generator.h" diff --git a/src/writer/hlsl/generator_impl_alias_type_test.cc b/src/writer/hlsl/generator_impl_alias_type_test.cc index 097530edfe..2b1da05c01 100644 --- a/src/writer/hlsl/generator_impl_alias_type_test.cc +++ b/src/writer/hlsl/generator_impl_alias_type_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/type/struct_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_array_accessor_test.cc b/src/writer/hlsl/generator_impl_array_accessor_test.cc index 503186ab38..9b04593fff 100644 --- a/src/writer/hlsl/generator_impl_array_accessor_test.cc +++ b/src/writer/hlsl/generator_impl_array_accessor_test.cc @@ -12,14 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/array_accessor_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/program.h" -#include "src/type/i32_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_assign_test.cc b/src/writer/hlsl/generator_impl_assign_test.cc index be2f2dd9cc..b53613d23c 100644 --- a/src/writer/hlsl/generator_impl_assign_test.cc +++ b/src/writer/hlsl/generator_impl_assign_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "src/ast/assignment_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_binary_test.cc b/src/writer/hlsl/generator_impl_binary_test.cc index d0137da747..a64a7448ef 100644 --- a/src/writer/hlsl/generator_impl_binary_test.cc +++ b/src/writer/hlsl/generator_impl_binary_test.cc @@ -12,32 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/else_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/function.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/program.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_bitcast_test.cc b/src/writer/hlsl/generator_impl_bitcast_test.cc index ed56ef3f89..51c367f2e8 100644 --- a/src/writer/hlsl/generator_impl_bitcast_test.cc +++ b/src/writer/hlsl/generator_impl_bitcast_test.cc @@ -12,14 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/bitcast_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/u32_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_block_test.cc b/src/writer/hlsl/generator_impl_block_test.cc index edb9be281e..851c37c487 100644 --- a/src/writer/hlsl/generator_impl_block_test.cc +++ b/src/writer/hlsl/generator_impl_block_test.cc @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/block_statement.h" -#include "src/ast/discard_statement.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_break_test.cc b/src/writer/hlsl/generator_impl_break_test.cc index 36715bfbda..09fef930f4 100644 --- a/src/writer/hlsl/generator_impl_break_test.cc +++ b/src/writer/hlsl/generator_impl_break_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "src/ast/break_statement.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_call_test.cc b/src/writer/hlsl/generator_impl_call_test.cc index 2ca0294716..aa61e47114 100644 --- a/src/writer/hlsl/generator_impl_call_test.cc +++ b/src/writer/hlsl/generator_impl_call_test.cc @@ -12,14 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/function.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" -#include "src/type/void_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_case_test.cc b/src/writer/hlsl/generator_impl_case_test.cc index 827ee1bc47..7e3c23d358 100644 --- a/src/writer/hlsl/generator_impl_case_test.cc +++ b/src/writer/hlsl/generator_impl_case_test.cc @@ -12,15 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/break_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/sint_literal.h" -#include "src/program.h" -#include "src/type/i32_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_cast_test.cc b/src/writer/hlsl/generator_impl_cast_test.cc index a6ef210c80..ac9cf5441f 100644 --- a/src/writer/hlsl/generator_impl_cast_test.cc +++ b/src/writer/hlsl/generator_impl_cast_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/identifier_expression.h" -#include "src/ast/type_constructor_expression.h" -#include "src/program.h" -#include "src/type/f32_type.h" -#include "src/type/vector_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_constructor_test.cc b/src/writer/hlsl/generator_impl_constructor_test.cc index 1a284c613b..48352be99b 100644 --- a/src/writer/hlsl/generator_impl_constructor_test.cc +++ b/src/writer/hlsl/generator_impl_constructor_test.cc @@ -12,20 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/program.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_continue_test.cc b/src/writer/hlsl/generator_impl_continue_test.cc index f9340782c8..fd1cc0b356 100644 --- a/src/writer/hlsl/generator_impl_continue_test.cc +++ b/src/writer/hlsl/generator_impl_continue_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "src/ast/continue_statement.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_discard_test.cc b/src/writer/hlsl/generator_impl_discard_test.cc index 574c397d0f..50e44531d1 100644 --- a/src/writer/hlsl/generator_impl_discard_test.cc +++ b/src/writer/hlsl/generator_impl_discard_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/discard_statement.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_function_entry_point_data_test.cc b/src/writer/hlsl/generator_impl_function_entry_point_data_test.cc index 82b5956087..df333171f2 100644 --- a/src/writer/hlsl/generator_impl_function_entry_point_data_test.cc +++ b/src/writer/hlsl/generator_impl_function_entry_point_data_test.cc @@ -12,18 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "src/ast/assignment_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/location_decoration.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/pipeline_stage.h" -#include "src/ast/return_statement.h" #include "src/ast/stage_decoration.h" -#include "src/ast/variable.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_function_test.cc b/src/writer/hlsl/generator_impl_function_test.cc index 92ee1948f8..3937442e3a 100644 --- a/src/writer/hlsl/generator_impl_function_test.cc +++ b/src/writer/hlsl/generator_impl_function_test.cc @@ -12,36 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/call_expression.h" -#include "src/ast/float_literal.h" -#include "src/ast/function.h" -#include "src/ast/group_decoration.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/location_decoration.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/pipeline_stage.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" #include "src/ast/workgroup_decoration.h" -#include "src/program.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_identifier_test.cc b/src/writer/hlsl/generator_impl_identifier_test.cc index 0c311cce29..536f5c0e4e 100644 --- a/src/writer/hlsl/generator_impl_identifier_test.cc +++ b/src/writer/hlsl/generator_impl_identifier_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/identifier_expression.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_if_test.cc b/src/writer/hlsl/generator_impl_if_test.cc index 314a103d1b..60d39b9764 100644 --- a/src/writer/hlsl/generator_impl_if_test.cc +++ b/src/writer/hlsl/generator_impl_if_test.cc @@ -12,11 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/else_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/return_statement.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_import_test.cc b/src/writer/hlsl/generator_impl_import_test.cc index c563e2eeda..459396b3f1 100644 --- a/src/writer/hlsl/generator_impl_import_test.cc +++ b/src/writer/hlsl/generator_impl_import_test.cc @@ -12,21 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include - -#include "src/ast/call_expression.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/type_constructor_expression.h" -#include "src/program.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/vector_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_intrinsic_test.cc b/src/writer/hlsl/generator_impl_intrinsic_test.cc index db4fac1001..6031fd0245 100644 --- a/src/writer/hlsl/generator_impl_intrinsic_test.cc +++ b/src/writer/hlsl/generator_impl_intrinsic_test.cc @@ -12,15 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "gmock/gmock.h" -#include "src/ast/call_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" #include "src/semantic/call.h" -#include "src/type/f32_type.h" -#include "src/type/vector_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc b/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc index 2d8b0c92cb..d2f8dda202 100644 --- a/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc +++ b/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc @@ -12,16 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" #include "src/ast/call_statement.h" #include "src/ast/intrinsic_texture_helper_test.h" #include "src/ast/stage_decoration.h" -#include "src/type/depth_texture_type.h" -#include "src/type/multisampled_texture_type.h" -#include "src/type/sampled_texture_type.h" -#include "src/writer/hlsl/generator_impl.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_loop_test.cc b/src/writer/hlsl/generator_impl_loop_test.cc index 1313f17ab2..ff387204bc 100644 --- a/src/writer/hlsl/generator_impl_loop_test.cc +++ b/src/writer/hlsl/generator_impl_loop_test.cc @@ -12,18 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/assignment_statement.h" -#include "src/ast/discard_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/loop_statement.h" -#include "src/ast/return_statement.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/program.h" -#include "src/type/f32_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_member_accessor_test.cc b/src/writer/hlsl/generator_impl_member_accessor_test.cc index 2f3a1f31d5..5c42ab2b2a 100644 --- a/src/writer/hlsl/generator_impl_member_accessor_test.cc +++ b/src/writer/hlsl/generator_impl_member_accessor_test.cc @@ -12,23 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/stride_decoration.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable.h" -#include "src/program.h" -#include "src/type/struct_type.h" -#include "src/type/vector_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_module_constant_test.cc b/src/writer/hlsl/generator_impl_module_constant_test.cc index ca988df24d..e25125a3d4 100644 --- a/src/writer/hlsl/generator_impl_module_constant_test.cc +++ b/src/writer/hlsl/generator_impl_module_constant_test.cc @@ -12,17 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include "src/ast/constant_id_decoration.h" -#include "src/ast/float_literal.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable.h" -#include "src/program.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_return_test.cc b/src/writer/hlsl/generator_impl_return_test.cc index 7545928a16..48c31c6408 100644 --- a/src/writer/hlsl/generator_impl_return_test.cc +++ b/src/writer/hlsl/generator_impl_return_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "src/ast/identifier_expression.h" -#include "src/ast/return_statement.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_sanitizer_test.cc b/src/writer/hlsl/generator_impl_sanitizer_test.cc index be4e677793..d10d599e69 100644 --- a/src/writer/hlsl/generator_impl_sanitizer_test.cc +++ b/src/writer/hlsl/generator_impl_sanitizer_test.cc @@ -12,14 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "src/ast/identifier_expression.h" #include "src/ast/stage_decoration.h" -#include "src/ast/unary_op_expression.h" #include "src/ast/variable_decl_statement.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_switch_test.cc b/src/writer/hlsl/generator_impl_switch_test.cc index 8106f85e93..ba86e7459b 100644 --- a/src/writer/hlsl/generator_impl_switch_test.cc +++ b/src/writer/hlsl/generator_impl_switch_test.cc @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/break_statement.h" -#include "src/ast/case_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/switch_statement.h" -#include "src/program.h" -#include "src/type/i32_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_test.cc b/src/writer/hlsl/generator_impl_test.cc index 0231793a2a..577d40ebf7 100644 --- a/src/writer/hlsl/generator_impl_test.cc +++ b/src/writer/hlsl/generator_impl_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/ast/function.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" -#include "src/type/void_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_type_test.cc b/src/writer/hlsl/generator_impl_type_test.cc index aa016366d6..bcb58e237c 100644 --- a/src/writer/hlsl/generator_impl_type_test.cc +++ b/src/writer/hlsl/generator_impl_type_test.cc @@ -12,29 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/program.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" #include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_unary_op_test.cc b/src/writer/hlsl/generator_impl_unary_op_test.cc index 86704d2917..2a393d392f 100644 --- a/src/writer/hlsl/generator_impl_unary_op_test.cc +++ b/src/writer/hlsl/generator_impl_unary_op_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "src/ast/identifier_expression.h" -#include "src/ast/unary_op_expression.h" -#include "src/program.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/generator_impl_variable_decl_statement_test.cc b/src/writer/hlsl/generator_impl_variable_decl_statement_test.cc index 20ec539104..8ffce85ce1 100644 --- a/src/writer/hlsl/generator_impl_variable_decl_statement_test.cc +++ b/src/writer/hlsl/generator_impl_variable_decl_statement_test.cc @@ -12,17 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "src/ast/identifier_expression.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/program.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/vector_type.h" #include "src/writer/hlsl/test_helper.h" namespace tint { diff --git a/src/writer/hlsl/test_helper.h b/src/writer/hlsl/test_helper.h index 1d2db746ca..3d07994101 100644 --- a/src/writer/hlsl/test_helper.h +++ b/src/writer/hlsl/test_helper.h @@ -16,13 +16,10 @@ #define SRC_WRITER_HLSL_TEST_HELPER_H_ #include -#include #include #include #include "gtest/gtest.h" -#include "src/diagnostic/formatter.h" -#include "src/program_builder.h" #include "src/transform/hlsl.h" #include "src/writer/hlsl/generator_impl.h" diff --git a/src/writer/msl/generator.cc b/src/writer/msl/generator.cc index 66b609bf9e..9fc915947c 100644 --- a/src/writer/msl/generator.cc +++ b/src/writer/msl/generator.cc @@ -14,8 +14,6 @@ #include "src/writer/msl/generator.h" -#include - namespace tint { namespace writer { namespace msl { diff --git a/src/writer/msl/generator.h b/src/writer/msl/generator.h index a677958b6f..1a3cb141a9 100644 --- a/src/writer/msl/generator.h +++ b/src/writer/msl/generator.h @@ -18,7 +18,6 @@ #include #include -#include "src/program.h" #include "src/writer/msl/generator_impl.h" #include "src/writer/text.h" diff --git a/src/writer/msl/generator_impl.cc b/src/writer/msl/generator_impl.cc index f2beb98e73..309cccb013 100644 --- a/src/writer/msl/generator_impl.cc +++ b/src/writer/msl/generator_impl.cc @@ -15,44 +15,20 @@ #include "src/writer/msl/generator_impl.h" #include -#include #include #include -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/block_statement.h" #include "src/ast/bool_literal.h" -#include "src/ast/break_statement.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/continue_statement.h" -#include "src/ast/else_statement.h" #include "src/ast/fallthrough_statement.h" #include "src/ast/float_literal.h" -#include "src/ast/function.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/location_decoration.h" -#include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" #include "src/ast/module.h" -#include "src/ast/return_statement.h" #include "src/ast/sint_literal.h" #include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/switch_statement.h" #include "src/ast/uint_literal.h" -#include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/debug.h" -#include "src/program.h" #include "src/semantic/call.h" -#include "src/semantic/expression.h" #include "src/semantic/function.h" #include "src/semantic/member_accessor_expression.h" #include "src/semantic/variable.h" @@ -67,9 +43,7 @@ #include "src/type/multisampled_texture_type.h" #include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" #include "src/type/u32_type.h" #include "src/type/vector_type.h" #include "src/type/void_type.h" diff --git a/src/writer/msl/generator_impl.h b/src/writer/msl/generator_impl.h index 5cbc30faa7..07c90e9b70 100644 --- a/src/writer/msl/generator_impl.h +++ b/src/writer/msl/generator_impl.h @@ -15,7 +15,6 @@ #ifndef SRC_WRITER_MSL_GENERATOR_IMPL_H_ #define SRC_WRITER_MSL_GENERATOR_IMPL_H_ -#include #include #include @@ -24,14 +23,9 @@ #include "src/ast/binary_expression.h" #include "src/ast/bitcast_expression.h" #include "src/ast/break_statement.h" -#include "src/ast/call_expression.h" -#include "src/ast/case_statement.h" #include "src/ast/continue_statement.h" #include "src/ast/discard_statement.h" -#include "src/ast/else_statement.h" -#include "src/ast/identifier_expression.h" #include "src/ast/if_statement.h" -#include "src/ast/literal.h" #include "src/ast/loop_statement.h" #include "src/ast/member_accessor_expression.h" #include "src/ast/return_statement.h" @@ -41,7 +35,6 @@ #include "src/ast/unary_op_expression.h" #include "src/program.h" #include "src/scope_stack.h" -#include "src/semantic/intrinsic.h" #include "src/type/struct_type.h" #include "src/writer/text_generator.h" diff --git a/src/writer/msl/generator_impl_alias_type_test.cc b/src/writer/msl/generator_impl_alias_type_test.cc index 06ad36c0f1..b66fbb7b78 100644 --- a/src/writer/msl/generator_impl_alias_type_test.cc +++ b/src/writer/msl/generator_impl_alias_type_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" -#include "src/program.h" -#include "src/type/struct_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_array_accessor_test.cc b/src/writer/msl/generator_impl_array_accessor_test.cc index 3ce8bb591b..8709f14587 100644 --- a/src/writer/msl/generator_impl_array_accessor_test.cc +++ b/src/writer/msl/generator_impl_array_accessor_test.cc @@ -12,16 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/program.h" -#include "src/type/i32_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_assign_test.cc b/src/writer/msl/generator_impl_assign_test.cc index a730acdbd0..cbe04fcc5c 100644 --- a/src/writer/msl/generator_impl_assign_test.cc +++ b/src/writer/msl/generator_impl_assign_test.cc @@ -12,14 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_binary_test.cc b/src/writer/msl/generator_impl_binary_test.cc index 75fb8ea6f1..9a3394e37d 100644 --- a/src/writer/msl/generator_impl_binary_test.cc +++ b/src/writer/msl/generator_impl_binary_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_bitcast_test.cc b/src/writer/msl/generator_impl_bitcast_test.cc index 91a1ce28f8..d5a74d5514 100644 --- a/src/writer/msl/generator_impl_bitcast_test.cc +++ b/src/writer/msl/generator_impl_bitcast_test.cc @@ -12,14 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" -#include "src/type/f32_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_block_test.cc b/src/writer/msl/generator_impl_block_test.cc index c459ff04e4..934611e92b 100644 --- a/src/writer/msl/generator_impl_block_test.cc +++ b/src/writer/msl/generator_impl_block_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/block_statement.h" -#include "src/ast/discard_statement.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_break_test.cc b/src/writer/msl/generator_impl_break_test.cc index e8047caac7..4db35c3e6f 100644 --- a/src/writer/msl/generator_impl_break_test.cc +++ b/src/writer/msl/generator_impl_break_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/break_statement.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_call_test.cc b/src/writer/msl/generator_impl_call_test.cc index 8a70461913..34a313d75f 100644 --- a/src/writer/msl/generator_impl_call_test.cc +++ b/src/writer/msl/generator_impl_call_test.cc @@ -12,16 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/function.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" -#include "src/type/void_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_case_test.cc b/src/writer/msl/generator_impl_case_test.cc index 38b7993fdf..3349a34de6 100644 --- a/src/writer/msl/generator_impl_case_test.cc +++ b/src/writer/msl/generator_impl_case_test.cc @@ -12,17 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/break_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/sint_literal.h" -#include "src/program.h" -#include "src/type/i32_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_cast_test.cc b/src/writer/msl/generator_impl_cast_test.cc index f22ecbdd52..ebb1bd77d8 100644 --- a/src/writer/msl/generator_impl_cast_test.cc +++ b/src/writer/msl/generator_impl_cast_test.cc @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/type_constructor_expression.h" -#include "src/program.h" -#include "src/type/f32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_constructor_test.cc b/src/writer/msl/generator_impl_constructor_test.cc index 3c9952c942..8a73c1ca31 100644 --- a/src/writer/msl/generator_impl_constructor_test.cc +++ b/src/writer/msl/generator_impl_constructor_test.cc @@ -12,22 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/program.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_continue_test.cc b/src/writer/msl/generator_impl_continue_test.cc index 45b42ef7ec..4f9f50fa01 100644 --- a/src/writer/msl/generator_impl_continue_test.cc +++ b/src/writer/msl/generator_impl_continue_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/continue_statement.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_discard_test.cc b/src/writer/msl/generator_impl_discard_test.cc index e6249143d7..a3bb7559b6 100644 --- a/src/writer/msl/generator_impl_discard_test.cc +++ b/src/writer/msl/generator_impl_discard_test.cc @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/discard_statement.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_function_entry_point_data_test.cc b/src/writer/msl/generator_impl_function_entry_point_data_test.cc index d78868b673..4f9ac96fa3 100644 --- a/src/writer/msl/generator_impl_function_entry_point_data_test.cc +++ b/src/writer/msl/generator_impl_function_entry_point_data_test.cc @@ -12,22 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/location_decoration.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/pipeline_stage.h" #include "src/ast/stage_decoration.h" -#include "src/ast/variable.h" -#include "src/program.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_function_test.cc b/src/writer/msl/generator_impl_function_test.cc index f30f4dbda7..d117e1d001 100644 --- a/src/writer/msl/generator_impl_function_test.cc +++ b/src/writer/msl/generator_impl_function_test.cc @@ -12,39 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/call_expression.h" -#include "src/ast/float_literal.h" -#include "src/ast/function.h" -#include "src/ast/group_decoration.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/location_decoration.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/pipeline_stage.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/program.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_identifier_test.cc b/src/writer/msl/generator_impl_identifier_test.cc index a4b1897caa..b02bf1b701 100644 --- a/src/writer/msl/generator_impl_identifier_test.cc +++ b/src/writer/msl/generator_impl_identifier_test.cc @@ -12,10 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_if_test.cc b/src/writer/msl/generator_impl_if_test.cc index ec8771c3ef..c4c6ff4059 100644 --- a/src/writer/msl/generator_impl_if_test.cc +++ b/src/writer/msl/generator_impl_if_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/else_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/return_statement.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_import_test.cc b/src/writer/msl/generator_impl_import_test.cc index d0c9784305..6841432224 100644 --- a/src/writer/msl/generator_impl_import_test.cc +++ b/src/writer/msl/generator_impl_import_test.cc @@ -12,24 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/call_expression.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/type_constructor_expression.h" -#include "src/program.h" #include "src/semantic/call.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/vector_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_intrinsic_test.cc b/src/writer/msl/generator_impl_intrinsic_test.cc index 3960fa8ae9..3bdfe3ba9b 100644 --- a/src/writer/msl/generator_impl_intrinsic_test.cc +++ b/src/writer/msl/generator_impl_intrinsic_test.cc @@ -12,16 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/call_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/program.h" #include "src/semantic/call.h" -#include "src/type/f32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_intrinsic_texture_test.cc b/src/writer/msl/generator_impl_intrinsic_texture_test.cc index 767ec7cc04..a2f92011fe 100644 --- a/src/writer/msl/generator_impl_intrinsic_texture_test.cc +++ b/src/writer/msl/generator_impl_intrinsic_texture_test.cc @@ -12,14 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" #include "src/ast/intrinsic_texture_helper_test.h" -#include "src/type/depth_texture_type.h" -#include "src/type/multisampled_texture_type.h" -#include "src/type/sampled_texture_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_loop_test.cc b/src/writer/msl/generator_impl_loop_test.cc index b21c1def55..da4e36d4e2 100644 --- a/src/writer/msl/generator_impl_loop_test.cc +++ b/src/writer/msl/generator_impl_loop_test.cc @@ -12,20 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/discard_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/loop_statement.h" -#include "src/ast/return_statement.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/program.h" -#include "src/type/f32_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_member_accessor_test.cc b/src/writer/msl/generator_impl_member_accessor_test.cc index d712c75265..4f97d59b01 100644 --- a/src/writer/msl/generator_impl_member_accessor_test.cc +++ b/src/writer/msl/generator_impl_member_accessor_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_module_constant_test.cc b/src/writer/msl/generator_impl_module_constant_test.cc index c59527bb11..d7873b2984 100644 --- a/src/writer/msl/generator_impl_module_constant_test.cc +++ b/src/writer/msl/generator_impl_module_constant_test.cc @@ -12,19 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/float_literal.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable.h" -#include "src/program.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_return_test.cc b/src/writer/msl/generator_impl_return_test.cc index 342600c5cf..90896bfdce 100644 --- a/src/writer/msl/generator_impl_return_test.cc +++ b/src/writer/msl/generator_impl_return_test.cc @@ -12,14 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/return_statement.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_switch_test.cc b/src/writer/msl/generator_impl_switch_test.cc index 42f4a8b843..b35a6dfc4b 100644 --- a/src/writer/msl/generator_impl_switch_test.cc +++ b/src/writer/msl/generator_impl_switch_test.cc @@ -12,17 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/break_statement.h" -#include "src/ast/case_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/switch_statement.h" -#include "src/program.h" -#include "src/type/i32_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_test.cc b/src/writer/msl/generator_impl_test.cc index 523ecf36f7..ffe023c222 100644 --- a/src/writer/msl/generator_impl_test.cc +++ b/src/writer/msl/generator_impl_test.cc @@ -12,31 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/writer/msl/generator_impl.h" - -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/function.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/pipeline_stage.h" #include "src/ast/stage_decoration.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/program.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_type_test.cc b/src/writer/msl/generator_impl_type_test.cc index 7aacb37412..51bafce395 100644 --- a/src/writer/msl/generator_impl_type_test.cc +++ b/src/writer/msl/generator_impl_type_test.cc @@ -12,31 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/program.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" #include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_unary_op_test.cc b/src/writer/msl/generator_impl_unary_op_test.cc index 40e4aa9901..56fd091994 100644 --- a/src/writer/msl/generator_impl_unary_op_test.cc +++ b/src/writer/msl/generator_impl_unary_op_test.cc @@ -12,14 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/unary_op_expression.h" -#include "src/program.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/generator_impl_variable_decl_statement_test.cc b/src/writer/msl/generator_impl_variable_decl_statement_test.cc index 22d202bd49..24e2ed2a59 100644 --- a/src/writer/msl/generator_impl_variable_decl_statement_test.cc +++ b/src/writer/msl/generator_impl_variable_decl_statement_test.cc @@ -12,25 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/struct.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/program.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/struct_type.h" -#include "src/type/vector_type.h" -#include "src/writer/msl/generator_impl.h" #include "src/writer/msl/test_helper.h" namespace tint { diff --git a/src/writer/msl/test_helper.h b/src/writer/msl/test_helper.h index c0024d4224..4241036265 100644 --- a/src/writer/msl/test_helper.h +++ b/src/writer/msl/test_helper.h @@ -19,8 +19,6 @@ #include #include "gtest/gtest.h" -#include "src/ast/module.h" -#include "src/diagnostic/formatter.h" #include "src/program_builder.h" #include "src/writer/msl/generator_impl.h" diff --git a/src/writer/spirv/binary_writer_test.cc b/src/writer/spirv/binary_writer_test.cc index b69c72a485..392fae78c5 100644 --- a/src/writer/spirv/binary_writer_test.cc +++ b/src/writer/spirv/binary_writer_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/writer/spirv/binary_writer.h" - -#include - -#include "gtest/gtest.h" -#include "spirv/unified1/spirv.hpp11" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/test_helper.h" namespace tint { diff --git a/src/writer/spirv/builder.cc b/src/writer/spirv/builder.cc index 0d673f7d43..b6dac625b6 100644 --- a/src/writer/spirv/builder.cc +++ b/src/writer/spirv/builder.cc @@ -14,73 +14,20 @@ #include "src/writer/spirv/builder.h" #include -#include #include -#include #include #include "spirv/unified1/GLSL.std.450.h" -#include "spirv/unified1/spirv.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/block_statement.h" -#include "src/ast/bool_literal.h" -#include "src/ast/builtin_decoration.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/constructor_expression.h" -#include "src/ast/else_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/group_decoration.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/location_decoration.h" -#include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/module.h" #include "src/ast/null_literal.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" -#include "src/debug.h" -#include "src/program.h" #include "src/semantic/call.h" -#include "src/semantic/expression.h" #include "src/semantic/function.h" -#include "src/semantic/intrinsic.h" #include "src/semantic/variable.h" -#include "src/type/access_control_type.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" #include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" #include "src/writer/append_vector.h" namespace tint { diff --git a/src/writer/spirv/builder.h b/src/writer/spirv/builder.h index bba8bd5c2e..90ddf88c37 100644 --- a/src/writer/spirv/builder.h +++ b/src/writer/spirv/builder.h @@ -15,46 +15,28 @@ #ifndef SRC_WRITER_SPIRV_BUILDER_H_ #define SRC_WRITER_SPIRV_BUILDER_H_ -#include #include #include #include #include #include "spirv/unified1/spirv.h" -#include "src/ast/array_accessor_expression.h" #include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" #include "src/ast/bitcast_expression.h" #include "src/ast/break_statement.h" -#include "src/ast/builtin.h" -#include "src/ast/call_expression.h" #include "src/ast/continue_statement.h" #include "src/ast/discard_statement.h" -#include "src/ast/else_statement.h" -#include "src/ast/identifier_expression.h" #include "src/ast/if_statement.h" -#include "src/ast/literal.h" #include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" #include "src/ast/return_statement.h" -#include "src/ast/struct_member.h" #include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" #include "src/ast/unary_op_expression.h" #include "src/ast/variable_decl_statement.h" #include "src/program_builder.h" #include "src/scope_stack.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/matrix_type.h" -#include "src/type/pointer_type.h" #include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/type_manager.h" -#include "src/type/vector_type.h" #include "src/writer/spirv/function.h" -#include "src/writer/spirv/instruction.h" namespace tint { diff --git a/src/writer/spirv/builder_accessor_expression_test.cc b/src/writer/spirv/builder_accessor_expression_test.cc index 6081637348..eaa79d8365 100644 --- a/src/writer/spirv/builder_accessor_expression_test.cc +++ b/src/writer/spirv/builder_accessor_expression_test.cc @@ -12,28 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/ast/variable.h" -#include "src/program.h" -#include "src/type/array_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_assign_test.cc b/src/writer/spirv/builder_assign_test.cc index 016e082e7d..805a96fdf6 100644 --- a/src/writer/spirv/builder_assign_test.cc +++ b/src/writer/spirv/builder_assign_test.cc @@ -12,24 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gmock/gmock.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" -#include "src/ast/type_constructor_expression.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" -#include "src/type/vector_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_binary_expression_test.cc b/src/writer/spirv/builder_binary_expression_test.cc index f5e0afc49d..6a44c9a0c1 100644 --- a/src/writer/spirv/builder_binary_expression_test.cc +++ b/src/writer/spirv/builder_binary_expression_test.cc @@ -12,24 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_bitcast_expression_test.cc b/src/writer/spirv/builder_bitcast_expression_test.cc index a8e5423390..a692932ecc 100644 --- a/src/writer/spirv/builder_bitcast_expression_test.cc +++ b/src/writer/spirv/builder_bitcast_expression_test.cc @@ -12,14 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/float_literal.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/program.h" -#include "src/type/f32_type.h" -#include "src/type/u32_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_block_test.cc b/src/writer/spirv/builder_block_test.cc index 04347b78f5..54f3e0a422 100644 --- a/src/writer/spirv/builder_block_test.cc +++ b/src/writer/spirv/builder_block_test.cc @@ -12,17 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/block_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/variable_decl_statement.h" -#include "src/type/f32_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_call_test.cc b/src/writer/spirv/builder_call_test.cc index eba20c6f58..0d384b6669 100644 --- a/src/writer/spirv/builder_call_test.cc +++ b/src/writer/spirv/builder_call_test.cc @@ -13,21 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/void_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_constructor_expression_test.cc b/src/writer/spirv/builder_constructor_expression_test.cc index d2a14ef2c1..d1272bf82d 100644 --- a/src/writer/spirv/builder_constructor_expression_test.cc +++ b/src/writer/spirv/builder_constructor_expression_test.cc @@ -12,32 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gmock/gmock.h" -#include "spirv/unified1/spirv.h" -#include "spirv/unified1/spirv.hpp11" -#include "src/ast/binary_expression.h" -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/struct.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_discard_test.cc b/src/writer/spirv/builder_discard_test.cc index 67abbe7cac..938a130e3a 100644 --- a/src/writer/spirv/builder_discard_test.cc +++ b/src/writer/spirv/builder_discard_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/discard_statement.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_format_conversion_test.cc b/src/writer/spirv/builder_format_conversion_test.cc index 0ad7697913..c5f3994600 100644 --- a/src/writer/spirv/builder_format_conversion_test.cc +++ b/src/writer/spirv/builder_format_conversion_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_function_decoration_test.cc b/src/writer/spirv/builder_function_decoration_test.cc index a64dc692cc..12afe063ca 100644 --- a/src/writer/spirv/builder_function_decoration_test.cc +++ b/src/writer/spirv/builder_function_decoration_test.cc @@ -12,20 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "spirv/unified1/spirv.h" -#include "spirv/unified1/spirv.hpp11" -#include "src/ast/assignment_statement.h" -#include "src/ast/function.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/pipeline_stage.h" #include "src/ast/stage_decoration.h" -#include "src/ast/variable.h" #include "src/ast/workgroup_decoration.h" -#include "src/semantic/function.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_function_test.cc b/src/writer/spirv/builder_function_test.cc index 003298a406..785ca0c384 100644 --- a/src/writer/spirv/builder_function_test.cc +++ b/src/writer/spirv/builder_function_test.cc @@ -12,28 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "spirv/unified1/spirv.h" -#include "spirv/unified1/spirv.hpp11" -#include "src/ast/discard_statement.h" -#include "src/ast/function.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/return_statement.h" #include "src/ast/stage_decoration.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decl_statement.h" -#include "src/type/access_control_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" -#include "src/type/void_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_function_variable_test.cc b/src/writer/spirv/builder_function_variable_test.cc index d7978821b0..fc9cd26291 100644 --- a/src/writer/spirv/builder_function_variable_test.cc +++ b/src/writer/spirv/builder_function_variable_test.cc @@ -12,27 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/builtin.h" -#include "src/ast/builtin_decoration.h" -#include "src/ast/float_literal.h" -#include "src/ast/group_decoration.h" -#include "src/ast/location_decoration.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/storage_class.h" -#include "src/ast/struct.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decoration.h" -#include "src/type/access_control_type.h" -#include "src/type/f32_type.h" -#include "src/type/struct_type.h" -#include "src/type/vector_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_global_variable_test.cc b/src/writer/spirv/builder_global_variable_test.cc index 07dd913c17..de729c7323 100644 --- a/src/writer/spirv/builder_global_variable_test.cc +++ b/src/writer/spirv/builder_global_variable_test.cc @@ -12,33 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/bool_literal.h" -#include "src/ast/builtin.h" -#include "src/ast/builtin_decoration.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/float_literal.h" -#include "src/ast/group_decoration.h" -#include "src/ast/location_decoration.h" -#include "src/ast/scalar_constructor_expression.h" #include "src/ast/stage_decoration.h" -#include "src/ast/storage_class.h" -#include "src/ast/struct.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decoration.h" -#include "src/program.h" -#include "src/type/access_control_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_ident_expression_test.cc b/src/writer/spirv/builder_ident_expression_test.cc index 4938f76f54..bacfd582a8 100644 --- a/src/writer/spirv/builder_ident_expression_test.cc +++ b/src/writer/spirv/builder_ident_expression_test.cc @@ -12,20 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/variable.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_if_test.cc b/src/writer/spirv/builder_if_test.cc index dec8097ba4..6918e8670b 100644 --- a/src/writer/spirv/builder_if_test.cc +++ b/src/writer/spirv/builder_if_test.cc @@ -12,23 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gmock/gmock.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/bool_literal.h" -#include "src/ast/break_statement.h" -#include "src/ast/continue_statement.h" -#include "src/ast/else_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/loop_statement.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/type/bool_type.h" -#include "src/type/i32_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_intrinsic_test.cc b/src/writer/spirv/builder_intrinsic_test.cc index c52c3e991a..e99fe17a6d 100644 --- a/src/writer/spirv/builder_intrinsic_test.cc +++ b/src/writer/spirv/builder_intrinsic_test.cc @@ -12,39 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/intrinsic_texture_helper_test.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/type_constructor_expression.h" -#include "src/ast/uint_literal.h" -#include "src/ast/variable.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" -#include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_intrinsic_texture_test.cc b/src/writer/spirv/builder_intrinsic_texture_test.cc index f569ea3279..5c7f25d6ca 100644 --- a/src/writer/spirv/builder_intrinsic_texture_test.cc +++ b/src/writer/spirv/builder_intrinsic_texture_test.cc @@ -12,17 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "gmock/gmock.h" #include "src/ast/call_statement.h" #include "src/ast/intrinsic_texture_helper_test.h" #include "src/ast/stage_decoration.h" -#include "src/type/depth_texture_type.h" -#include "src/type/multisampled_texture_type.h" -#include "src/type/sampled_texture_type.h" -#include "src/type/storage_texture_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_literal_test.cc b/src/writer/spirv/builder_literal_test.cc index 8dc2c1dd89..dfe2047edd 100644 --- a/src/writer/spirv/builder_literal_test.cc +++ b/src/writer/spirv/builder_literal_test.cc @@ -12,18 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "spirv/unified1/spirv.h" -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/literal.h" -#include "src/ast/sint_literal.h" -#include "src/ast/uint_literal.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/u32_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_loop_test.cc b/src/writer/spirv/builder_loop_test.cc index 662b4498e2..3d96f2b55f 100644 --- a/src/writer/spirv/builder_loop_test.cc +++ b/src/writer/spirv/builder_loop_test.cc @@ -12,18 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/break_statement.h" -#include "src/ast/continue_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/loop_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/type/i32_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_return_test.cc b/src/writer/spirv/builder_return_test.cc index e4fd93d991..17265b8195 100644 --- a/src/writer/spirv/builder_return_test.cc +++ b/src/writer/spirv/builder_return_test.cc @@ -12,17 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/type_constructor_expression.h" -#include "src/type/f32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_switch_test.cc b/src/writer/spirv/builder_switch_test.cc index 67afa1b238..ba103ead9d 100644 --- a/src/writer/spirv/builder_switch_test.cc +++ b/src/writer/spirv/builder_switch_test.cc @@ -12,22 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/bool_literal.h" -#include "src/ast/break_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/switch_statement.h" -#include "src/type/bool_type.h" -#include "src/type/i32_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_test.cc b/src/writer/spirv/builder_test.cc index 3498566515..20f23b489b 100644 --- a/src/writer/spirv/builder_test.cc +++ b/src/writer/spirv/builder_test.cc @@ -12,14 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/writer/spirv/builder.h" - -#include - -#include "gtest/gtest.h" -#include "spirv/unified1/spirv.h" -#include "spirv/unified1/spirv.hpp11" -#include "src/program.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_type_test.cc b/src/writer/spirv/builder_type_test.cc index 06f534e57a..51dc2eb22c 100644 --- a/src/writer/spirv/builder_type_test.cc +++ b/src/writer/spirv/builder_type_test.cc @@ -12,34 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/stride_decoration.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/type/access_control_type.h" -#include "src/type/alias_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" #include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/texture_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/builder_unary_op_expression_test.cc b/src/writer/spirv/builder_unary_op_expression_test.cc index 8a6366ae92..18f930626d 100644 --- a/src/writer/spirv/builder_unary_op_expression_test.cc +++ b/src/writer/spirv/builder_unary_op_expression_test.cc @@ -12,20 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/unary_op_expression.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/spirv/builder.h" #include "src/writer/spirv/spv_dump.h" #include "src/writer/spirv/test_helper.h" diff --git a/src/writer/spirv/function.h b/src/writer/spirv/function.h index 8421452be8..926f33f312 100644 --- a/src/writer/spirv/function.h +++ b/src/writer/spirv/function.h @@ -16,11 +16,8 @@ #define SRC_WRITER_SPIRV_FUNCTION_H_ #include -#include -#include "spirv/unified1/spirv.hpp11" #include "src/writer/spirv/instruction.h" -#include "src/writer/spirv/operand.h" namespace tint { namespace writer { diff --git a/src/writer/spirv/generator.cc b/src/writer/spirv/generator.cc index 4163e57101..55ef8c375d 100644 --- a/src/writer/spirv/generator.cc +++ b/src/writer/spirv/generator.cc @@ -14,8 +14,6 @@ #include "src/writer/spirv/generator.h" -#include - namespace tint { namespace writer { namespace spirv { diff --git a/src/writer/spirv/generator.h b/src/writer/spirv/generator.h index c85fe4f749..284cf54228 100644 --- a/src/writer/spirv/generator.h +++ b/src/writer/spirv/generator.h @@ -19,9 +19,7 @@ #include #include -#include "src/program.h" #include "src/writer/spirv/binary_writer.h" -#include "src/writer/spirv/builder.h" #include "src/writer/writer.h" namespace tint { diff --git a/src/writer/spirv/instruction_test.cc b/src/writer/spirv/instruction_test.cc index b512470723..d9d9946a8d 100644 --- a/src/writer/spirv/instruction_test.cc +++ b/src/writer/spirv/instruction_test.cc @@ -15,7 +15,6 @@ #include "src/writer/spirv/instruction.h" #include "gtest/gtest.h" -#include "src/writer/spirv/operand.h" namespace tint { namespace writer { diff --git a/src/writer/spirv/operand.cc b/src/writer/spirv/operand.cc index 6aa7beaa68..36f4c23775 100644 --- a/src/writer/spirv/operand.cc +++ b/src/writer/spirv/operand.cc @@ -14,8 +14,6 @@ #include "src/writer/spirv/operand.h" -#include - namespace tint { namespace writer { namespace spirv { diff --git a/src/writer/spirv/spv_dump.h b/src/writer/spirv/spv_dump.h index 3513290bd6..1187d1af6a 100644 --- a/src/writer/spirv/spv_dump.h +++ b/src/writer/spirv/spv_dump.h @@ -19,7 +19,6 @@ #include #include "src/writer/spirv/builder.h" -#include "src/writer/spirv/instruction.h" namespace tint { namespace writer { diff --git a/src/writer/spirv/test_helper.h b/src/writer/spirv/test_helper.h index 0151016014..0fe99e7aaa 100644 --- a/src/writer/spirv/test_helper.h +++ b/src/writer/spirv/test_helper.h @@ -21,12 +21,8 @@ #include "gtest/gtest.h" #include "spirv-tools/libspirv.hpp" -#include "src/ast/module.h" -#include "src/diagnostic/formatter.h" -#include "src/program_builder.h" #include "src/transform/spirv.h" #include "src/writer/spirv/binary_writer.h" -#include "src/writer/spirv/builder.h" namespace tint { namespace writer { diff --git a/src/writer/text.cc b/src/writer/text.cc index 28fcd9d2e2..3853e27295 100644 --- a/src/writer/text.cc +++ b/src/writer/text.cc @@ -14,8 +14,6 @@ #include "src/writer/text.h" -#include - namespace tint { namespace writer { diff --git a/src/writer/text_generator.cc b/src/writer/text_generator.cc index bfd13fc7e5..2a26d13222 100644 --- a/src/writer/text_generator.cc +++ b/src/writer/text_generator.cc @@ -14,10 +14,6 @@ #include "src/writer/text_generator.h" -#include - -#include - namespace tint { namespace writer { diff --git a/src/writer/wgsl/generator.cc b/src/writer/wgsl/generator.cc index 90ef18e370..c063bc25f0 100644 --- a/src/writer/wgsl/generator.cc +++ b/src/writer/wgsl/generator.cc @@ -14,8 +14,6 @@ #include "src/writer/wgsl/generator.h" -#include - namespace tint { namespace writer { namespace wgsl { diff --git a/src/writer/wgsl/generator.h b/src/writer/wgsl/generator.h index 1c83faf275..af2b03a72b 100644 --- a/src/writer/wgsl/generator.h +++ b/src/writer/wgsl/generator.h @@ -18,7 +18,6 @@ #include #include -#include "src/program.h" #include "src/writer/text.h" #include "src/writer/wgsl/generator_impl.h" diff --git a/src/writer/wgsl/generator_impl.cc b/src/writer/wgsl/generator_impl.cc index bde480b796..dbe65f3c71 100644 --- a/src/writer/wgsl/generator_impl.cc +++ b/src/writer/wgsl/generator_impl.cc @@ -15,51 +15,19 @@ #include "src/writer/wgsl/generator_impl.h" #include -#include -#include -#include "src/ast/array_accessor_expression.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/binary_expression.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/block_statement.h" #include "src/ast/bool_literal.h" -#include "src/ast/break_statement.h" -#include "src/ast/builtin_decoration.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/case_statement.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/constructor_expression.h" -#include "src/ast/continue_statement.h" -#include "src/ast/else_statement.h" #include "src/ast/float_literal.h" -#include "src/ast/group_decoration.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/ast/location_decoration.h" -#include "src/ast/loop_statement.h" -#include "src/ast/member_accessor_expression.h" #include "src/ast/module.h" -#include "src/ast/return_statement.h" -#include "src/ast/scalar_constructor_expression.h" #include "src/ast/sint_literal.h" #include "src/ast/stage_decoration.h" -#include "src/ast/statement.h" #include "src/ast/stride_decoration.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" #include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/switch_statement.h" -#include "src/ast/type_constructor_expression.h" #include "src/ast/uint_literal.h" -#include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" #include "src/ast/workgroup_decoration.h" -#include "src/debug.h" -#include "src/program.h" #include "src/semantic/function.h" #include "src/semantic/variable.h" #include "src/type/access_control_type.h" @@ -73,9 +41,6 @@ #include "src/type/multisampled_texture_type.h" #include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" #include "src/type/u32_type.h" #include "src/type/vector_type.h" #include "src/type/void_type.h" diff --git a/src/writer/wgsl/generator_impl.h b/src/writer/wgsl/generator_impl.h index 25a84fbe88..a584f0f357 100644 --- a/src/writer/wgsl/generator_impl.h +++ b/src/writer/wgsl/generator_impl.h @@ -15,7 +15,6 @@ #ifndef SRC_WRITER_WGSL_GENERATOR_IMPL_H_ #define SRC_WRITER_WGSL_GENERATOR_IMPL_H_ -#include #include #include "src/ast/array_accessor_expression.h" @@ -23,13 +22,9 @@ #include "src/ast/binary_expression.h" #include "src/ast/bitcast_expression.h" #include "src/ast/break_statement.h" -#include "src/ast/call_expression.h" -#include "src/ast/case_statement.h" -#include "src/ast/constructor_expression.h" #include "src/ast/continue_statement.h" #include "src/ast/discard_statement.h" #include "src/ast/fallthrough_statement.h" -#include "src/ast/identifier_expression.h" #include "src/ast/if_statement.h" #include "src/ast/loop_statement.h" #include "src/ast/member_accessor_expression.h" @@ -38,12 +33,9 @@ #include "src/ast/switch_statement.h" #include "src/ast/type_constructor_expression.h" #include "src/ast/unary_op_expression.h" -#include "src/ast/variable.h" -#include "src/diagnostic/diagnostic.h" #include "src/program.h" #include "src/type/storage_texture_type.h" #include "src/type/struct_type.h" -#include "src/type/type.h" #include "src/writer/text_generator.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_alias_type_test.cc b/src/writer/wgsl/generator_impl_alias_type_test.cc index 61c23ea9b7..01fb28852f 100644 --- a/src/writer/wgsl/generator_impl_alias_type_test.cc +++ b/src/writer/wgsl/generator_impl_alias_type_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/struct.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/type/struct_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_array_accessor_test.cc b/src/writer/wgsl/generator_impl_array_accessor_test.cc index 1aab325a2a..e755d42876 100644 --- a/src/writer/wgsl/generator_impl_array_accessor_test.cc +++ b/src/writer/wgsl/generator_impl_array_accessor_test.cc @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/array_accessor_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/type/i32_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_assign_test.cc b/src/writer/wgsl/generator_impl_assign_test.cc index 524324e90b..7113b0303a 100644 --- a/src/writer/wgsl/generator_impl_assign_test.cc +++ b/src/writer/wgsl/generator_impl_assign_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_binary_test.cc b/src/writer/wgsl/generator_impl_binary_test.cc index e955f30d5e..02f3129a09 100644 --- a/src/writer/wgsl/generator_impl_binary_test.cc +++ b/src/writer/wgsl/generator_impl_binary_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/binary_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_bitcast_test.cc b/src/writer/wgsl/generator_impl_bitcast_test.cc index 8a0341c132..e2e2d2ca8d 100644 --- a/src/writer/wgsl/generator_impl_bitcast_test.cc +++ b/src/writer/wgsl/generator_impl_bitcast_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/bitcast_expression.h" -#include "src/ast/identifier_expression.h" -#include "src/type/f32_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_block_test.cc b/src/writer/wgsl/generator_impl_block_test.cc index 027136ce7a..a67fcd081d 100644 --- a/src/writer/wgsl/generator_impl_block_test.cc +++ b/src/writer/wgsl/generator_impl_block_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/block_statement.h" -#include "src/ast/discard_statement.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_break_test.cc b/src/writer/wgsl/generator_impl_break_test.cc index 375bfef3ec..cd754176d0 100644 --- a/src/writer/wgsl/generator_impl_break_test.cc +++ b/src/writer/wgsl/generator_impl_break_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/break_statement.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_call_test.cc b/src/writer/wgsl/generator_impl_call_test.cc index 1bf5db13f4..5c506892bd 100644 --- a/src/writer/wgsl/generator_impl_call_test.cc +++ b/src/writer/wgsl/generator_impl_call_test.cc @@ -12,13 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/call_expression.h" #include "src/ast/call_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_case_test.cc b/src/writer/wgsl/generator_impl_case_test.cc index e54a758fad..33d2208c6f 100644 --- a/src/writer/wgsl/generator_impl_case_test.cc +++ b/src/writer/wgsl/generator_impl_case_test.cc @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/break_statement.h" -#include "src/ast/case_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/sint_literal.h" -#include "src/type/i32_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_cast_test.cc b/src/writer/wgsl/generator_impl_cast_test.cc index b40e015ce3..cd62e5975e 100644 --- a/src/writer/wgsl/generator_impl_cast_test.cc +++ b/src/writer/wgsl/generator_impl_cast_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/type_constructor_expression.h" -#include "src/type/f32_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_constructor_test.cc b/src/writer/wgsl/generator_impl_constructor_test.cc index b6757121b2..56423c2bca 100644 --- a/src/writer/wgsl/generator_impl_constructor_test.cc +++ b/src/writer/wgsl/generator_impl_constructor_test.cc @@ -12,20 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/bool_literal.h" -#include "src/ast/float_literal.h" -#include "src/ast/scalar_constructor_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/uint_literal.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_continue_test.cc b/src/writer/wgsl/generator_impl_continue_test.cc index 13d82a40bd..b132faa637 100644 --- a/src/writer/wgsl/generator_impl_continue_test.cc +++ b/src/writer/wgsl/generator_impl_continue_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/continue_statement.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_discard_test.cc b/src/writer/wgsl/generator_impl_discard_test.cc index 5187358b73..270306106f 100644 --- a/src/writer/wgsl/generator_impl_discard_test.cc +++ b/src/writer/wgsl/generator_impl_discard_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/discard_statement.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_entry_point_test.cc b/src/writer/wgsl/generator_impl_entry_point_test.cc index 7f98d0e941..5415e6219e 100644 --- a/src/writer/wgsl/generator_impl_entry_point_test.cc +++ b/src/writer/wgsl/generator_impl_entry_point_test.cc @@ -12,14 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" #include "src/ast/call_statement.h" #include "src/ast/stage_decoration.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/type/f32_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_fallthrough_test.cc b/src/writer/wgsl/generator_impl_fallthrough_test.cc index 093cbb4b83..df2f464225 100644 --- a/src/writer/wgsl/generator_impl_fallthrough_test.cc +++ b/src/writer/wgsl/generator_impl_fallthrough_test.cc @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/fallthrough_statement.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_function_test.cc b/src/writer/wgsl/generator_impl_function_test.cc index 52fceb4b1a..7fd4574f31 100644 --- a/src/writer/wgsl/generator_impl_function_test.cc +++ b/src/writer/wgsl/generator_impl_function_test.cc @@ -12,24 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/discard_statement.h" -#include "src/ast/function.h" -#include "src/ast/member_accessor_expression.h" -#include "src/ast/pipeline_stage.h" -#include "src/ast/return_statement.h" #include "src/ast/stage_decoration.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" #include "src/ast/workgroup_decoration.h" -#include "src/program.h" #include "src/type/access_control_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/void_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_global_decl_test.cc b/src/writer/wgsl/generator_impl_global_decl_test.cc index 37030f510f..9c74d15667 100644 --- a/src/writer/wgsl/generator_impl_global_decl_test.cc +++ b/src/writer/wgsl/generator_impl_global_decl_test.cc @@ -12,14 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/assignment_statement.h" -#include "src/ast/call_statement.h" #include "src/ast/stage_decoration.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" -#include "src/type/f32_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_identifier_test.cc b/src/writer/wgsl/generator_impl_identifier_test.cc index b07c97a2b1..720d6de244 100644 --- a/src/writer/wgsl/generator_impl_identifier_test.cc +++ b/src/writer/wgsl/generator_impl_identifier_test.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_if_test.cc b/src/writer/wgsl/generator_impl_if_test.cc index 4f5ae0402c..fbbcdbb781 100644 --- a/src/writer/wgsl/generator_impl_if_test.cc +++ b/src/writer/wgsl/generator_impl_if_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/discard_statement.h" -#include "src/ast/else_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/if_statement.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_loop_test.cc b/src/writer/wgsl/generator_impl_loop_test.cc index d52550449a..768a63855f 100644 --- a/src/writer/wgsl/generator_impl_loop_test.cc +++ b/src/writer/wgsl/generator_impl_loop_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/discard_statement.h" -#include "src/ast/loop_statement.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_member_accessor_test.cc b/src/writer/wgsl/generator_impl_member_accessor_test.cc index 0a5e19fac1..16d4a89775 100644 --- a/src/writer/wgsl/generator_impl_member_accessor_test.cc +++ b/src/writer/wgsl/generator_impl_member_accessor_test.cc @@ -12,12 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/member_accessor_expression.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_return_test.cc b/src/writer/wgsl/generator_impl_return_test.cc index 69c21519b2..7ba7d594ee 100644 --- a/src/writer/wgsl/generator_impl_return_test.cc +++ b/src/writer/wgsl/generator_impl_return_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/return_statement.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_switch_test.cc b/src/writer/wgsl/generator_impl_switch_test.cc index 79e19a9387..9814c58ac2 100644 --- a/src/writer/wgsl/generator_impl_switch_test.cc +++ b/src/writer/wgsl/generator_impl_switch_test.cc @@ -12,16 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/break_statement.h" -#include "src/ast/case_statement.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/sint_literal.h" -#include "src/ast/switch_statement.h" -#include "src/type/i32_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_test.cc b/src/writer/wgsl/generator_impl_test.cc index c1d4c772b6..695ddc485a 100644 --- a/src/writer/wgsl/generator_impl_test.cc +++ b/src/writer/wgsl/generator_impl_test.cc @@ -12,16 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/writer/wgsl/generator_impl.h" - -#include - -#include "gtest/gtest.h" -#include "src/ast/function.h" -#include "src/ast/variable.h" -#include "src/program.h" #include "src/semantic/variable.h" -#include "src/type/void_type.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_type_test.cc b/src/writer/wgsl/generator_impl_type_test.cc index 1b6d59107d..8b1b49888b 100644 --- a/src/writer/wgsl/generator_impl_type_test.cc +++ b/src/writer/wgsl/generator_impl_type_test.cc @@ -12,32 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "gtest/gtest.h" -#include "src/ast/access_control.h" -#include "src/ast/stride_decoration.h" -#include "src/ast/struct.h" #include "src/ast/struct_block_decoration.h" -#include "src/ast/struct_decoration.h" -#include "src/ast/struct_member.h" -#include "src/ast/struct_member_decoration.h" -#include "src/ast/struct_member_offset_decoration.h" #include "src/type/access_control_type.h" -#include "src/type/array_type.h" -#include "src/type/bool_type.h" #include "src/type/depth_texture_type.h" -#include "src/type/f32_type.h" -#include "src/type/i32_type.h" -#include "src/type/matrix_type.h" #include "src/type/multisampled_texture_type.h" -#include "src/type/pointer_type.h" #include "src/type/sampled_texture_type.h" -#include "src/type/sampler_type.h" -#include "src/type/storage_texture_type.h" -#include "src/type/struct_type.h" -#include "src/type/u32_type.h" -#include "src/type/vector_type.h" -#include "src/type/void_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_unary_op_test.cc b/src/writer/wgsl/generator_impl_unary_op_test.cc index 8ff75a34b9..f4662829ab 100644 --- a/src/writer/wgsl/generator_impl_unary_op_test.cc +++ b/src/writer/wgsl/generator_impl_unary_op_test.cc @@ -12,13 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/unary_op_expression.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_variable_decl_statement_test.cc b/src/writer/wgsl/generator_impl_variable_decl_statement_test.cc index ce2d3e247a..a91c5e1485 100644 --- a/src/writer/wgsl/generator_impl_variable_decl_statement_test.cc +++ b/src/writer/wgsl/generator_impl_variable_decl_statement_test.cc @@ -12,17 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "gtest/gtest.h" -#include "src/ast/identifier_expression.h" -#include "src/ast/variable.h" #include "src/ast/variable_decl_statement.h" #include "src/type/access_control_type.h" -#include "src/type/f32_type.h" #include "src/type/sampled_texture_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/wgsl/generator_impl_variable_test.cc b/src/writer/wgsl/generator_impl_variable_test.cc index e410195ff2..598f262548 100644 --- a/src/writer/wgsl/generator_impl_variable_test.cc +++ b/src/writer/wgsl/generator_impl_variable_test.cc @@ -12,18 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "gtest/gtest.h" -#include "src/ast/binding_decoration.h" -#include "src/ast/builtin_decoration.h" #include "src/ast/constant_id_decoration.h" -#include "src/ast/group_decoration.h" -#include "src/ast/location_decoration.h" -#include "src/ast/variable.h" -#include "src/ast/variable_decoration.h" -#include "src/type/f32_type.h" -#include "src/writer/wgsl/generator_impl.h" #include "src/writer/wgsl/test_helper.h" namespace tint { diff --git a/src/writer/writer.cc b/src/writer/writer.cc index 7499c3c569..f3b765e292 100644 --- a/src/writer/writer.cc +++ b/src/writer/writer.cc @@ -14,8 +14,6 @@ #include "src/writer/writer.h" -#include - namespace tint { namespace writer { diff --git a/src/writer/writer.h b/src/writer/writer.h index 1f6a18e47b..1da57155ce 100644 --- a/src/writer/writer.h +++ b/src/writer/writer.h @@ -17,7 +17,6 @@ #include -#include "src/ast/pipeline_stage.h" #include "src/program.h" namespace tint {