From 01004b7732abf4e2587a7d560828e49156ca6633 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Thu, 28 Apr 2022 18:49:04 +0000 Subject: [PATCH] tint: Remove '_type' suffix from file names These suffixes existed because the GN build errored when there were two files sets with the same name (ast + sem). This is no longer required as the GN build splits these into two separate targets. Change-Id: Ib451da33a5f4aa5c867cb99419dd252766dc3daa Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88308 Commit-Queue: Ben Clayton Reviewed-by: James Price Reviewed-by: Dan Sinclair Kokoro: Kokoro --- src/tint/BUILD.gn | 108 ++++++++-------- src/tint/CMakeLists.txt | 118 +++++++++--------- src/tint/ast/builtin_texture_helper_test.cc | 6 +- src/tint/ast/builtin_texture_helper_test.h | 2 +- src/tint/builtin_table.cc | 14 +-- src/tint/builtin_table_test.cc | 16 +-- .../mutations/change_binary_operator.cc | 2 +- src/tint/inspector/inspector.cc | 20 +-- src/tint/inspector/inspector_test.cc | 8 +- src/tint/inspector/resource_binding.cc | 10 +- src/tint/inspector/test_inspector_builder.h | 8 +- src/tint/program_builder.h | 26 ++-- src/tint/reader/spirv/enum_converter.h | 2 +- src/tint/reader/spirv/function.cc | 4 +- src/tint/reader/spirv/parser_impl.cc | 8 +- src/tint/reader/wgsl/parser_impl.cc | 62 ++++----- src/tint/reader/wgsl/parser_impl.h | 28 ++--- ...t.cc => parser_impl_depth_texture_test.cc} | 14 +-- ...c => parser_impl_external_texture_test.cc} | 4 +- ...cc => parser_impl_sampled_texture_test.cc} | 14 +-- ...pe_test.cc => parser_impl_sampler_test.cc} | 6 +- ...cc => parser_impl_storage_texture_test.cc} | 10 +- ...cc => parser_impl_texture_sampler_test.cc} | 48 +++---- .../reader/wgsl/parser_impl_type_decl_test.cc | 2 +- src/tint/resolver/array_accessor_test.cc | 2 +- .../resolver/assignment_validation_test.cc | 2 +- src/tint/resolver/atomics_test.cc | 4 +- src/tint/resolver/atomics_validation_test.cc | 4 +- src/tint/resolver/builtin_test.cc | 2 +- .../compound_assignment_validation_test.cc | 2 +- src/tint/resolver/is_host_shareable_test.cc | 2 +- src/tint/resolver/is_storeable_test.cc | 2 +- src/tint/resolver/ptr_ref_test.cc | 2 +- src/tint/resolver/ptr_ref_validation_test.cc | 2 +- src/tint/resolver/resolver.cc | 18 +-- .../resolver/resolver_is_storeable_test.cc | 2 +- src/tint/resolver/resolver_test.cc | 4 +- .../type_constructor_validation_test.cc | 2 +- src/tint/resolver/type_validation_test.cc | 4 +- src/tint/resolver/validation_test.cc | 2 +- src/tint/resolver/validator.cc | 18 +-- .../resolver/validator_is_storeable_test.cc | 2 +- src/tint/resolver/var_let_test.cc | 2 +- src/tint/sem/{atomic_type.cc => atomic.cc} | 4 +- src/tint/sem/{atomic_type.h => atomic.h} | 6 +- .../{atomic_type_test.cc => atomic_test.cc} | 2 +- src/tint/sem/{bool_type.cc => bool.cc} | 2 +- src/tint/sem/{bool_type.h => bool.h} | 6 +- .../sem/{bool_type_test.cc => bool_test.cc} | 2 +- src/tint/sem/call_target.h | 2 +- ..._type.cc => depth_multisampled_texture.cc} | 2 +- ...re_type.h => depth_multisampled_texture.h} | 8 +- ....cc => depth_multisampled_texture_test.cc} | 8 +- ...depth_texture_type.cc => depth_texture.cc} | 2 +- .../{depth_texture_type.h => depth_texture.h} | 8 +- ...ure_type_test.cc => depth_texture_test.cc} | 8 +- ...al_texture_type.cc => external_texture.cc} | 2 +- ...rnal_texture_type.h => external_texture.h} | 8 +- ..._type_test.cc => external_texture_test.cc} | 10 +- src/tint/sem/{f32_type.cc => f32.cc} | 2 +- src/tint/sem/{f32_type.h => f32.h} | 6 +- .../sem/{f32_type_test.cc => f32_test.cc} | 2 +- src/tint/sem/function.cc | 10 +- src/tint/sem/{i32_type.cc => i32.cc} | 2 +- src/tint/sem/{i32_type.h => i32.h} | 6 +- .../sem/{i32_type_test.cc => i32_test.cc} | 2 +- src/tint/sem/{matrix_type.cc => matrix.cc} | 4 +- src/tint/sem/{matrix_type.h => matrix.h} | 6 +- .../{matrix_type_test.cc => matrix_test.cc} | 2 +- ...exture_type.cc => multisampled_texture.cc} | 2 +- ..._texture_type.h => multisampled_texture.h} | 8 +- ...e_test.cc => multisampled_texture_test.cc} | 10 +- src/tint/sem/{pointer_type.cc => pointer.cc} | 4 +- src/tint/sem/{pointer_type.h => pointer.h} | 6 +- .../{pointer_type_test.cc => pointer_test.cc} | 2 +- .../sem/{reference_type.cc => reference.cc} | 2 +- .../sem/{reference_type.h => reference.h} | 6 +- ...ference_type_test.cc => reference_test.cc} | 2 +- ...led_texture_type.cc => sampled_texture.cc} | 2 +- ...mpled_texture_type.h => sampled_texture.h} | 8 +- ...e_type_test.cc => sampled_texture_test.cc} | 8 +- src/tint/sem/{sampler_type.cc => sampler.cc} | 2 +- src/tint/sem/{sampler_type.h => sampler.h} | 6 +- .../{sampler_type_test.cc => sampler_test.cc} | 4 +- src/tint/sem/sem_array_test.cc | 2 +- src/tint/sem/sem_struct_test.cc | 2 +- ...age_texture_type.cc => storage_texture.cc} | 2 +- ...orage_texture_type.h => storage_texture.h} | 8 +- ...e_type_test.cc => storage_texture_test.cc} | 8 +- src/tint/sem/{texture_type.cc => texture.cc} | 2 +- src/tint/sem/{texture_type.h => texture.h} | 6 +- .../{texture_type_test.cc => texture_test.cc} | 4 +- src/tint/sem/type.cc | 20 +-- src/tint/sem/type_manager_test.cc | 4 +- src/tint/sem/{u32_type.cc => u32.cc} | 2 +- src/tint/sem/{u32_type.h => u32.h} | 6 +- .../sem/{u32_type_test.cc => u32_test.cc} | 2 +- src/tint/sem/{vector_type.cc => vector.cc} | 2 +- src/tint/sem/{vector_type.h => vector.h} | 6 +- .../{vector_type_test.cc => vector_test.cc} | 2 +- src/tint/sem/{void_type.cc => void.cc} | 2 +- src/tint/sem/{void_type.h => void.h} | 6 +- src/tint/transform/decompose_memory_access.cc | 4 +- .../localize_struct_array_assignment.cc | 2 +- src/tint/transform/robustness.cc | 2 +- src/tint/transform/transform.cc | 8 +- .../transform/utils/hoist_to_decl_before.cc | 2 +- .../transform/zero_init_workgroup_memory.cc | 2 +- .../generate_external_texture_bindings.cc | 2 +- src/tint/writer/glsl/generator_impl.cc | 19 +-- .../writer/glsl/generator_impl_type_test.cc | 10 +- src/tint/writer/hlsl/generator_impl.cc | 12 +- .../writer/hlsl/generator_impl_type_test.cc | 10 +- src/tint/writer/msl/generator_impl.cc | 30 ++--- .../writer/msl/generator_impl_type_test.cc | 12 +- src/tint/writer/spirv/builder.cc | 14 +-- src/tint/writer/spirv/builder.h | 2 +- src/tint/writer/spirv/builder_builtin_test.cc | 2 +- .../writer/spirv/builder_entry_point_test.cc | 4 +- src/tint/writer/spirv/builder_type_test.cc | 6 +- src/tint/writer/wgsl/generator_impl.h | 2 +- .../wgsl/generator_impl_global_decl_test.cc | 2 +- .../writer/wgsl/generator_impl_type_test.cc | 6 +- test/tint/BUILD.gn | 46 +++---- 124 files changed, 549 insertions(+), 548 deletions(-) rename src/tint/reader/wgsl/{parser_impl_depth_texture_type_test.cc => parser_impl_depth_texture_test.cc} (92%) rename src/tint/reader/wgsl/{parser_impl_external_texture_type_test.cc => parser_impl_external_texture_test.cc} (93%) rename src/tint/reader/wgsl/{parser_impl_sampled_texture_type_test.cc => parser_impl_sampled_texture_test.cc} (89%) rename src/tint/reader/wgsl/{parser_impl_sampler_type_test.cc => parser_impl_sampler_test.cc} (94%) rename src/tint/reader/wgsl/{parser_impl_storage_texture_type_test.cc => parser_impl_storage_texture_test.cc} (90%) rename src/tint/reader/wgsl/{parser_impl_texture_sampler_types_test.cc => parser_impl_texture_sampler_test.cc} (90%) rename src/tint/sem/{atomic_type.cc => atomic.cc} (95%) rename src/tint/sem/{atomic_type.h => atomic.h} (94%) rename src/tint/sem/{atomic_type_test.cc => atomic_test.cc} (97%) rename src/tint/sem/{bool_type.cc => bool.cc} (97%) rename src/tint/sem/{bool_type.h => bool.h} (94%) rename src/tint/sem/{bool_type_test.cc => bool_test.cc} (96%) rename src/tint/sem/{depth_multisampled_texture_type.cc => depth_multisampled_texture.cc} (96%) rename src/tint/sem/{depth_multisampled_texture_type.h => depth_multisampled_texture.h} (87%) rename src/tint/sem/{depth_multisampled_texture_type_test.cc => depth_multisampled_texture_test.cc} (90%) rename src/tint/sem/{depth_texture_type.cc => depth_texture.cc} (97%) rename src/tint/sem/{depth_texture_type.h => depth_texture.h} (89%) rename src/tint/sem/{depth_texture_type_test.cc => depth_texture_test.cc} (92%) rename src/tint/sem/{external_texture_type.cc => external_texture.cc} (96%) rename src/tint/sem/{external_texture_type.h => external_texture.h} (88%) rename src/tint/sem/{external_texture_type_test.cc => external_texture_test.cc} (88%) rename src/tint/sem/{f32_type.cc => f32.cc} (97%) rename src/tint/sem/{f32_type.h => f32.h} (94%) rename src/tint/sem/{f32_type_test.cc => f32_test.cc} (96%) rename src/tint/sem/{i32_type.cc => i32.cc} (97%) rename src/tint/sem/{i32_type.h => i32.h} (94%) rename src/tint/sem/{i32_type_test.cc => i32_test.cc} (96%) rename src/tint/sem/{matrix_type.cc => matrix.cc} (96%) rename src/tint/sem/{matrix_type.h => matrix.h} (95%) rename src/tint/sem/{matrix_type_test.cc => matrix_test.cc} (98%) rename src/tint/sem/{multisampled_texture_type.cc => multisampled_texture.cc} (96%) rename src/tint/sem/{multisampled_texture_type.h => multisampled_texture.h} (89%) rename src/tint/sem/{multisampled_texture_type_test.cc => multisampled_texture_test.cc} (92%) rename src/tint/sem/{pointer_type.cc => pointer.cc} (95%) rename src/tint/sem/{pointer_type.h => pointer.h} (94%) rename src/tint/sem/{pointer_type_test.cc => pointer_test.cc} (98%) rename src/tint/sem/{reference_type.cc => reference.cc} (97%) rename src/tint/sem/{reference_type.h => reference.h} (94%) rename src/tint/sem/{reference_type_test.cc => reference_test.cc} (98%) rename src/tint/sem/{sampled_texture_type.cc => sampled_texture.cc} (97%) rename src/tint/sem/{sampled_texture_type.h => sampled_texture.h} (90%) rename src/tint/sem/{sampled_texture_type_test.cc => sampled_texture_test.cc} (94%) rename src/tint/sem/{sampler_type.cc => sampler.cc} (97%) rename src/tint/sem/{sampler_type.h => sampler.h} (93%) rename src/tint/sem/{sampler_type_test.cc => sampler_test.cc} (96%) rename src/tint/sem/{storage_texture_type.cc => storage_texture.cc} (98%) rename src/tint/sem/{storage_texture_type.h => storage_texture.h} (93%) rename src/tint/sem/{storage_texture_type_test.cc => storage_texture_test.cc} (96%) rename src/tint/sem/{texture_type.cc => texture.cc} (95%) rename src/tint/sem/{texture_type.h => texture.h} (90%) rename src/tint/sem/{texture_type_test.cc => texture_test.cc} (94%) rename src/tint/sem/{u32_type.cc => u32.cc} (97%) rename src/tint/sem/{u32_type.h => u32.h} (94%) rename src/tint/sem/{u32_type_test.cc => u32_test.cc} (96%) rename src/tint/sem/{vector_type.cc => vector.cc} (98%) rename src/tint/sem/{vector_type.h => vector.h} (95%) rename src/tint/sem/{vector_type_test.cc => vector_test.cc} (98%) rename src/tint/sem/{void_type.cc => void.cc} (96%) rename src/tint/sem/{void_type.h => void.h} (92%) diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn index 065e208088..f2a1ce3aa9 100644 --- a/src/tint/BUILD.gn +++ b/src/tint/BUILD.gn @@ -384,47 +384,47 @@ libtint_source_set("libtint_core_all_src") { "resolver/validator.h", "scope_stack.h", "sem/array.h", - "sem/atomic_type.h", + "sem/atomic.h", "sem/behavior.h", "sem/binding_point.h", - "sem/bool_type.h", + "sem/bool.h", "sem/builtin.h", "sem/builtin_type.h", "sem/call.h", "sem/call_target.h", "sem/constant.h", - "sem/depth_multisampled_texture_type.h", - "sem/depth_texture_type.h", + "sem/depth_multisampled_texture.h", + "sem/depth_texture.h", "sem/expression.h", - "sem/external_texture_type.h", - "sem/f32_type.h", + "sem/external_texture.h", + "sem/f32.h", "sem/for_loop_statement.h", - "sem/i32_type.h", + "sem/i32.h", "sem/if_statement.h", "sem/info.h", "sem/loop_statement.h", - "sem/matrix_type.h", + "sem/matrix.h", "sem/module.h", - "sem/multisampled_texture_type.h", + "sem/multisampled_texture.h", "sem/node.h", "sem/parameter_usage.h", "sem/pipeline_stage_set.h", - "sem/pointer_type.h", - "sem/reference_type.h", - "sem/sampled_texture_type.h", + "sem/pointer.h", + "sem/reference.h", + "sem/sampled_texture.h", "sem/sampler_texture_pair.h", - "sem/sampler_type.h", - "sem/storage_texture_type.h", + "sem/sampler.h", + "sem/storage_texture.h", "sem/switch_statement.h", - "sem/texture_type.h", + "sem/texture.h", "sem/type.h", "sem/type_constructor.h", "sem/type_conversion.h", "sem/type_manager.h", "sem/type_mappings.h", - "sem/u32_type.h", - "sem/vector_type.h", - "sem/void_type.h", + "sem/u32.h", + "sem/vector.h", + "sem/void.h", "source.cc", "source.h", "symbol.cc", @@ -557,14 +557,14 @@ libtint_source_set("libtint_sem_src") { sources = [ "sem/array.cc", "sem/array.h", - "sem/atomic_type.cc", - "sem/atomic_type.h", + "sem/atomic.cc", + "sem/atomic.h", "sem/behavior.cc", "sem/behavior.h", "sem/binding_point.h", "sem/block_statement.cc", - "sem/bool_type.cc", - "sem/bool_type.h", + "sem/bool.cc", + "sem/bool.h", "sem/builtin.cc", "sem/builtin.h", "sem/builtin_type.cc", @@ -575,55 +575,55 @@ libtint_source_set("libtint_sem_src") { "sem/call_target.h", "sem/constant.cc", "sem/constant.h", - "sem/depth_multisampled_texture_type.cc", - "sem/depth_multisampled_texture_type.h", - "sem/depth_texture_type.cc", - "sem/depth_texture_type.h", + "sem/depth_multisampled_texture.cc", + "sem/depth_multisampled_texture.h", + "sem/depth_texture.cc", + "sem/depth_texture.h", "sem/expression.cc", "sem/expression.h", - "sem/external_texture_type.cc", - "sem/external_texture_type.h", - "sem/f32_type.cc", - "sem/f32_type.h", + "sem/external_texture.cc", + "sem/external_texture.h", + "sem/f32.cc", + "sem/f32.h", "sem/for_loop_statement.cc", "sem/for_loop_statement.h", "sem/function.cc", - "sem/i32_type.cc", - "sem/i32_type.h", + "sem/i32.cc", + "sem/i32.h", "sem/if_statement.cc", "sem/if_statement.h", "sem/info.cc", "sem/info.h", "sem/loop_statement.cc", "sem/loop_statement.h", - "sem/matrix_type.cc", - "sem/matrix_type.h", + "sem/matrix.cc", + "sem/matrix.h", "sem/member_accessor_expression.cc", "sem/module.cc", "sem/module.h", - "sem/multisampled_texture_type.cc", - "sem/multisampled_texture_type.h", + "sem/multisampled_texture.cc", + "sem/multisampled_texture.h", "sem/node.cc", "sem/node.h", "sem/parameter_usage.cc", "sem/parameter_usage.h", "sem/pipeline_stage_set.h", - "sem/pointer_type.cc", - "sem/pointer_type.h", - "sem/reference_type.cc", - "sem/reference_type.h", - "sem/sampled_texture_type.cc", - "sem/sampled_texture_type.h", - "sem/sampler_type.cc", - "sem/sampler_type.h", + "sem/pointer.cc", + "sem/pointer.h", + "sem/reference.cc", + "sem/reference.h", + "sem/sampled_texture.cc", + "sem/sampled_texture.h", + "sem/sampler.cc", + "sem/sampler.h", "sem/statement.cc", - "sem/storage_texture_type.cc", - "sem/storage_texture_type.h", + "sem/storage_texture.cc", + "sem/storage_texture.h", "sem/struct.cc", "sem/switch_statement.cc", "sem/switch_statement.h", - "sem/texture_type.cc", - "sem/texture_type.h", + "sem/texture.cc", + "sem/texture.h", "sem/type.cc", "sem/type.h", "sem/type_constructor.cc", @@ -633,13 +633,13 @@ libtint_source_set("libtint_sem_src") { "sem/type_manager.cc", "sem/type_manager.h", "sem/type_mappings.h", - "sem/u32_type.cc", - "sem/u32_type.h", + "sem/u32.cc", + "sem/u32.h", "sem/variable.cc", - "sem/vector_type.cc", - "sem/vector_type.h", - "sem/void_type.cc", - "sem/void_type.h", + "sem/vector.cc", + "sem/vector.h", + "sem/void.cc", + "sem/void.h", ] public_deps = [ ":libtint_core_all_src" ] diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt index 88b5cab81b..35b5f6926b 100644 --- a/src/tint/CMakeLists.txt +++ b/src/tint/CMakeLists.txt @@ -266,8 +266,8 @@ set(TINT_LIB_SRCS scope_stack.h sem/array.cc sem/array.h - sem/atomic_type.cc - sem/atomic_type.h + sem/atomic.cc + sem/atomic.h sem/behavior.cc sem/behavior.h sem/binding_point.h @@ -283,8 +283,8 @@ set(TINT_LIB_SRCS sem/call.h sem/constant.cc sem/constant.h - sem/depth_multisampled_texture_type.cc - sem/depth_multisampled_texture_type.h + sem/depth_multisampled_texture.cc + sem/depth_multisampled_texture.h sem/expression.cc sem/expression.h sem/function.cc @@ -392,40 +392,40 @@ set(TINT_LIB_SRCS transform/utils/get_insertion_point.h transform/utils/hoist_to_decl_before.cc transform/utils/hoist_to_decl_before.h - sem/bool_type.cc - sem/bool_type.h - sem/depth_texture_type.cc - sem/depth_texture_type.h - sem/external_texture_type.cc - sem/external_texture_type.h - sem/f32_type.cc - sem/f32_type.h + sem/bool.cc + sem/bool.h + sem/depth_texture.cc + sem/depth_texture.h + sem/external_texture.cc + sem/external_texture.h + sem/f32.cc + sem/f32.h sem/for_loop_statement.cc sem/for_loop_statement.h - sem/i32_type.cc - sem/i32_type.h + sem/i32.cc + sem/i32.h sem/if_statement.cc sem/if_statement.h sem/loop_statement.cc sem/loop_statement.h - sem/matrix_type.cc - sem/matrix_type.h - sem/multisampled_texture_type.cc - sem/multisampled_texture_type.h - sem/pointer_type.cc - sem/pointer_type.h - sem/reference_type.cc - sem/reference_type.h - sem/sampled_texture_type.cc - sem/sampled_texture_type.h - sem/sampler_type.cc - sem/sampler_type.h - sem/storage_texture_type.cc - sem/storage_texture_type.h + sem/matrix.cc + sem/matrix.h + sem/multisampled_texture.cc + sem/multisampled_texture.h + sem/pointer.cc + sem/pointer.h + sem/reference.cc + sem/reference.h + sem/sampled_texture.cc + sem/sampled_texture.h + sem/sampler.cc + sem/sampler.h + sem/storage_texture.cc + sem/storage_texture.h sem/switch_statement.cc sem/switch_statement.h - sem/texture_type.cc - sem/texture_type.h + sem/texture.cc + sem/texture.h sem/type_constructor.cc sem/type_constructor.h sem/type_conversion.cc @@ -434,12 +434,12 @@ set(TINT_LIB_SRCS sem/type.h sem/type_manager.cc sem/type_manager.h - sem/u32_type.cc - sem/u32_type.h - sem/vector_type.cc - sem/vector_type.h - sem/void_type.cc - sem/void_type.h + sem/u32.cc + sem/u32.h + sem/vector.cc + sem/vector.h + sem/void.cc + sem/void.h utils/block_allocator.h utils/crc32.h utils/enum_set.h @@ -779,27 +779,27 @@ if(TINT_BUILD_TESTS) resolver/var_let_test.cc resolver/var_let_validation_test.cc scope_stack_test.cc - sem/atomic_type_test.cc - sem/bool_type_test.cc + sem/atomic.cc + sem/bool_test.cc sem/builtin_test.cc - sem/depth_multisampled_texture_type_test.cc - sem/depth_texture_type_test.cc - sem/external_texture_type_test.cc - sem/f32_type_test.cc - sem/i32_type_test.cc - sem/matrix_type_test.cc - sem/multisampled_texture_type_test.cc - sem/pointer_type_test.cc - sem/reference_type_test.cc - sem/sampled_texture_type_test.cc - sem/sampler_type_test.cc + sem/depth_multisampled_texture_test.cc + sem/depth_texture_test.cc + sem/external_texture_test.cc + sem/f32_test.cc + sem/i32_test.cc + sem/matrix_test.cc + sem/multisampled_texture_test.cc + sem/pointer_test.cc + sem/reference_test.cc + sem/sampled_texture_test.cc + sem/sampler_test.cc sem/sem_array_test.cc sem/sem_struct_test.cc - sem/storage_texture_type_test.cc - sem/texture_type_test.cc + sem/storage_texture_test.cc + sem/texture_test.cc sem/type_manager_test.cc - sem/u32_type_test.cc - sem/vector_type_test.cc + sem/u32_test.cc + sem/vector_test.cc source_test.cc symbol_table_test.cc symbol_test.cc @@ -894,9 +894,9 @@ if(TINT_BUILD_TESTS) reader/wgsl/parser_impl_const_literal_test.cc reader/wgsl/parser_impl_continue_stmt_test.cc reader/wgsl/parser_impl_continuing_stmt_test.cc - reader/wgsl/parser_impl_depth_texture_type_test.cc + reader/wgsl/parser_impl_depth_texture_test.cc reader/wgsl/parser_impl_enable_directive_test.cc - reader/wgsl/parser_impl_external_texture_type_test.cc + reader/wgsl/parser_impl_external_texture_test.cc reader/wgsl/parser_impl_elseif_stmt_test.cc reader/wgsl/parser_impl_equality_expression_test.cc reader/wgsl/parser_impl_error_msg_test.cc @@ -923,14 +923,14 @@ if(TINT_BUILD_TESTS) reader/wgsl/parser_impl_primary_expression_test.cc reader/wgsl/parser_impl_relational_expression_test.cc reader/wgsl/parser_impl_reserved_keyword_test.cc - reader/wgsl/parser_impl_sampled_texture_type_test.cc - reader/wgsl/parser_impl_sampler_type_test.cc + reader/wgsl/parser_impl_sampled_texture_test.cc + reader/wgsl/parser_impl_sampler_test.cc reader/wgsl/parser_impl_shift_expression_test.cc reader/wgsl/parser_impl_singular_expression_test.cc reader/wgsl/parser_impl_statement_test.cc reader/wgsl/parser_impl_statements_test.cc reader/wgsl/parser_impl_storage_class_test.cc - reader/wgsl/parser_impl_storage_texture_type_test.cc + reader/wgsl/parser_impl_storage_texture_test.cc reader/wgsl/parser_impl_struct_body_decl_test.cc reader/wgsl/parser_impl_struct_decl_test.cc reader/wgsl/parser_impl_struct_attribute_decl_test.cc @@ -943,7 +943,7 @@ if(TINT_BUILD_TESTS) reader/wgsl/parser_impl_test_helper.cc reader/wgsl/parser_impl_test_helper.h reader/wgsl/parser_impl_texel_format_test.cc - reader/wgsl/parser_impl_texture_sampler_types_test.cc + reader/wgsl/parser_impl_texture_sampler_test.cc reader/wgsl/parser_impl_type_alias_test.cc reader/wgsl/parser_impl_type_decl_test.cc reader/wgsl/parser_impl_unary_expression_test.cc diff --git a/src/tint/ast/builtin_texture_helper_test.cc b/src/tint/ast/builtin_texture_helper_test.cc index 85567e08ca..1c6d1a478e 100644 --- a/src/tint/ast/builtin_texture_helper_test.cc +++ b/src/tint/ast/builtin_texture_helper_test.cc @@ -14,9 +14,9 @@ #include "src/tint/ast/builtin_texture_helper_test.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" namespace tint::ast::builtin::test { diff --git a/src/tint/ast/builtin_texture_helper_test.h b/src/tint/ast/builtin_texture_helper_test.h index ad60757eca..f4ae37a3ed 100644 --- a/src/tint/ast/builtin_texture_helper_test.h +++ b/src/tint/ast/builtin_texture_helper_test.h @@ -19,7 +19,7 @@ #include "src/tint/ast/access.h" #include "src/tint/program_builder.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" namespace tint::ast::builtin::test { diff --git a/src/tint/builtin_table.cc b/src/tint/builtin_table.cc index 13e7c5feb7..f298fafbcf 100644 --- a/src/tint/builtin_table.cc +++ b/src/tint/builtin_table.cc @@ -20,14 +20,14 @@ #include #include "src/tint/program_builder.h" -#include "src/tint/sem/atomic_type.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" +#include "src/tint/sem/atomic.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/multisampled_texture.h" #include "src/tint/sem/pipeline_stage_set.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/utils/hash.h" #include "src/tint/utils/map.h" #include "src/tint/utils/math.h" diff --git a/src/tint/builtin_table_test.cc b/src/tint/builtin_table_test.cc index b8454d100f..135f0b5a91 100644 --- a/src/tint/builtin_table_test.cc +++ b/src/tint/builtin_table_test.cc @@ -16,14 +16,14 @@ #include "gmock/gmock.h" #include "src/tint/program_builder.h" -#include "src/tint/sem/atomic_type.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/reference_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/atomic.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/reference.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/storage_texture.h" namespace tint { namespace { diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.cc b/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.cc index 4b4888bbb8..d01135c1cf 100644 --- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.cc +++ b/src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.cc @@ -16,7 +16,7 @@ #include -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" namespace tint::fuzzers::ast_fuzzer { diff --git a/src/tint/inspector/inspector.cc b/src/tint/inspector/inspector.cc index 40c5f5a132..1bb3e0722c 100644 --- a/src/tint/inspector/inspector.cc +++ b/src/tint/inspector/inspector.cc @@ -28,20 +28,20 @@ #include "src/tint/ast/uint_literal_expression.h" #include "src/tint/sem/array.h" #include "src/tint/sem/call.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/f32_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/f32.h" #include "src/tint/sem/function.h" -#include "src/tint/sem/i32_type.h" -#include "src/tint/sem/matrix_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/i32.h" +#include "src/tint/sem/matrix.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/statement.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/struct.h" -#include "src/tint/sem/u32_type.h" +#include "src/tint/sem/u32.h" #include "src/tint/sem/variable.h" -#include "src/tint/sem/vector_type.h" -#include "src/tint/sem/void_type.h" +#include "src/tint/sem/vector.h" +#include "src/tint/sem/void.h" #include "src/tint/utils/math.h" #include "src/tint/utils/unique_vector.h" diff --git a/src/tint/inspector/inspector_test.cc b/src/tint/inspector/inspector_test.cc index f72ba26568..e5aec46370 100644 --- a/src/tint/inspector/inspector_test.cc +++ b/src/tint/inspector/inspector_test.cc @@ -21,10 +21,10 @@ #include "src/tint/inspector/test_inspector_builder.h" #include "src/tint/inspector/test_inspector_runner.h" #include "src/tint/program_builder.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/variable.h" #include "tint/tint.h" diff --git a/src/tint/inspector/resource_binding.cc b/src/tint/inspector/resource_binding.cc index 5095e2d905..6e3e3d6f20 100644 --- a/src/tint/inspector/resource_binding.cc +++ b/src/tint/inspector/resource_binding.cc @@ -15,12 +15,12 @@ #include "src/tint/inspector/resource_binding.h" #include "src/tint/sem/array.h" -#include "src/tint/sem/f32_type.h" -#include "src/tint/sem/i32_type.h" -#include "src/tint/sem/matrix_type.h" +#include "src/tint/sem/f32.h" +#include "src/tint/sem/i32.h" +#include "src/tint/sem/matrix.h" #include "src/tint/sem/type.h" -#include "src/tint/sem/u32_type.h" -#include "src/tint/sem/vector_type.h" +#include "src/tint/sem/u32.h" +#include "src/tint/sem/vector.h" namespace tint::inspector { diff --git a/src/tint/inspector/test_inspector_builder.h b/src/tint/inspector/test_inspector_builder.h index 97a2ae369a..a8e5d2ffe3 100644 --- a/src/tint/inspector/test_inspector_builder.h +++ b/src/tint/inspector/test_inspector_builder.h @@ -26,10 +26,10 @@ #include "src/tint/ast/stage_attribute.h" #include "src/tint/ast/workgroup_attribute.h" #include "src/tint/program_builder.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/variable.h" #include "tint/tint.h" diff --git a/src/tint/program_builder.h b/src/tint/program_builder.h index 4f6101433b..f64bade8f5 100644 --- a/src/tint/program_builder.h +++ b/src/tint/program_builder.h @@ -80,20 +80,20 @@ #include "src/tint/program.h" #include "src/tint/program_id.h" #include "src/tint/sem/array.h" -#include "src/tint/sem/bool_type.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/f32_type.h" -#include "src/tint/sem/i32_type.h" -#include "src/tint/sem/matrix_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/pointer_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/bool.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/f32.h" +#include "src/tint/sem/i32.h" +#include "src/tint/sem/matrix.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/pointer.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/struct.h" -#include "src/tint/sem/u32_type.h" -#include "src/tint/sem/vector_type.h" -#include "src/tint/sem/void_type.h" +#include "src/tint/sem/u32.h" +#include "src/tint/sem/vector.h" +#include "src/tint/sem/void.h" #ifdef INCLUDE_TINT_TINT_H_ #error "internal tint header being #included from tint.h" diff --git a/src/tint/reader/spirv/enum_converter.h b/src/tint/reader/spirv/enum_converter.h index 4a31cfec11..e8b066dcfa 100644 --- a/src/tint/reader/spirv/enum_converter.h +++ b/src/tint/reader/spirv/enum_converter.h @@ -20,7 +20,7 @@ #include "src/tint/ast/pipeline_stage.h" #include "src/tint/ast/storage_class.h" #include "src/tint/reader/spirv/fail_stream.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" namespace tint::reader::spirv { diff --git a/src/tint/reader/spirv/function.cc b/src/tint/reader/spirv/function.cc index 43a3140726..e148050e4f 100644 --- a/src/tint/reader/spirv/function.cc +++ b/src/tint/reader/spirv/function.cc @@ -34,8 +34,8 @@ #include "src/tint/ast/unary_op_expression.h" #include "src/tint/ast/variable_decl_statement.h" #include "src/tint/sem/builtin_type.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/sampled_texture.h" // Terms: // CFG: the control flow graph of the function, where basic blocks are the diff --git a/src/tint/reader/spirv/parser_impl.cc b/src/tint/reader/spirv/parser_impl.cc index 4b7e0b6701..4383f3fb45 100644 --- a/src/tint/reader/spirv/parser_impl.cc +++ b/src/tint/reader/spirv/parser_impl.cc @@ -27,9 +27,9 @@ #include "src/tint/ast/type_name.h" #include "src/tint/ast/unary_op_expression.h" #include "src/tint/reader/spirv/function.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/utils/unique_vector.h" namespace tint::reader::spirv { @@ -623,7 +623,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/tint/reader/wgsl/parser_impl.cc b/src/tint/reader/wgsl/parser_impl.cc index 7bb4a2d09b..d1a0dc2e43 100644 --- a/src/tint/reader/wgsl/parser_impl.cc +++ b/src/tint/reader/wgsl/parser_impl.cc @@ -37,10 +37,10 @@ #include "src/tint/ast/vector.h" #include "src/tint/ast/workgroup_attribute.h" #include "src/tint/reader/wgsl/lexer.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" namespace tint::reader::wgsl { namespace { @@ -610,29 +610,29 @@ Maybe ParserImpl::variable_decl(bool allow_inferred) { decl->type}; } -// texture_sampler_types -// : sampler_type -// | depth_texture_type -// | sampled_texture_type LESS_THAN type_decl GREATER_THAN -// | multisampled_texture_type LESS_THAN type_decl GREATER_THAN -// | storage_texture_type LESS_THAN texel_format +// texture_samplers +// : sampler +// | depth_texture +// | sampled_texture LESS_THAN type_decl GREATER_THAN +// | multisampled_texture LESS_THAN type_decl GREATER_THAN +// | storage_texture LESS_THAN texel_format // COMMA access GREATER_THAN -Maybe ParserImpl::texture_sampler_types() { - auto type = sampler_type(); +Maybe ParserImpl::texture_samplers() { + auto type = sampler(); if (type.matched) return type; - type = depth_texture_type(); + type = depth_texture(); if (type.matched) return type; - type = external_texture_type(); + type = external_texture(); if (type.matched) return type.value; auto source_range = make_source_range(); - auto dim = sampled_texture_type(); + auto dim = sampled_texture(); if (dim.matched) { const char* use = "sampled texture type"; @@ -643,7 +643,7 @@ Maybe ParserImpl::texture_sampler_types() { return builder_.ty.sampled_texture(source_range, dim.value, subtype.value); } - auto ms_dim = multisampled_texture_type(); + auto ms_dim = multisampled_texture(); if (ms_dim.matched) { const char* use = "multisampled texture type"; @@ -655,7 +655,7 @@ Maybe ParserImpl::texture_sampler_types() { subtype.value); } - auto storage = storage_texture_type(); + auto storage = storage_texture(); if (storage.matched) { const char* use = "storage texture type"; using StorageTextureInfo = @@ -689,10 +689,10 @@ Maybe ParserImpl::texture_sampler_types() { return Failure::kNoMatch; } -// sampler_type +// sampler // : SAMPLER // | SAMPLER_COMPARISON -Maybe ParserImpl::sampler_type() { +Maybe ParserImpl::sampler() { Source source; if (match(Token::Type::kSampler, &source)) return builder_.ty.sampler(source, ast::SamplerKind::kSampler); @@ -703,14 +703,14 @@ Maybe ParserImpl::sampler_type() { return Failure::kNoMatch; } -// sampled_texture_type +// sampled_texture // : TEXTURE_SAMPLED_1D // | TEXTURE_SAMPLED_2D // | TEXTURE_SAMPLED_2D_ARRAY // | TEXTURE_SAMPLED_3D // | TEXTURE_SAMPLED_CUBE // | TEXTURE_SAMPLED_CUBE_ARRAY -Maybe ParserImpl::sampled_texture_type() { +Maybe ParserImpl::sampled_texture() { if (match(Token::Type::kTextureSampled1d)) return ast::TextureDimension::k1d; @@ -732,9 +732,9 @@ Maybe ParserImpl::sampled_texture_type() { return Failure::kNoMatch; } -// external_texture_type +// external_texture // : TEXTURE_EXTERNAL -Maybe ParserImpl::external_texture_type() { +Maybe ParserImpl::external_texture() { Source source; if (match(Token::Type::kTextureExternal, &source)) { return builder_.ty.external_texture(source); @@ -743,21 +743,21 @@ Maybe ParserImpl::external_texture_type() { return Failure::kNoMatch; } -// multisampled_texture_type +// multisampled_texture // : TEXTURE_MULTISAMPLED_2D -Maybe ParserImpl::multisampled_texture_type() { +Maybe ParserImpl::multisampled_texture() { if (match(Token::Type::kTextureMultisampled2d)) return ast::TextureDimension::k2d; return Failure::kNoMatch; } -// storage_texture_type +// storage_texture // : TEXTURE_STORAGE_1D // | TEXTURE_STORAGE_2D // | TEXTURE_STORAGE_2D_ARRAY // | TEXTURE_STORAGE_3D -Maybe ParserImpl::storage_texture_type() { +Maybe ParserImpl::storage_texture() { if (match(Token::Type::kTextureStorage1d)) return ast::TextureDimension::k1d; if (match(Token::Type::kTextureStorage2d)) @@ -770,13 +770,13 @@ Maybe ParserImpl::storage_texture_type() { return Failure::kNoMatch; } -// depth_texture_type +// depth_texture // : TEXTURE_DEPTH_2D // | TEXTURE_DEPTH_2D_ARRAY // | TEXTURE_DEPTH_CUBE // | TEXTURE_DEPTH_CUBE_ARRAY // | TEXTURE_DEPTH_MULTISAMPLED_2D -Maybe ParserImpl::depth_texture_type() { +Maybe ParserImpl::depth_texture() { Source source; if (match(Token::Type::kTextureDepth2d, &source)) { return builder_.ty.depth_texture(source, ast::TextureDimension::k2d); @@ -989,7 +989,7 @@ Maybe ParserImpl::type_alias() { // | MAT4x2 LESS_THAN type_decl GREATER_THAN // | MAT4x3 LESS_THAN type_decl GREATER_THAN // | MAT4x4 LESS_THAN type_decl GREATER_THAN -// | texture_sampler_types +// | texture_samplers Maybe ParserImpl::type_decl() { auto t = peek(); Source source; @@ -1032,7 +1032,7 @@ Maybe ParserImpl::type_decl() { return expect_type_decl_matrix(t); } - auto texture_or_sampler = texture_sampler_types(); + auto texture_or_sampler = texture_samplers(); if (texture_or_sampler.errored) return Failure::kErrored; if (texture_or_sampler.matched) diff --git a/src/tint/reader/wgsl/parser_impl.h b/src/tint/reader/wgsl/parser_impl.h index 1dc0fe60de..2f5b5e2338 100644 --- a/src/tint/reader/wgsl/parser_impl.h +++ b/src/tint/reader/wgsl/parser_impl.h @@ -27,7 +27,7 @@ #include "src/tint/program_builder.h" #include "src/tint/reader/wgsl/parser_impl_detail.h" #include "src/tint/reader/wgsl/token.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" namespace tint::ast { class BreakStatement; @@ -437,29 +437,29 @@ class ParserImpl { /// @param attrs the list of attributes for the function declaration. /// @returns the parsed function, nullptr otherwise Maybe function_decl(ast::AttributeList& attrs); - /// Parses a `texture_sampler_types` grammar element + /// Parses a `texture_samplers` grammar element /// @returns the parsed Type or nullptr if none matched. - Maybe texture_sampler_types(); - /// Parses a `sampler_type` grammar element + Maybe texture_samplers(); + /// Parses a `sampler` grammar element /// @returns the parsed Type or nullptr if none matched. - Maybe sampler_type(); - /// Parses a `multisampled_texture_type` grammar element + Maybe sampler(); + /// Parses a `multisampled_texture` grammar element /// @returns returns the multisample texture dimension or kNone if none /// matched. - Maybe multisampled_texture_type(); - /// Parses a `sampled_texture_type` grammar element + Maybe multisampled_texture(); + /// Parses a `sampled_texture` grammar element /// @returns returns the sample texture dimension or kNone if none matched. - Maybe sampled_texture_type(); - /// Parses a `storage_texture_type` grammar element + Maybe sampled_texture(); + /// Parses a `storage_texture` grammar element /// @returns returns the storage texture dimension. /// Returns kNone if none matched. - Maybe storage_texture_type(); - /// Parses a `depth_texture_type` grammar element + Maybe storage_texture(); + /// Parses a `depth_texture` grammar element /// @returns the parsed Type or nullptr if none matched. - Maybe depth_texture_type(); + Maybe depth_texture(); /// Parses a 'texture_external_type' grammar element /// @returns the parsed Type or nullptr if none matched - Maybe external_texture_type(); + Maybe external_texture(); /// Parses a `texel_format` grammar element /// @param use a description of what was being parsed if an error was raised /// @returns returns the texel format or kNone if none matched. diff --git a/src/tint/reader/wgsl/parser_impl_depth_texture_type_test.cc b/src/tint/reader/wgsl/parser_impl_depth_texture_test.cc similarity index 92% rename from src/tint/reader/wgsl/parser_impl_depth_texture_type_test.cc rename to src/tint/reader/wgsl/parser_impl_depth_texture_test.cc index 6a9c528002..e2c8008e3c 100644 --- a/src/tint/reader/wgsl/parser_impl_depth_texture_type_test.cc +++ b/src/tint/reader/wgsl/parser_impl_depth_texture_test.cc @@ -13,14 +13,14 @@ // limitations under the License. #include "src/tint/reader/wgsl/parser_impl_test_helper.h" -#include "src/tint/sem/depth_texture_type.h" +#include "src/tint/sem/depth_texture.h" namespace tint::reader::wgsl { namespace { TEST_F(ParserImplTest, DepthTextureType_Invalid) { auto p = parser("1234"); - auto t = p->depth_texture_type(); + auto t = p->depth_texture(); EXPECT_FALSE(t.matched); EXPECT_FALSE(t.errored); EXPECT_FALSE(p->has_error()); @@ -28,7 +28,7 @@ TEST_F(ParserImplTest, DepthTextureType_Invalid) { TEST_F(ParserImplTest, DepthTextureType_2d) { auto p = parser("texture_depth_2d"); - auto t = p->depth_texture_type(); + auto t = p->depth_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); ASSERT_NE(t.value, nullptr); @@ -41,7 +41,7 @@ TEST_F(ParserImplTest, DepthTextureType_2d) { TEST_F(ParserImplTest, DepthTextureType_2dArray) { auto p = parser("texture_depth_2d_array"); - auto t = p->depth_texture_type(); + auto t = p->depth_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); ASSERT_NE(t.value, nullptr); @@ -54,7 +54,7 @@ TEST_F(ParserImplTest, DepthTextureType_2dArray) { TEST_F(ParserImplTest, DepthTextureType_Cube) { auto p = parser("texture_depth_cube"); - auto t = p->depth_texture_type(); + auto t = p->depth_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); ASSERT_NE(t.value, nullptr); @@ -67,7 +67,7 @@ TEST_F(ParserImplTest, DepthTextureType_Cube) { TEST_F(ParserImplTest, DepthTextureType_CubeArray) { auto p = parser("texture_depth_cube_array"); - auto t = p->depth_texture_type(); + auto t = p->depth_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); ASSERT_NE(t.value, nullptr); @@ -80,7 +80,7 @@ TEST_F(ParserImplTest, DepthTextureType_CubeArray) { TEST_F(ParserImplTest, DepthTextureType_Multisampled2d) { auto p = parser("texture_depth_multisampled_2d"); - auto t = p->depth_texture_type(); + auto t = p->depth_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); ASSERT_NE(t.value, nullptr); diff --git a/src/tint/reader/wgsl/parser_impl_external_texture_type_test.cc b/src/tint/reader/wgsl/parser_impl_external_texture_test.cc similarity index 93% rename from src/tint/reader/wgsl/parser_impl_external_texture_type_test.cc rename to src/tint/reader/wgsl/parser_impl_external_texture_test.cc index b567634d26..d5c881340f 100644 --- a/src/tint/reader/wgsl/parser_impl_external_texture_type_test.cc +++ b/src/tint/reader/wgsl/parser_impl_external_texture_test.cc @@ -19,7 +19,7 @@ namespace { TEST_F(ParserImplTest, ExternalTextureType_Invalid) { auto p = parser("1234"); - auto t = p->external_texture_type(); + auto t = p->external_texture(); EXPECT_FALSE(t.matched); EXPECT_FALSE(t.errored); EXPECT_FALSE(p->has_error()); @@ -27,7 +27,7 @@ TEST_F(ParserImplTest, ExternalTextureType_Invalid) { TEST_F(ParserImplTest, ExternalTextureType) { auto p = parser("texture_external"); - auto t = p->external_texture_type(); + auto t = p->external_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value->source.range, (Source::Range{{1u, 1u}, {1u, 17u}})); diff --git a/src/tint/reader/wgsl/parser_impl_sampled_texture_type_test.cc b/src/tint/reader/wgsl/parser_impl_sampled_texture_test.cc similarity index 89% rename from src/tint/reader/wgsl/parser_impl_sampled_texture_type_test.cc rename to src/tint/reader/wgsl/parser_impl_sampled_texture_test.cc index a48c32ce53..75d722f8a1 100644 --- a/src/tint/reader/wgsl/parser_impl_sampled_texture_type_test.cc +++ b/src/tint/reader/wgsl/parser_impl_sampled_texture_test.cc @@ -19,7 +19,7 @@ namespace { TEST_F(ParserImplTest, SampledTextureType_Invalid) { auto p = parser("1234"); - auto t = p->sampled_texture_type(); + auto t = p->sampled_texture(); EXPECT_FALSE(t.matched); EXPECT_FALSE(t.errored); EXPECT_FALSE(p->has_error()); @@ -27,7 +27,7 @@ TEST_F(ParserImplTest, SampledTextureType_Invalid) { TEST_F(ParserImplTest, SampledTextureType_1d) { auto p = parser("texture_1d"); - auto t = p->sampled_texture_type(); + auto t = p->sampled_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::k1d); @@ -36,7 +36,7 @@ TEST_F(ParserImplTest, SampledTextureType_1d) { TEST_F(ParserImplTest, SampledTextureType_2d) { auto p = parser("texture_2d"); - auto t = p->sampled_texture_type(); + auto t = p->sampled_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::k2d); @@ -45,7 +45,7 @@ TEST_F(ParserImplTest, SampledTextureType_2d) { TEST_F(ParserImplTest, SampledTextureType_2dArray) { auto p = parser("texture_2d_array"); - auto t = p->sampled_texture_type(); + auto t = p->sampled_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::k2dArray); @@ -54,7 +54,7 @@ TEST_F(ParserImplTest, SampledTextureType_2dArray) { TEST_F(ParserImplTest, SampledTextureType_3d) { auto p = parser("texture_3d"); - auto t = p->sampled_texture_type(); + auto t = p->sampled_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::k3d); @@ -63,7 +63,7 @@ TEST_F(ParserImplTest, SampledTextureType_3d) { TEST_F(ParserImplTest, SampledTextureType_Cube) { auto p = parser("texture_cube"); - auto t = p->sampled_texture_type(); + auto t = p->sampled_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::kCube); @@ -72,7 +72,7 @@ TEST_F(ParserImplTest, SampledTextureType_Cube) { TEST_F(ParserImplTest, SampledTextureType_kCubeArray) { auto p = parser("texture_cube_array"); - auto t = p->sampled_texture_type(); + auto t = p->sampled_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::kCubeArray); diff --git a/src/tint/reader/wgsl/parser_impl_sampler_type_test.cc b/src/tint/reader/wgsl/parser_impl_sampler_test.cc similarity index 94% rename from src/tint/reader/wgsl/parser_impl_sampler_type_test.cc rename to src/tint/reader/wgsl/parser_impl_sampler_test.cc index 230d58b2dc..296070f079 100644 --- a/src/tint/reader/wgsl/parser_impl_sampler_type_test.cc +++ b/src/tint/reader/wgsl/parser_impl_sampler_test.cc @@ -19,7 +19,7 @@ namespace { TEST_F(ParserImplTest, SamplerType_Invalid) { auto p = parser("1234"); - auto t = p->sampler_type(); + auto t = p->sampler(); EXPECT_FALSE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, nullptr); @@ -28,7 +28,7 @@ TEST_F(ParserImplTest, SamplerType_Invalid) { TEST_F(ParserImplTest, SamplerType_Sampler) { auto p = parser("sampler"); - auto t = p->sampler_type(); + auto t = p->sampler(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); ASSERT_NE(t.value, nullptr); @@ -40,7 +40,7 @@ TEST_F(ParserImplTest, SamplerType_Sampler) { TEST_F(ParserImplTest, SamplerType_ComparisonSampler) { auto p = parser("sampler_comparison"); - auto t = p->sampler_type(); + auto t = p->sampler(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); ASSERT_NE(t.value, nullptr); diff --git a/src/tint/reader/wgsl/parser_impl_storage_texture_type_test.cc b/src/tint/reader/wgsl/parser_impl_storage_texture_test.cc similarity index 90% rename from src/tint/reader/wgsl/parser_impl_storage_texture_type_test.cc rename to src/tint/reader/wgsl/parser_impl_storage_texture_test.cc index 8991198150..92fe07f174 100644 --- a/src/tint/reader/wgsl/parser_impl_storage_texture_type_test.cc +++ b/src/tint/reader/wgsl/parser_impl_storage_texture_test.cc @@ -19,7 +19,7 @@ namespace { TEST_F(ParserImplTest, StorageTextureType_Invalid) { auto p = parser("abc"); - auto t = p->storage_texture_type(); + auto t = p->storage_texture(); EXPECT_FALSE(t.matched); EXPECT_FALSE(t.errored); EXPECT_FALSE(p->has_error()); @@ -27,7 +27,7 @@ TEST_F(ParserImplTest, StorageTextureType_Invalid) { TEST_F(ParserImplTest, StorageTextureType_1d) { auto p = parser("texture_storage_1d"); - auto t = p->storage_texture_type(); + auto t = p->storage_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::k1d); @@ -36,7 +36,7 @@ TEST_F(ParserImplTest, StorageTextureType_1d) { TEST_F(ParserImplTest, StorageTextureType_2d) { auto p = parser("texture_storage_2d"); - auto t = p->storage_texture_type(); + auto t = p->storage_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::k2d); @@ -45,7 +45,7 @@ TEST_F(ParserImplTest, StorageTextureType_2d) { TEST_F(ParserImplTest, StorageTextureType_2dArray) { auto p = parser("texture_storage_2d_array"); - auto t = p->storage_texture_type(); + auto t = p->storage_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::k2dArray); @@ -54,7 +54,7 @@ TEST_F(ParserImplTest, StorageTextureType_2dArray) { TEST_F(ParserImplTest, StorageTextureType_3d) { auto p = parser("texture_storage_3d"); - auto t = p->storage_texture_type(); + auto t = p->storage_texture(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); EXPECT_EQ(t.value, ast::TextureDimension::k3d); diff --git a/src/tint/reader/wgsl/parser_impl_texture_sampler_types_test.cc b/src/tint/reader/wgsl/parser_impl_texture_sampler_test.cc similarity index 90% rename from src/tint/reader/wgsl/parser_impl_texture_sampler_types_test.cc rename to src/tint/reader/wgsl/parser_impl_texture_sampler_test.cc index 25a06988e3..206260da35 100644 --- a/src/tint/reader/wgsl/parser_impl_texture_sampler_types_test.cc +++ b/src/tint/reader/wgsl/parser_impl_texture_sampler_test.cc @@ -13,16 +13,16 @@ // limitations under the License. #include "src/tint/reader/wgsl/parser_impl_test_helper.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" namespace tint::reader::wgsl { namespace { TEST_F(ParserImplTest, TextureSamplerTypes_Invalid) { auto p = parser("1234"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); EXPECT_FALSE(t.errored); @@ -31,7 +31,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_Invalid) { TEST_F(ParserImplTest, TextureSamplerTypes_Sampler) { auto p = parser("sampler"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_FALSE(p->has_error()) << p->error(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); @@ -43,7 +43,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_Sampler) { TEST_F(ParserImplTest, TextureSamplerTypes_SamplerComparison) { auto p = parser("sampler_comparison"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_FALSE(p->has_error()) << p->error(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); @@ -55,7 +55,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SamplerComparison) { TEST_F(ParserImplTest, TextureSamplerTypes_DepthTexture) { auto p = parser("texture_depth_2d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_FALSE(p->has_error()) << p->error(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); @@ -68,7 +68,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_DepthTexture) { TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_F32) { auto p = parser("texture_1d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_FALSE(p->has_error()) << p->error(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); @@ -82,7 +82,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_F32) { TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_I32) { auto p = parser("texture_2d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_FALSE(p->has_error()) << p->error(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); @@ -96,7 +96,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_I32) { TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_U32) { auto p = parser("texture_3d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_FALSE(p->has_error()) << p->error(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); @@ -110,7 +110,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_U32) { TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingType) { auto p = parser("texture_1d<>"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_TRUE(p->has_error()); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); @@ -120,7 +120,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingType) { TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingLessThan) { auto p = parser("texture_1d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_TRUE(p->has_error()); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); @@ -130,7 +130,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingLessThan) { TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingGreaterThan) { auto p = parser("texture_1dtexture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_TRUE(p->has_error()); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); @@ -140,7 +140,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingGreaterThan) { TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_I32) { auto p = parser("texture_multisampled_2d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_FALSE(p->has_error()) << p->error(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); @@ -154,7 +154,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_I32) { TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_MissingType) { auto p = parser("texture_multisampled_2d<>"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_TRUE(p->has_error()); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); @@ -165,7 +165,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_MissingType) { TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_MissingLessThan) { auto p = parser("texture_multisampled_2d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); EXPECT_TRUE(t.errored); @@ -175,7 +175,7 @@ TEST_F(ParserImplTest, TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_MissingGreaterThan) { auto p = parser("texture_multisampled_2dtexture_sampler_types(); + auto t = p->texture_samplers(); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); EXPECT_TRUE(t.errored); @@ -184,7 +184,7 @@ TEST_F(ParserImplTest, TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_Readonly1dRg32Float) { auto p = parser("texture_storage_1d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_FALSE(p->has_error()) << p->error(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); @@ -200,7 +200,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_Readonly1dRg32Float) { TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_Writeonly2dR32Uint) { auto p = parser("texture_storage_2d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); ASSERT_FALSE(p->has_error()) << p->error(); EXPECT_TRUE(t.matched); EXPECT_FALSE(t.errored); @@ -216,7 +216,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_Writeonly2dR32Uint) { TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_InvalidType) { auto p = parser("texture_storage_1d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); EXPECT_TRUE(t.errored); @@ -225,7 +225,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_InvalidType) { TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_InvalidAccess) { auto p = parser("texture_storage_1d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); EXPECT_TRUE(t.errored); @@ -234,7 +234,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_InvalidAccess) { TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingType) { auto p = parser("texture_storage_1d<>"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); EXPECT_TRUE(t.errored); @@ -243,7 +243,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingType) { TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingLessThan) { auto p = parser("texture_storage_1d"); - auto t = p->texture_sampler_types(); + auto t = p->texture_samplers(); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); EXPECT_TRUE(t.errored); @@ -252,7 +252,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingLessThan) { TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingGreaterThan) { auto p = parser("texture_storage_1dtexture_sampler_types(); + auto t = p->texture_samplers(); EXPECT_EQ(t.value, nullptr); EXPECT_FALSE(t.matched); EXPECT_TRUE(t.errored); diff --git a/src/tint/reader/wgsl/parser_impl_type_decl_test.cc b/src/tint/reader/wgsl/parser_impl_type_decl_test.cc index f649a268d1..905ded5133 100644 --- a/src/tint/reader/wgsl/parser_impl_type_decl_test.cc +++ b/src/tint/reader/wgsl/parser_impl_type_decl_test.cc @@ -17,7 +17,7 @@ #include "src/tint/ast/matrix.h" #include "src/tint/ast/sampler.h" #include "src/tint/reader/wgsl/parser_impl_test_helper.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/sampled_texture.h" namespace tint::reader::wgsl { namespace { diff --git a/src/tint/resolver/array_accessor_test.cc b/src/tint/resolver/array_accessor_test.cc index eeae5ad412..87e28c8293 100644 --- a/src/tint/resolver/array_accessor_test.cc +++ b/src/tint/resolver/array_accessor_test.cc @@ -16,7 +16,7 @@ #include "gmock/gmock.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" namespace tint::resolver { namespace { diff --git a/src/tint/resolver/assignment_validation_test.cc b/src/tint/resolver/assignment_validation_test.cc index ad5ad5099f..bfb4361add 100644 --- a/src/tint/resolver/assignment_validation_test.cc +++ b/src/tint/resolver/assignment_validation_test.cc @@ -16,7 +16,7 @@ #include "gmock/gmock.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" namespace tint::resolver { namespace { diff --git a/src/tint/resolver/atomics_test.cc b/src/tint/resolver/atomics_test.cc index 02f800dd05..5c9106692e 100644 --- a/src/tint/resolver/atomics_test.cc +++ b/src/tint/resolver/atomics_test.cc @@ -14,8 +14,8 @@ #include "src/tint/resolver/resolver.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/atomic_type.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/atomic.h" +#include "src/tint/sem/reference.h" #include "gmock/gmock.h" diff --git a/src/tint/resolver/atomics_validation_test.cc b/src/tint/resolver/atomics_validation_test.cc index 5e9668f482..cb3dd964aa 100644 --- a/src/tint/resolver/atomics_validation_test.cc +++ b/src/tint/resolver/atomics_validation_test.cc @@ -14,8 +14,8 @@ #include "src/tint/resolver/resolver.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/atomic_type.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/atomic.h" +#include "src/tint/sem/reference.h" #include "gmock/gmock.h" diff --git a/src/tint/resolver/builtin_test.cc b/src/tint/resolver/builtin_test.cc index 732e70704d..64bb60aa5a 100644 --- a/src/tint/resolver/builtin_test.cc +++ b/src/tint/resolver/builtin_test.cc @@ -32,7 +32,7 @@ #include "src/tint/sem/call.h" #include "src/tint/sem/function.h" #include "src/tint/sem/member_accessor_expression.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/statement.h" #include "src/tint/sem/variable.h" diff --git a/src/tint/resolver/compound_assignment_validation_test.cc b/src/tint/resolver/compound_assignment_validation_test.cc index 4fb972cfee..c28a489ede 100644 --- a/src/tint/resolver/compound_assignment_validation_test.cc +++ b/src/tint/resolver/compound_assignment_validation_test.cc @@ -16,7 +16,7 @@ #include "gmock/gmock.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" namespace tint::resolver { namespace { diff --git a/src/tint/resolver/is_host_shareable_test.cc b/src/tint/resolver/is_host_shareable_test.cc index df28e72db2..fbd6728a95 100644 --- a/src/tint/resolver/is_host_shareable_test.cc +++ b/src/tint/resolver/is_host_shareable_test.cc @@ -16,7 +16,7 @@ #include "gmock/gmock.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" namespace tint::resolver { namespace { diff --git a/src/tint/resolver/is_storeable_test.cc b/src/tint/resolver/is_storeable_test.cc index c9691f7d49..23f798dce6 100644 --- a/src/tint/resolver/is_storeable_test.cc +++ b/src/tint/resolver/is_storeable_test.cc @@ -16,7 +16,7 @@ #include "gmock/gmock.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" namespace tint::resolver { namespace { diff --git a/src/tint/resolver/ptr_ref_test.cc b/src/tint/resolver/ptr_ref_test.cc index f6851b5983..36273b35e7 100644 --- a/src/tint/resolver/ptr_ref_test.cc +++ b/src/tint/resolver/ptr_ref_test.cc @@ -14,7 +14,7 @@ #include "src/tint/resolver/resolver.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "gmock/gmock.h" diff --git a/src/tint/resolver/ptr_ref_validation_test.cc b/src/tint/resolver/ptr_ref_validation_test.cc index 3331cfb4eb..6c0a76ad41 100644 --- a/src/tint/resolver/ptr_ref_validation_test.cc +++ b/src/tint/resolver/ptr_ref_validation_test.cc @@ -15,7 +15,7 @@ #include "src/tint/ast/bitcast_expression.h" #include "src/tint/resolver/resolver.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "gmock/gmock.h" diff --git a/src/tint/resolver/resolver.cc b/src/tint/resolver/resolver.cc index 21f4bf084c..483b9a9256 100644 --- a/src/tint/resolver/resolver.cc +++ b/src/tint/resolver/resolver.cc @@ -51,23 +51,23 @@ #include "src/tint/ast/vector.h" #include "src/tint/ast/workgroup_attribute.h" #include "src/tint/sem/array.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/sem/call.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/depth_texture_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/depth_texture.h" #include "src/tint/sem/for_loop_statement.h" #include "src/tint/sem/function.h" #include "src/tint/sem/if_statement.h" #include "src/tint/sem/loop_statement.h" #include "src/tint/sem/member_accessor_expression.h" #include "src/tint/sem/module.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/pointer_type.h" -#include "src/tint/sem/reference_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/sampler_type.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/pointer.h" +#include "src/tint/sem/reference.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/sampler.h" #include "src/tint/sem/statement.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/struct.h" #include "src/tint/sem/switch_statement.h" #include "src/tint/sem/type_constructor.h" diff --git a/src/tint/resolver/resolver_is_storeable_test.cc b/src/tint/resolver/resolver_is_storeable_test.cc index de180a33e0..7c2de642c6 100644 --- a/src/tint/resolver/resolver_is_storeable_test.cc +++ b/src/tint/resolver/resolver_is_storeable_test.cc @@ -16,7 +16,7 @@ #include "gmock/gmock.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" namespace tint::resolver { namespace { diff --git a/src/tint/resolver/resolver_test.cc b/src/tint/resolver/resolver_test.cc index 1387d654a7..ef4d927098 100644 --- a/src/tint/resolver/resolver_test.cc +++ b/src/tint/resolver/resolver_test.cc @@ -39,8 +39,8 @@ #include "src/tint/sem/function.h" #include "src/tint/sem/member_accessor_expression.h" #include "src/tint/sem/module.h" -#include "src/tint/sem/reference_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/reference.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/statement.h" #include "src/tint/sem/variable.h" diff --git a/src/tint/resolver/type_constructor_validation_test.cc b/src/tint/resolver/type_constructor_validation_test.cc index 07bc95e86c..4782147b68 100644 --- a/src/tint/resolver/type_constructor_validation_test.cc +++ b/src/tint/resolver/type_constructor_validation_test.cc @@ -14,7 +14,7 @@ #include "gmock/gmock.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "src/tint/sem/type_constructor.h" #include "src/tint/sem/type_conversion.h" diff --git a/src/tint/resolver/type_validation_test.cc b/src/tint/resolver/type_validation_test.cc index e74f0c8ea9..45b879355d 100644 --- a/src/tint/resolver/type_validation_test.cc +++ b/src/tint/resolver/type_validation_test.cc @@ -17,8 +17,8 @@ #include "src/tint/ast/stage_attribute.h" #include "src/tint/resolver/resolver.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/storage_texture.h" #include "gmock/gmock.h" diff --git a/src/tint/resolver/validation_test.cc b/src/tint/resolver/validation_test.cc index 4d458af951..15f9418134 100644 --- a/src/tint/resolver/validation_test.cc +++ b/src/tint/resolver/validation_test.cc @@ -34,7 +34,7 @@ #include "src/tint/sem/call.h" #include "src/tint/sem/function.h" #include "src/tint/sem/member_accessor_expression.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/statement.h" #include "src/tint/sem/variable.h" diff --git a/src/tint/resolver/validator.cc b/src/tint/resolver/validator.cc index 365fb2553a..22ecb976e7 100644 --- a/src/tint/resolver/validator.cc +++ b/src/tint/resolver/validator.cc @@ -49,22 +49,22 @@ #include "src/tint/ast/vector.h" #include "src/tint/ast/workgroup_attribute.h" #include "src/tint/sem/array.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/sem/call.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/depth_texture_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/depth_texture.h" #include "src/tint/sem/for_loop_statement.h" #include "src/tint/sem/function.h" #include "src/tint/sem/if_statement.h" #include "src/tint/sem/loop_statement.h" #include "src/tint/sem/member_accessor_expression.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/pointer_type.h" -#include "src/tint/sem/reference_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/sampler_type.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/pointer.h" +#include "src/tint/sem/reference.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/sampler.h" #include "src/tint/sem/statement.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/struct.h" #include "src/tint/sem/switch_statement.h" #include "src/tint/sem/type_constructor.h" diff --git a/src/tint/resolver/validator_is_storeable_test.cc b/src/tint/resolver/validator_is_storeable_test.cc index b3d6954f40..3c82a727b7 100644 --- a/src/tint/resolver/validator_is_storeable_test.cc +++ b/src/tint/resolver/validator_is_storeable_test.cc @@ -16,7 +16,7 @@ #include "gmock/gmock.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" namespace tint::resolver { namespace { diff --git a/src/tint/resolver/var_let_test.cc b/src/tint/resolver/var_let_test.cc index c3c36f24b1..26f4cbcb07 100644 --- a/src/tint/resolver/var_let_test.cc +++ b/src/tint/resolver/var_let_test.cc @@ -14,7 +14,7 @@ #include "src/tint/resolver/resolver.h" #include "src/tint/resolver/resolver_test_helper.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "gmock/gmock.h" diff --git a/src/tint/sem/atomic_type.cc b/src/tint/sem/atomic.cc similarity index 95% rename from src/tint/sem/atomic_type.cc rename to src/tint/sem/atomic.cc index 6376a7baac..030be7b66c 100644 --- a/src/tint/sem/atomic_type.cc +++ b/src/tint/sem/atomic.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/program_builder.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "src/tint/utils/hash.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::Atomic); diff --git a/src/tint/sem/atomic_type.h b/src/tint/sem/atomic.h similarity index 94% rename from src/tint/sem/atomic_type.h rename to src/tint/sem/atomic.h index e0dcb15396..0bc98080c7 100644 --- a/src/tint/sem/atomic_type.h +++ b/src/tint/sem/atomic.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_ATOMIC_TYPE_H_ -#define SRC_TINT_SEM_ATOMIC_TYPE_H_ +#ifndef SRC_TINT_SEM_ATOMIC_H_ +#define SRC_TINT_SEM_ATOMIC_H_ #include @@ -63,4 +63,4 @@ class Atomic final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_ATOMIC_TYPE_H_ +#endif // SRC_TINT_SEM_ATOMIC_H_ diff --git a/src/tint/sem/atomic_type_test.cc b/src/tint/sem/atomic_test.cc similarity index 97% rename from src/tint/sem/atomic_type_test.cc rename to src/tint/sem/atomic_test.cc index 15aa484ce6..9dfbc6f79d 100644 --- a/src/tint/sem/atomic_type_test.cc +++ b/src/tint/sem/atomic_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/sem/test_helper.h" diff --git a/src/tint/sem/bool_type.cc b/src/tint/sem/bool.cc similarity index 97% rename from src/tint/sem/bool_type.cc rename to src/tint/sem/bool.cc index 7a20768d43..ab4c7e4104 100644 --- a/src/tint/sem/bool_type.cc +++ b/src/tint/sem/bool.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/bool_type.h" +#include "src/tint/sem/bool.h" #include "src/tint/program_builder.h" diff --git a/src/tint/sem/bool_type.h b/src/tint/sem/bool.h similarity index 94% rename from src/tint/sem/bool_type.h rename to src/tint/sem/bool.h index 9e949bdfe4..40845954e2 100644 --- a/src/tint/sem/bool_type.h +++ b/src/tint/sem/bool.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_BOOL_TYPE_H_ -#define SRC_TINT_SEM_BOOL_TYPE_H_ +#ifndef SRC_TINT_SEM_BOOL_H_ +#define SRC_TINT_SEM_BOOL_H_ #include @@ -65,4 +65,4 @@ class Bool final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_BOOL_TYPE_H_ +#endif // SRC_TINT_SEM_BOOL_H_ diff --git a/src/tint/sem/bool_type_test.cc b/src/tint/sem/bool_test.cc similarity index 96% rename from src/tint/sem/bool_type_test.cc rename to src/tint/sem/bool_test.cc index 390de43f1a..0962cdb672 100644 --- a/src/tint/sem/bool_type_test.cc +++ b/src/tint/sem/bool_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/call_target.h b/src/tint/sem/call_target.h index 01650eb3de..b4d89672f2 100644 --- a/src/tint/sem/call_target.h +++ b/src/tint/sem/call_target.h @@ -18,7 +18,7 @@ #include #include "src/tint/sem/node.h" -#include "src/tint/sem/sampler_type.h" +#include "src/tint/sem/sampler.h" #include "src/tint/sem/variable.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/sem/depth_multisampled_texture_type.cc b/src/tint/sem/depth_multisampled_texture.cc similarity index 96% rename from src/tint/sem/depth_multisampled_texture_type.cc rename to src/tint/sem/depth_multisampled_texture.cc index bb5b8a7747..32154f8c5b 100644 --- a/src/tint/sem/depth_multisampled_texture_type.cc +++ b/src/tint/sem/depth_multisampled_texture.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/depth_multisampled_texture_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" #include "src/tint/program_builder.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/sem/depth_multisampled_texture_type.h b/src/tint/sem/depth_multisampled_texture.h similarity index 87% rename from src/tint/sem/depth_multisampled_texture_type.h rename to src/tint/sem/depth_multisampled_texture.h index de234176b1..b6d662f470 100644 --- a/src/tint/sem/depth_multisampled_texture_type.h +++ b/src/tint/sem/depth_multisampled_texture.h @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_DEPTH_MULTISAMPLED_TEXTURE_TYPE_H_ -#define SRC_TINT_SEM_DEPTH_MULTISAMPLED_TEXTURE_TYPE_H_ +#ifndef SRC_TINT_SEM_DEPTH_MULTISAMPLED_TEXTURE_H_ +#define SRC_TINT_SEM_DEPTH_MULTISAMPLED_TEXTURE_H_ #include -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { @@ -47,4 +47,4 @@ class DepthMultisampledTexture final } // namespace tint::sem -#endif // SRC_TINT_SEM_DEPTH_MULTISAMPLED_TEXTURE_TYPE_H_ +#endif // SRC_TINT_SEM_DEPTH_MULTISAMPLED_TEXTURE_H_ diff --git a/src/tint/sem/depth_multisampled_texture_type_test.cc b/src/tint/sem/depth_multisampled_texture_test.cc similarity index 90% rename from src/tint/sem/depth_multisampled_texture_type_test.cc rename to src/tint/sem/depth_multisampled_texture_test.cc index ea92986384..af6172b1bd 100644 --- a/src/tint/sem/depth_multisampled_texture_type_test.cc +++ b/src/tint/sem/depth_multisampled_texture_test.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/depth_multisampled_texture_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/storage_texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/depth_texture_type.cc b/src/tint/sem/depth_texture.cc similarity index 97% rename from src/tint/sem/depth_texture_type.cc rename to src/tint/sem/depth_texture.cc index 1ff0060427..db191af9fe 100644 --- a/src/tint/sem/depth_texture_type.cc +++ b/src/tint/sem/depth_texture.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/depth_texture_type.h" +#include "src/tint/sem/depth_texture.h" #include "src/tint/program_builder.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/sem/depth_texture_type.h b/src/tint/sem/depth_texture.h similarity index 89% rename from src/tint/sem/depth_texture_type.h rename to src/tint/sem/depth_texture.h index 0f257857d9..95bbdab190 100644 --- a/src/tint/sem/depth_texture_type.h +++ b/src/tint/sem/depth_texture.h @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_DEPTH_TEXTURE_TYPE_H_ -#define SRC_TINT_SEM_DEPTH_TEXTURE_TYPE_H_ +#ifndef SRC_TINT_SEM_DEPTH_TEXTURE_H_ +#define SRC_TINT_SEM_DEPTH_TEXTURE_H_ #include -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { @@ -46,4 +46,4 @@ class DepthTexture final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_DEPTH_TEXTURE_TYPE_H_ +#endif // SRC_TINT_SEM_DEPTH_TEXTURE_H_ diff --git a/src/tint/sem/depth_texture_type_test.cc b/src/tint/sem/depth_texture_test.cc similarity index 92% rename from src/tint/sem/depth_texture_type_test.cc rename to src/tint/sem/depth_texture_test.cc index 28bb84ad03..bdd265a05f 100644 --- a/src/tint/sem/depth_texture_type_test.cc +++ b/src/tint/sem/depth_texture_test.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/depth_texture_type.h" +#include "src/tint/sem/depth_texture.h" #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/storage_texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/external_texture_type.cc b/src/tint/sem/external_texture.cc similarity index 96% rename from src/tint/sem/external_texture_type.cc rename to src/tint/sem/external_texture.cc index adfd3734d5..ad5d53c33b 100644 --- a/src/tint/sem/external_texture_type.cc +++ b/src/tint/sem/external_texture.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/external_texture_type.h" +#include "src/tint/sem/external_texture.h" #include "src/tint/program_builder.h" diff --git a/src/tint/sem/external_texture_type.h b/src/tint/sem/external_texture.h similarity index 88% rename from src/tint/sem/external_texture_type.h rename to src/tint/sem/external_texture.h index 4a070054e2..5117c74086 100644 --- a/src/tint/sem/external_texture_type.h +++ b/src/tint/sem/external_texture.h @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_EXTERNAL_TEXTURE_TYPE_H_ -#define SRC_TINT_SEM_EXTERNAL_TEXTURE_TYPE_H_ +#ifndef SRC_TINT_SEM_EXTERNAL_TEXTURE_H_ +#define SRC_TINT_SEM_EXTERNAL_TEXTURE_H_ #include -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { @@ -46,4 +46,4 @@ class ExternalTexture final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_EXTERNAL_TEXTURE_TYPE_H_ +#endif // SRC_TINT_SEM_EXTERNAL_TEXTURE_H_ diff --git a/src/tint/sem/external_texture_type_test.cc b/src/tint/sem/external_texture_test.cc similarity index 88% rename from src/tint/sem/external_texture_type_test.cc rename to src/tint/sem/external_texture_test.cc index 439b3bc006..832f5784da 100644 --- a/src/tint/sem/external_texture_type_test.cc +++ b/src/tint/sem/external_texture_test.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/external_texture_type.h" +#include "src/tint/sem/external_texture.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/test_helper.h" namespace tint::sem { diff --git a/src/tint/sem/f32_type.cc b/src/tint/sem/f32.cc similarity index 97% rename from src/tint/sem/f32_type.cc rename to src/tint/sem/f32.cc index c5b013e3d4..358da725c2 100644 --- a/src/tint/sem/f32_type.cc +++ b/src/tint/sem/f32.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/f32_type.h" +#include "src/tint/sem/f32.h" #include "src/tint/program_builder.h" diff --git a/src/tint/sem/f32_type.h b/src/tint/sem/f32.h similarity index 94% rename from src/tint/sem/f32_type.h rename to src/tint/sem/f32.h index 0d0fabf618..26f32fa17c 100644 --- a/src/tint/sem/f32_type.h +++ b/src/tint/sem/f32.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_F32_TYPE_H_ -#define SRC_TINT_SEM_F32_TYPE_H_ +#ifndef SRC_TINT_SEM_F32_H_ +#define SRC_TINT_SEM_F32_H_ #include @@ -55,4 +55,4 @@ class F32 final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_F32_TYPE_H_ +#endif // SRC_TINT_SEM_F32_H_ diff --git a/src/tint/sem/f32_type_test.cc b/src/tint/sem/f32_test.cc similarity index 96% rename from src/tint/sem/f32_type_test.cc rename to src/tint/sem/f32_test.cc index 7fd7b76a81..0fc46e8e53 100644 --- a/src/tint/sem/f32_type_test.cc +++ b/src/tint/sem/f32_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/function.cc b/src/tint/sem/function.cc index 4ffda9a91b..21eed58a52 100644 --- a/src/tint/sem/function.cc +++ b/src/tint/sem/function.cc @@ -15,11 +15,11 @@ #include "src/tint/sem/function.h" #include "src/tint/ast/function.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/variable.h" #include "src/tint/utils/to_const_ptr_vec.h" diff --git a/src/tint/sem/i32_type.cc b/src/tint/sem/i32.cc similarity index 97% rename from src/tint/sem/i32_type.cc rename to src/tint/sem/i32.cc index 0865c03b88..0c385c2464 100644 --- a/src/tint/sem/i32_type.cc +++ b/src/tint/sem/i32.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/i32_type.h" +#include "src/tint/sem/i32.h" #include "src/tint/program_builder.h" diff --git a/src/tint/sem/i32_type.h b/src/tint/sem/i32.h similarity index 94% rename from src/tint/sem/i32_type.h rename to src/tint/sem/i32.h index f6747a2340..54e22513df 100644 --- a/src/tint/sem/i32_type.h +++ b/src/tint/sem/i32.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_I32_TYPE_H_ -#define SRC_TINT_SEM_I32_TYPE_H_ +#ifndef SRC_TINT_SEM_I32_H_ +#define SRC_TINT_SEM_I32_H_ #include @@ -55,4 +55,4 @@ class I32 final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_I32_TYPE_H_ +#endif // SRC_TINT_SEM_I32_H_ diff --git a/src/tint/sem/i32_type_test.cc b/src/tint/sem/i32_test.cc similarity index 96% rename from src/tint/sem/i32_type_test.cc rename to src/tint/sem/i32_test.cc index 679331a094..8afd09d924 100644 --- a/src/tint/sem/i32_type_test.cc +++ b/src/tint/sem/i32_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/matrix_type.cc b/src/tint/sem/matrix.cc similarity index 96% rename from src/tint/sem/matrix_type.cc rename to src/tint/sem/matrix.cc index cfd9c1c486..a3c03b86ae 100644 --- a/src/tint/sem/matrix_type.cc +++ b/src/tint/sem/matrix.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/matrix_type.h" +#include "src/tint/sem/matrix.h" #include "src/tint/program_builder.h" -#include "src/tint/sem/vector_type.h" +#include "src/tint/sem/vector.h" #include "src/tint/utils/hash.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::Matrix); diff --git a/src/tint/sem/matrix_type.h b/src/tint/sem/matrix.h similarity index 95% rename from src/tint/sem/matrix_type.h rename to src/tint/sem/matrix.h index b5b96699a3..54b53c3002 100644 --- a/src/tint/sem/matrix_type.h +++ b/src/tint/sem/matrix.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_MATRIX_TYPE_H_ -#define SRC_TINT_SEM_MATRIX_TYPE_H_ +#ifndef SRC_TINT_SEM_MATRIX_H_ +#define SRC_TINT_SEM_MATRIX_H_ #include @@ -82,4 +82,4 @@ class Matrix final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_MATRIX_TYPE_H_ +#endif // SRC_TINT_SEM_MATRIX_H_ diff --git a/src/tint/sem/matrix_type_test.cc b/src/tint/sem/matrix_test.cc similarity index 98% rename from src/tint/sem/matrix_type_test.cc rename to src/tint/sem/matrix_test.cc index 52ae36b6a0..83abb662e3 100644 --- a/src/tint/sem/matrix_type_test.cc +++ b/src/tint/sem/matrix_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/multisampled_texture_type.cc b/src/tint/sem/multisampled_texture.cc similarity index 96% rename from src/tint/sem/multisampled_texture_type.cc rename to src/tint/sem/multisampled_texture.cc index 72ce2f510e..05f31498f5 100644 --- a/src/tint/sem/multisampled_texture_type.cc +++ b/src/tint/sem/multisampled_texture.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/multisampled_texture_type.h" +#include "src/tint/sem/multisampled_texture.h" #include "src/tint/program_builder.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/sem/multisampled_texture_type.h b/src/tint/sem/multisampled_texture.h similarity index 89% rename from src/tint/sem/multisampled_texture_type.h rename to src/tint/sem/multisampled_texture.h index 0e993ec74c..30779494ef 100644 --- a/src/tint/sem/multisampled_texture_type.h +++ b/src/tint/sem/multisampled_texture.h @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_MULTISAMPLED_TEXTURE_TYPE_H_ -#define SRC_TINT_SEM_MULTISAMPLED_TEXTURE_TYPE_H_ +#ifndef SRC_TINT_SEM_MULTISAMPLED_TEXTURE_H_ +#define SRC_TINT_SEM_MULTISAMPLED_TEXTURE_H_ #include -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { @@ -54,4 +54,4 @@ class MultisampledTexture final } // namespace tint::sem -#endif // SRC_TINT_SEM_MULTISAMPLED_TEXTURE_TYPE_H_ +#endif // SRC_TINT_SEM_MULTISAMPLED_TEXTURE_H_ diff --git a/src/tint/sem/multisampled_texture_type_test.cc b/src/tint/sem/multisampled_texture_test.cc similarity index 92% rename from src/tint/sem/multisampled_texture_type_test.cc rename to src/tint/sem/multisampled_texture_test.cc index eb53ccd60a..b373c08fd8 100644 --- a/src/tint/sem/multisampled_texture_type_test.cc +++ b/src/tint/sem/multisampled_texture_test.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/multisampled_texture_type.h" +#include "src/tint/sem/multisampled_texture.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/test_helper.h" namespace tint::sem { diff --git a/src/tint/sem/pointer_type.cc b/src/tint/sem/pointer.cc similarity index 95% rename from src/tint/sem/pointer_type.cc rename to src/tint/sem/pointer.cc index b1f137a542..c0cc769c9f 100644 --- a/src/tint/sem/pointer_type.cc +++ b/src/tint/sem/pointer.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/pointer_type.h" +#include "src/tint/sem/pointer.h" #include "src/tint/program_builder.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "src/tint/utils/hash.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::Pointer); diff --git a/src/tint/sem/pointer_type.h b/src/tint/sem/pointer.h similarity index 94% rename from src/tint/sem/pointer_type.h rename to src/tint/sem/pointer.h index c3697c1451..0e47f8c3fe 100644 --- a/src/tint/sem/pointer_type.h +++ b/src/tint/sem/pointer.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_POINTER_TYPE_H_ -#define SRC_TINT_SEM_POINTER_TYPE_H_ +#ifndef SRC_TINT_SEM_POINTER_H_ +#define SRC_TINT_SEM_POINTER_H_ #include @@ -67,4 +67,4 @@ class Pointer final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_POINTER_TYPE_H_ +#endif // SRC_TINT_SEM_POINTER_H_ diff --git a/src/tint/sem/pointer_type_test.cc b/src/tint/sem/pointer_test.cc similarity index 98% rename from src/tint/sem/pointer_type_test.cc rename to src/tint/sem/pointer_test.cc index 713677d230..b623c59b49 100644 --- a/src/tint/sem/pointer_type_test.cc +++ b/src/tint/sem/pointer_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/reference_type.cc b/src/tint/sem/reference.cc similarity index 97% rename from src/tint/sem/reference_type.cc rename to src/tint/sem/reference.cc index 6eaceda559..1b2c8a96be 100644 --- a/src/tint/sem/reference_type.cc +++ b/src/tint/sem/reference.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "src/tint/program_builder.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/sem/reference_type.h b/src/tint/sem/reference.h similarity index 94% rename from src/tint/sem/reference_type.h rename to src/tint/sem/reference.h index d2639a4849..bb03ee5d46 100644 --- a/src/tint/sem/reference_type.h +++ b/src/tint/sem/reference.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_REFERENCE_TYPE_H_ -#define SRC_TINT_SEM_REFERENCE_TYPE_H_ +#ifndef SRC_TINT_SEM_REFERENCE_H_ +#define SRC_TINT_SEM_REFERENCE_H_ #include @@ -67,4 +67,4 @@ class Reference final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_REFERENCE_TYPE_H_ +#endif // SRC_TINT_SEM_REFERENCE_H_ diff --git a/src/tint/sem/reference_type_test.cc b/src/tint/sem/reference_test.cc similarity index 98% rename from src/tint/sem/reference_type_test.cc rename to src/tint/sem/reference_test.cc index 9d99598c0f..6b224b1cbe 100644 --- a/src/tint/sem/reference_type_test.cc +++ b/src/tint/sem/reference_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "src/tint/sem/test_helper.h" namespace tint::sem { diff --git a/src/tint/sem/sampled_texture_type.cc b/src/tint/sem/sampled_texture.cc similarity index 97% rename from src/tint/sem/sampled_texture_type.cc rename to src/tint/sem/sampled_texture.cc index 5d9d9c5660..694a05cfe2 100644 --- a/src/tint/sem/sampled_texture_type.cc +++ b/src/tint/sem/sampled_texture.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/program_builder.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/sem/sampled_texture_type.h b/src/tint/sem/sampled_texture.h similarity index 90% rename from src/tint/sem/sampled_texture_type.h rename to src/tint/sem/sampled_texture.h index b67737e679..7b97615a04 100644 --- a/src/tint/sem/sampled_texture_type.h +++ b/src/tint/sem/sampled_texture.h @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_SAMPLED_TEXTURE_TYPE_H_ -#define SRC_TINT_SEM_SAMPLED_TEXTURE_TYPE_H_ +#ifndef SRC_TINT_SEM_SAMPLED_TEXTURE_H_ +#define SRC_TINT_SEM_SAMPLED_TEXTURE_H_ #include -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { @@ -53,4 +53,4 @@ class SampledTexture final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_SAMPLED_TEXTURE_TYPE_H_ +#endif // SRC_TINT_SEM_SAMPLED_TEXTURE_H_ diff --git a/src/tint/sem/sampled_texture_type_test.cc b/src/tint/sem/sampled_texture_test.cc similarity index 94% rename from src/tint/sem/sampled_texture_type_test.cc rename to src/tint/sem/sampled_texture_test.cc index 7ddb48206c..cc358483c7 100644 --- a/src/tint/sem/sampled_texture_type_test.cc +++ b/src/tint/sem/sampled_texture_test.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/sampled_texture.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/test_helper.h" namespace tint::sem { diff --git a/src/tint/sem/sampler_type.cc b/src/tint/sem/sampler.cc similarity index 97% rename from src/tint/sem/sampler_type.cc rename to src/tint/sem/sampler.cc index 6558a17bf3..40dc2549e7 100644 --- a/src/tint/sem/sampler_type.cc +++ b/src/tint/sem/sampler.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/sampler_type.h" +#include "src/tint/sem/sampler.h" #include "src/tint/program_builder.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/sem/sampler_type.h b/src/tint/sem/sampler.h similarity index 93% rename from src/tint/sem/sampler_type.h rename to src/tint/sem/sampler.h index d1fffab7f9..8eb4d54f4e 100644 --- a/src/tint/sem/sampler_type.h +++ b/src/tint/sem/sampler.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_SAMPLER_TYPE_H_ -#define SRC_TINT_SEM_SAMPLER_TYPE_H_ +#ifndef SRC_TINT_SEM_SAMPLER_H_ +#define SRC_TINT_SEM_SAMPLER_H_ #include @@ -58,4 +58,4 @@ class Sampler final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_SAMPLER_TYPE_H_ +#endif // SRC_TINT_SEM_SAMPLER_H_ diff --git a/src/tint/sem/sampler_type_test.cc b/src/tint/sem/sampler_test.cc similarity index 96% rename from src/tint/sem/sampler_type_test.cc rename to src/tint/sem/sampler_test.cc index edd57d20e8..3a5ed9211b 100644 --- a/src/tint/sem/sampler_type_test.cc +++ b/src/tint/sem/sampler_test.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/sampler_type.h" +#include "src/tint/sem/sampler.h" #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/sem_array_test.cc b/src/tint/sem/sem_array_test.cc index fc78f38baf..3d635b8f8a 100644 --- a/src/tint/sem/sem_array_test.cc +++ b/src/tint/sem/sem_array_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/sem_struct_test.cc b/src/tint/sem/sem_struct_test.cc index d788be991f..7750a3cde4 100644 --- a/src/tint/sem/sem_struct_test.cc +++ b/src/tint/sem/sem_struct_test.cc @@ -14,7 +14,7 @@ #include "src/tint/sem/struct.h" #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/storage_texture_type.cc b/src/tint/sem/storage_texture.cc similarity index 98% rename from src/tint/sem/storage_texture_type.cc rename to src/tint/sem/storage_texture.cc index 1b017ddbf8..61bbbefcff 100644 --- a/src/tint/sem/storage_texture_type.cc +++ b/src/tint/sem/storage_texture.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/program_builder.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/sem/storage_texture_type.h b/src/tint/sem/storage_texture.h similarity index 93% rename from src/tint/sem/storage_texture_type.h rename to src/tint/sem/storage_texture.h index 71569e7812..9b0b8e8a4f 100644 --- a/src/tint/sem/storage_texture_type.h +++ b/src/tint/sem/storage_texture.h @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_STORAGE_TEXTURE_TYPE_H_ -#define SRC_TINT_SEM_STORAGE_TEXTURE_TYPE_H_ +#ifndef SRC_TINT_SEM_STORAGE_TEXTURE_H_ +#define SRC_TINT_SEM_STORAGE_TEXTURE_H_ #include #include "src/tint/ast/access.h" #include "src/tint/ast/storage_texture.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" // Forward declarations namespace tint::sem { @@ -79,4 +79,4 @@ class StorageTexture final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_STORAGE_TEXTURE_TYPE_H_ +#endif // SRC_TINT_SEM_STORAGE_TEXTURE_H_ diff --git a/src/tint/sem/storage_texture_type_test.cc b/src/tint/sem/storage_texture_test.cc similarity index 96% rename from src/tint/sem/storage_texture_type_test.cc rename to src/tint/sem/storage_texture_test.cc index 73361ce14b..d60c9a4293 100644 --- a/src/tint/sem/storage_texture_type_test.cc +++ b/src/tint/sem/storage_texture_test.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/external_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/external_texture.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/test_helper.h" namespace tint::sem { diff --git a/src/tint/sem/texture_type.cc b/src/tint/sem/texture.cc similarity index 95% rename from src/tint/sem/texture_type.cc rename to src/tint/sem/texture.cc index e14b606c84..02fc918fe2 100644 --- a/src/tint/sem/texture_type.cc +++ b/src/tint/sem/texture.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::Texture); diff --git a/src/tint/sem/texture_type.h b/src/tint/sem/texture.h similarity index 90% rename from src/tint/sem/texture_type.h rename to src/tint/sem/texture.h index 9aa333065b..5bcccbadf0 100644 --- a/src/tint/sem/texture_type.h +++ b/src/tint/sem/texture.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_TEXTURE_TYPE_H_ -#define SRC_TINT_SEM_TEXTURE_TYPE_H_ +#ifndef SRC_TINT_SEM_TEXTURE_H_ +#define SRC_TINT_SEM_TEXTURE_H_ #include "src/tint/ast/texture.h" #include "src/tint/sem/type.h" @@ -39,4 +39,4 @@ class Texture : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_TEXTURE_TYPE_H_ +#endif // SRC_TINT_SEM_TEXTURE_H_ diff --git a/src/tint/sem/texture_type_test.cc b/src/tint/sem/texture_test.cc similarity index 94% rename from src/tint/sem/texture_type_test.cc rename to src/tint/sem/texture_test.cc index 8737415d92..e6d4702bc6 100644 --- a/src/tint/sem/texture_type_test.cc +++ b/src/tint/sem/texture_test.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/test_helper.h" namespace tint::sem { diff --git a/src/tint/sem/type.cc b/src/tint/sem/type.cc index f8c32e7ad1..b4afa08f56 100644 --- a/src/tint/sem/type.cc +++ b/src/tint/sem/type.cc @@ -14,16 +14,16 @@ #include "src/tint/sem/type.h" -#include "src/tint/sem/bool_type.h" -#include "src/tint/sem/f32_type.h" -#include "src/tint/sem/i32_type.h" -#include "src/tint/sem/matrix_type.h" -#include "src/tint/sem/pointer_type.h" -#include "src/tint/sem/reference_type.h" -#include "src/tint/sem/sampler_type.h" -#include "src/tint/sem/texture_type.h" -#include "src/tint/sem/u32_type.h" -#include "src/tint/sem/vector_type.h" +#include "src/tint/sem/bool.h" +#include "src/tint/sem/f32.h" +#include "src/tint/sem/i32.h" +#include "src/tint/sem/matrix.h" +#include "src/tint/sem/pointer.h" +#include "src/tint/sem/reference.h" +#include "src/tint/sem/sampler.h" +#include "src/tint/sem/texture.h" +#include "src/tint/sem/u32.h" +#include "src/tint/sem/vector.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::Type); diff --git a/src/tint/sem/type_manager_test.cc b/src/tint/sem/type_manager_test.cc index 6cbea9be92..c86c8f6ae1 100644 --- a/src/tint/sem/type_manager_test.cc +++ b/src/tint/sem/type_manager_test.cc @@ -15,8 +15,8 @@ #include "src/tint/sem/type_manager.h" #include "gtest/gtest.h" -#include "src/tint/sem/i32_type.h" -#include "src/tint/sem/u32_type.h" +#include "src/tint/sem/i32.h" +#include "src/tint/sem/u32.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/u32_type.cc b/src/tint/sem/u32.cc similarity index 97% rename from src/tint/sem/u32_type.cc rename to src/tint/sem/u32.cc index f73b61756b..eef196d124 100644 --- a/src/tint/sem/u32_type.cc +++ b/src/tint/sem/u32.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/u32_type.h" +#include "src/tint/sem/u32.h" #include "src/tint/program_builder.h" diff --git a/src/tint/sem/u32_type.h b/src/tint/sem/u32.h similarity index 94% rename from src/tint/sem/u32_type.h rename to src/tint/sem/u32.h index d81886c96a..7040b0e07f 100644 --- a/src/tint/sem/u32_type.h +++ b/src/tint/sem/u32.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_U32_TYPE_H_ -#define SRC_TINT_SEM_U32_TYPE_H_ +#ifndef SRC_TINT_SEM_U32_H_ +#define SRC_TINT_SEM_U32_H_ #include @@ -55,4 +55,4 @@ class U32 final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_U32_TYPE_H_ +#endif // SRC_TINT_SEM_U32_H_ diff --git a/src/tint/sem/u32_type_test.cc b/src/tint/sem/u32_test.cc similarity index 96% rename from src/tint/sem/u32_type_test.cc rename to src/tint/sem/u32_test.cc index dae4c422f3..fffce2287b 100644 --- a/src/tint/sem/u32_type_test.cc +++ b/src/tint/sem/u32_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/vector_type.cc b/src/tint/sem/vector.cc similarity index 98% rename from src/tint/sem/vector_type.cc rename to src/tint/sem/vector.cc index 1df39457f8..79cc255869 100644 --- a/src/tint/sem/vector_type.cc +++ b/src/tint/sem/vector.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/vector_type.h" +#include "src/tint/sem/vector.h" #include "src/tint/program_builder.h" #include "src/tint/utils/hash.h" diff --git a/src/tint/sem/vector_type.h b/src/tint/sem/vector.h similarity index 95% rename from src/tint/sem/vector_type.h rename to src/tint/sem/vector.h index 4542c5b982..90a304b1d4 100644 --- a/src/tint/sem/vector_type.h +++ b/src/tint/sem/vector.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_VECTOR_TYPE_H_ -#define SRC_TINT_SEM_VECTOR_TYPE_H_ +#ifndef SRC_TINT_SEM_VECTOR_H_ +#define SRC_TINT_SEM_VECTOR_H_ #include @@ -76,4 +76,4 @@ class Vector final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_VECTOR_TYPE_H_ +#endif // SRC_TINT_SEM_VECTOR_H_ diff --git a/src/tint/sem/vector_type_test.cc b/src/tint/sem/vector_test.cc similarity index 98% rename from src/tint/sem/vector_type_test.cc rename to src/tint/sem/vector_test.cc index 4d5391807c..e12112b01e 100644 --- a/src/tint/sem/vector_type_test.cc +++ b/src/tint/sem/vector_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "src/tint/sem/test_helper.h" -#include "src/tint/sem/texture_type.h" +#include "src/tint/sem/texture.h" namespace tint::sem { namespace { diff --git a/src/tint/sem/void_type.cc b/src/tint/sem/void.cc similarity index 96% rename from src/tint/sem/void_type.cc rename to src/tint/sem/void.cc index 6dae92132b..44d0e603f0 100644 --- a/src/tint/sem/void_type.cc +++ b/src/tint/sem/void.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/void_type.h" +#include "src/tint/sem/void.h" #include "src/tint/program_builder.h" diff --git a/src/tint/sem/void_type.h b/src/tint/sem/void.h similarity index 92% rename from src/tint/sem/void_type.h rename to src/tint/sem/void.h index 1131cb8df1..8c22a15f88 100644 --- a/src/tint/sem/void_type.h +++ b/src/tint/sem/void.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef SRC_TINT_SEM_VOID_TYPE_H_ -#define SRC_TINT_SEM_VOID_TYPE_H_ +#ifndef SRC_TINT_SEM_VOID_H_ +#define SRC_TINT_SEM_VOID_H_ #include @@ -45,4 +45,4 @@ class Void final : public Castable { } // namespace tint::sem -#endif // SRC_TINT_SEM_VOID_TYPE_H_ +#endif // SRC_TINT_SEM_VOID_H_ diff --git a/src/tint/transform/decompose_memory_access.cc b/src/tint/transform/decompose_memory_access.cc index 699eeb4fbc..a357c9381b 100644 --- a/src/tint/transform/decompose_memory_access.cc +++ b/src/tint/transform/decompose_memory_access.cc @@ -27,10 +27,10 @@ #include "src/tint/ast/unary_op.h" #include "src/tint/program_builder.h" #include "src/tint/sem/array.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/sem/call.h" #include "src/tint/sem/member_accessor_expression.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "src/tint/sem/statement.h" #include "src/tint/sem/struct.h" #include "src/tint/sem/variable.h" diff --git a/src/tint/transform/localize_struct_array_assignment.cc b/src/tint/transform/localize_struct_array_assignment.cc index ccf9f0b1ee..fda3faa212 100644 --- a/src/tint/transform/localize_struct_array_assignment.cc +++ b/src/tint/transform/localize_struct_array_assignment.cc @@ -22,7 +22,7 @@ #include "src/tint/program_builder.h" #include "src/tint/sem/expression.h" #include "src/tint/sem/member_accessor_expression.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "src/tint/sem/statement.h" #include "src/tint/sem/variable.h" #include "src/tint/transform/simplify_pointers.h" diff --git a/src/tint/transform/robustness.cc b/src/tint/transform/robustness.cc index 4a67d495f7..082c4ac731 100644 --- a/src/tint/transform/robustness.cc +++ b/src/tint/transform/robustness.cc @@ -22,7 +22,7 @@ #include "src/tint/sem/block_statement.h" #include "src/tint/sem/call.h" #include "src/tint/sem/expression.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "src/tint/sem/statement.h" TINT_INSTANTIATE_TYPEINFO(tint::transform::Robustness); diff --git a/src/tint/transform/transform.cc b/src/tint/transform/transform.cc index 018bc95ca3..adb709beb2 100644 --- a/src/tint/transform/transform.cc +++ b/src/tint/transform/transform.cc @@ -18,12 +18,12 @@ #include #include "src/tint/program_builder.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/sem/block_statement.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" #include "src/tint/sem/for_loop_statement.h" -#include "src/tint/sem/reference_type.h" -#include "src/tint/sem/sampler_type.h" +#include "src/tint/sem/reference.h" +#include "src/tint/sem/sampler.h" TINT_INSTANTIATE_TYPEINFO(tint::transform::Transform); TINT_INSTANTIATE_TYPEINFO(tint::transform::Data); diff --git a/src/tint/transform/utils/hoist_to_decl_before.cc b/src/tint/transform/utils/hoist_to_decl_before.cc index 6eb6d39a4d..15d09267df 100644 --- a/src/tint/transform/utils/hoist_to_decl_before.cc +++ b/src/tint/transform/utils/hoist_to_decl_before.cc @@ -20,7 +20,7 @@ #include "src/tint/sem/block_statement.h" #include "src/tint/sem/for_loop_statement.h" #include "src/tint/sem/if_statement.h" -#include "src/tint/sem/reference_type.h" +#include "src/tint/sem/reference.h" #include "src/tint/sem/variable.h" #include "src/tint/utils/reverse.h" diff --git a/src/tint/transform/zero_init_workgroup_memory.cc b/src/tint/transform/zero_init_workgroup_memory.cc index 4cf19ec822..13f2f7937f 100644 --- a/src/tint/transform/zero_init_workgroup_memory.cc +++ b/src/tint/transform/zero_init_workgroup_memory.cc @@ -22,7 +22,7 @@ #include "src/tint/ast/workgroup_attribute.h" #include "src/tint/program_builder.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/sem/function.h" #include "src/tint/sem/variable.h" #include "src/tint/utils/map.h" diff --git a/src/tint/writer/generate_external_texture_bindings.cc b/src/tint/writer/generate_external_texture_bindings.cc index 44bd262d74..11fcff152d 100644 --- a/src/tint/writer/generate_external_texture_bindings.cc +++ b/src/tint/writer/generate_external_texture_bindings.cc @@ -21,7 +21,7 @@ #include "src/tint/ast/external_texture.h" #include "src/tint/ast/module.h" #include "src/tint/program.h" -#include "src/tint/sem/external_texture_type.h" +#include "src/tint/sem/external_texture.h" #include "src/tint/sem/variable.h" namespace tint::writer { diff --git a/src/tint/writer/glsl/generator_impl.cc b/src/tint/writer/glsl/generator_impl.cc index 40a9e2e5c7..f21f96da96 100644 --- a/src/tint/writer/glsl/generator_impl.cc +++ b/src/tint/writer/glsl/generator_impl.cc @@ -29,18 +29,18 @@ #include "src/tint/ast/variable_decl_statement.h" #include "src/tint/debug.h" #include "src/tint/sem/array.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/sem/block_statement.h" #include "src/tint/sem/call.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/depth_texture_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/depth_texture.h" #include "src/tint/sem/function.h" #include "src/tint/sem/member_accessor_expression.h" #include "src/tint/sem/module.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/statement.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/struct.h" #include "src/tint/sem/type_constructor.h" #include "src/tint/sem/type_conversion.h" @@ -2679,9 +2679,10 @@ bool GeneratorImpl::EmitType(std::ostream& out, if (storage && storage->access() != ast::Access::kRead) { out << "writeonly "; } - auto* subtype = sampled - ? sampled->type() - : storage ? storage->type() : ms ? ms->type() : nullptr; + auto* subtype = sampled ? sampled->type() + : storage ? storage->type() + : ms ? ms->type() + : nullptr; if (!subtype || subtype->Is()) { } else if (subtype->Is()) { out << "i"; diff --git a/src/tint/writer/glsl/generator_impl_type_test.cc b/src/tint/writer/glsl/generator_impl_type_test.cc index c6dbf539f8..39db113c75 100644 --- a/src/tint/writer/glsl/generator_impl_type_test.cc +++ b/src/tint/writer/glsl/generator_impl_type_test.cc @@ -15,11 +15,11 @@ #include "gmock/gmock.h" #include "src/tint/ast/call_statement.h" #include "src/tint/ast/stage_attribute.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/sampler_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/sampler.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/writer/glsl/test_helper.h" namespace tint::writer::glsl { diff --git a/src/tint/writer/hlsl/generator_impl.cc b/src/tint/writer/hlsl/generator_impl.cc index 9b4fc51de8..c34a1c6670 100644 --- a/src/tint/writer/hlsl/generator_impl.cc +++ b/src/tint/writer/hlsl/generator_impl.cc @@ -30,18 +30,18 @@ #include "src/tint/ast/variable_decl_statement.h" #include "src/tint/debug.h" #include "src/tint/sem/array.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/sem/block_statement.h" #include "src/tint/sem/call.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/depth_texture_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/depth_texture.h" #include "src/tint/sem/function.h" #include "src/tint/sem/member_accessor_expression.h" #include "src/tint/sem/module.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/statement.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/struct.h" #include "src/tint/sem/type_constructor.h" #include "src/tint/sem/type_conversion.h" diff --git a/src/tint/writer/hlsl/generator_impl_type_test.cc b/src/tint/writer/hlsl/generator_impl_type_test.cc index bea99cefe2..db74daae8c 100644 --- a/src/tint/writer/hlsl/generator_impl_type_test.cc +++ b/src/tint/writer/hlsl/generator_impl_type_test.cc @@ -15,11 +15,11 @@ #include "gmock/gmock.h" #include "src/tint/ast/call_statement.h" #include "src/tint/ast/stage_attribute.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/sampler_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/sampler.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/writer/hlsl/test_helper.h" namespace tint::writer::hlsl { diff --git a/src/tint/writer/msl/generator_impl.cc b/src/tint/writer/msl/generator_impl.cc index f50ff15ce2..dbe1114c81 100644 --- a/src/tint/writer/msl/generator_impl.cc +++ b/src/tint/writer/msl/generator_impl.cc @@ -35,29 +35,29 @@ #include "src/tint/ast/variable_decl_statement.h" #include "src/tint/ast/void.h" #include "src/tint/sem/array.h" -#include "src/tint/sem/atomic_type.h" -#include "src/tint/sem/bool_type.h" +#include "src/tint/sem/atomic.h" +#include "src/tint/sem/bool.h" #include "src/tint/sem/call.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/f32_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/f32.h" #include "src/tint/sem/function.h" -#include "src/tint/sem/i32_type.h" -#include "src/tint/sem/matrix_type.h" +#include "src/tint/sem/i32.h" +#include "src/tint/sem/matrix.h" #include "src/tint/sem/member_accessor_expression.h" #include "src/tint/sem/module.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/pointer_type.h" -#include "src/tint/sem/reference_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/pointer.h" +#include "src/tint/sem/reference.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/struct.h" #include "src/tint/sem/type_constructor.h" #include "src/tint/sem/type_conversion.h" -#include "src/tint/sem/u32_type.h" +#include "src/tint/sem/u32.h" #include "src/tint/sem/variable.h" -#include "src/tint/sem/vector_type.h" -#include "src/tint/sem/void_type.h" +#include "src/tint/sem/vector.h" +#include "src/tint/sem/void.h" #include "src/tint/transform/array_length_from_uniform.h" #include "src/tint/transform/builtin_polyfill.h" #include "src/tint/transform/canonicalize_entry_point_io.h" diff --git a/src/tint/writer/msl/generator_impl_type_test.cc b/src/tint/writer/msl/generator_impl_type_test.cc index 1efffbb1bd..58aa0df62e 100644 --- a/src/tint/writer/msl/generator_impl_type_test.cc +++ b/src/tint/writer/msl/generator_impl_type_test.cc @@ -16,12 +16,12 @@ #include "gmock/gmock.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" -#include "src/tint/sem/sampler_type.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" +#include "src/tint/sem/sampler.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/writer/msl/test_helper.h" namespace tint::writer::msl { diff --git a/src/tint/writer/spirv/builder.cc b/src/tint/writer/spirv/builder.cc index 6ebacd3167..aab35fdc67 100644 --- a/src/tint/writer/spirv/builder.cc +++ b/src/tint/writer/spirv/builder.cc @@ -24,23 +24,23 @@ #include "src/tint/ast/internal_attribute.h" #include "src/tint/ast/traverse_expressions.h" #include "src/tint/sem/array.h" -#include "src/tint/sem/atomic_type.h" +#include "src/tint/sem/atomic.h" #include "src/tint/sem/builtin.h" #include "src/tint/sem/call.h" -#include "src/tint/sem/depth_multisampled_texture_type.h" -#include "src/tint/sem/depth_texture_type.h" +#include "src/tint/sem/depth_multisampled_texture.h" +#include "src/tint/sem/depth_texture.h" #include "src/tint/sem/function.h" #include "src/tint/sem/member_accessor_expression.h" #include "src/tint/sem/module.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/reference_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/reference.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/sem/statement.h" #include "src/tint/sem/struct.h" #include "src/tint/sem/type_constructor.h" #include "src/tint/sem/type_conversion.h" #include "src/tint/sem/variable.h" -#include "src/tint/sem/vector_type.h" +#include "src/tint/sem/vector.h" #include "src/tint/transform/add_spirv_block_attribute.h" #include "src/tint/utils/defer.h" #include "src/tint/utils/map.h" diff --git a/src/tint/writer/spirv/builder.h b/src/tint/writer/spirv/builder.h index cb3ba30ff3..7ef316fddf 100644 --- a/src/tint/writer/spirv/builder.h +++ b/src/tint/writer/spirv/builder.h @@ -36,7 +36,7 @@ #include "src/tint/program_builder.h" #include "src/tint/scope_stack.h" #include "src/tint/sem/builtin.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/writer/spirv/function.h" #include "src/tint/writer/spirv/scalar_constant.h" diff --git a/src/tint/writer/spirv/builder_builtin_test.cc b/src/tint/writer/spirv/builder_builtin_test.cc index 555e3dbd9b..3c4229930a 100644 --- a/src/tint/writer/spirv/builder_builtin_test.cc +++ b/src/tint/writer/spirv/builder_builtin_test.cc @@ -14,7 +14,7 @@ #include "src/tint/ast/call_statement.h" #include "src/tint/ast/stage_attribute.h" -#include "src/tint/sem/depth_texture_type.h" +#include "src/tint/sem/depth_texture.h" #include "src/tint/utils/string.h" #include "src/tint/writer/spirv/spv_dump.h" #include "src/tint/writer/spirv/test_helper.h" diff --git a/src/tint/writer/spirv/builder_entry_point_test.cc b/src/tint/writer/spirv/builder_entry_point_test.cc index 23c5e675a9..5b6ecec284 100644 --- a/src/tint/writer/spirv/builder_entry_point_test.cc +++ b/src/tint/writer/spirv/builder_entry_point_test.cc @@ -23,8 +23,8 @@ #include "src/tint/ast/storage_class.h" #include "src/tint/ast/variable.h" #include "src/tint/program.h" -#include "src/tint/sem/f32_type.h" -#include "src/tint/sem/vector_type.h" +#include "src/tint/sem/f32.h" +#include "src/tint/sem/vector.h" #include "src/tint/writer/spirv/builder.h" #include "src/tint/writer/spirv/spv_dump.h" #include "src/tint/writer/spirv/test_helper.h" diff --git a/src/tint/writer/spirv/builder_type_test.cc b/src/tint/writer/spirv/builder_type_test.cc index e1c6422e6e..962caa1fe2 100644 --- a/src/tint/writer/spirv/builder_type_test.cc +++ b/src/tint/writer/spirv/builder_type_test.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/writer/spirv/spv_dump.h" #include "src/tint/writer/spirv/test_helper.h" diff --git a/src/tint/writer/wgsl/generator_impl.h b/src/tint/writer/wgsl/generator_impl.h index 65d70ea69a..69bd8e4024 100644 --- a/src/tint/writer/wgsl/generator_impl.h +++ b/src/tint/writer/wgsl/generator_impl.h @@ -34,7 +34,7 @@ #include "src/tint/ast/switch_statement.h" #include "src/tint/ast/unary_op_expression.h" #include "src/tint/program.h" -#include "src/tint/sem/storage_texture_type.h" +#include "src/tint/sem/storage_texture.h" #include "src/tint/sem/struct.h" #include "src/tint/writer/text_generator.h" diff --git a/src/tint/writer/wgsl/generator_impl_global_decl_test.cc b/src/tint/writer/wgsl/generator_impl_global_decl_test.cc index 251c577eb6..14a76db2f4 100644 --- a/src/tint/writer/wgsl/generator_impl_global_decl_test.cc +++ b/src/tint/writer/wgsl/generator_impl_global_decl_test.cc @@ -14,7 +14,7 @@ #include "src/tint/ast/stage_attribute.h" #include "src/tint/ast/variable_decl_statement.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/writer/wgsl/test_helper.h" namespace tint::writer::wgsl { diff --git a/src/tint/writer/wgsl/generator_impl_type_test.cc b/src/tint/writer/wgsl/generator_impl_type_test.cc index 8dc9addaaf..c1c34b2345 100644 --- a/src/tint/writer/wgsl/generator_impl_type_test.cc +++ b/src/tint/writer/wgsl/generator_impl_type_test.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/tint/sem/depth_texture_type.h" -#include "src/tint/sem/multisampled_texture_type.h" -#include "src/tint/sem/sampled_texture_type.h" +#include "src/tint/sem/depth_texture.h" +#include "src/tint/sem/multisampled_texture.h" +#include "src/tint/sem/sampled_texture.h" #include "src/tint/writer/wgsl/test_helper.h" namespace tint::writer::wgsl { diff --git a/test/tint/BUILD.gn b/test/tint/BUILD.gn index daf743fa7f..8ad60fe73f 100644 --- a/test/tint/BUILD.gn +++ b/test/tint/BUILD.gn @@ -284,27 +284,27 @@ tint_unittests_source_set("tint_unittests_resolver_src") { tint_unittests_source_set("tint_unittests_sem_src") { sources = [ - "../../src/tint/sem/atomic_type_test.cc", - "../../src/tint/sem/bool_type_test.cc", + "../../src/tint/sem/atomic_test.cc", + "../../src/tint/sem/bool_test.cc", "../../src/tint/sem/builtin_test.cc", - "../../src/tint/sem/depth_multisampled_texture_type_test.cc", - "../../src/tint/sem/depth_texture_type_test.cc", - "../../src/tint/sem/external_texture_type_test.cc", - "../../src/tint/sem/f32_type_test.cc", - "../../src/tint/sem/i32_type_test.cc", - "../../src/tint/sem/matrix_type_test.cc", - "../../src/tint/sem/multisampled_texture_type_test.cc", - "../../src/tint/sem/pointer_type_test.cc", - "../../src/tint/sem/reference_type_test.cc", - "../../src/tint/sem/sampled_texture_type_test.cc", - "../../src/tint/sem/sampler_type_test.cc", + "../../src/tint/sem/depth_multisampled_texture_test.cc", + "../../src/tint/sem/depth_texture_test.cc", + "../../src/tint/sem/external_texture_test.cc", + "../../src/tint/sem/f32_test.cc", + "../../src/tint/sem/i32_test.cc", + "../../src/tint/sem/matrix_test.cc", + "../../src/tint/sem/multisampled_texture_test.cc", + "../../src/tint/sem/pointer_test.cc", + "../../src/tint/sem/reference_test.cc", + "../../src/tint/sem/sampled_texture_test.cc", + "../../src/tint/sem/sampler_test.cc", "../../src/tint/sem/sem_array_test.cc", "../../src/tint/sem/sem_struct_test.cc", - "../../src/tint/sem/storage_texture_type_test.cc", - "../../src/tint/sem/texture_type_test.cc", + "../../src/tint/sem/storage_texture_test.cc", + "../../src/tint/sem/texture_test.cc", "../../src/tint/sem/type_manager_test.cc", - "../../src/tint/sem/u32_type_test.cc", - "../../src/tint/sem/vector_type_test.cc", + "../../src/tint/sem/u32_test.cc", + "../../src/tint/sem/vector_test.cc", ] } @@ -485,14 +485,14 @@ tint_unittests_source_set("tint_unittests_wgsl_reader_src") { "../../src/tint/reader/wgsl/parser_impl_const_literal_test.cc", "../../src/tint/reader/wgsl/parser_impl_continue_stmt_test.cc", "../../src/tint/reader/wgsl/parser_impl_continuing_stmt_test.cc", - "../../src/tint/reader/wgsl/parser_impl_depth_texture_type_test.cc", + "../../src/tint/reader/wgsl/parser_impl_depth_texture_test.cc", "../../src/tint/reader/wgsl/parser_impl_elseif_stmt_test.cc", "../../src/tint/reader/wgsl/parser_impl_enable_directive_test.cc", "../../src/tint/reader/wgsl/parser_impl_equality_expression_test.cc", "../../src/tint/reader/wgsl/parser_impl_error_msg_test.cc", "../../src/tint/reader/wgsl/parser_impl_error_resync_test.cc", "../../src/tint/reader/wgsl/parser_impl_exclusive_or_expression_test.cc", - "../../src/tint/reader/wgsl/parser_impl_external_texture_type_test.cc", + "../../src/tint/reader/wgsl/parser_impl_external_texture_test.cc", "../../src/tint/reader/wgsl/parser_impl_for_stmt_test.cc", "../../src/tint/reader/wgsl/parser_impl_function_attribute_list_test.cc", "../../src/tint/reader/wgsl/parser_impl_function_attribute_test.cc", @@ -514,14 +514,14 @@ tint_unittests_source_set("tint_unittests_wgsl_reader_src") { "../../src/tint/reader/wgsl/parser_impl_primary_expression_test.cc", "../../src/tint/reader/wgsl/parser_impl_relational_expression_test.cc", "../../src/tint/reader/wgsl/parser_impl_reserved_keyword_test.cc", - "../../src/tint/reader/wgsl/parser_impl_sampled_texture_type_test.cc", - "../../src/tint/reader/wgsl/parser_impl_sampler_type_test.cc", + "../../src/tint/reader/wgsl/parser_impl_sampled_texture_test.cc", + "../../src/tint/reader/wgsl/parser_impl_sampler_test.cc", "../../src/tint/reader/wgsl/parser_impl_shift_expression_test.cc", "../../src/tint/reader/wgsl/parser_impl_singular_expression_test.cc", "../../src/tint/reader/wgsl/parser_impl_statement_test.cc", "../../src/tint/reader/wgsl/parser_impl_statements_test.cc", "../../src/tint/reader/wgsl/parser_impl_storage_class_test.cc", - "../../src/tint/reader/wgsl/parser_impl_storage_texture_type_test.cc", + "../../src/tint/reader/wgsl/parser_impl_storage_texture_test.cc", "../../src/tint/reader/wgsl/parser_impl_struct_attribute_decl_test.cc", "../../src/tint/reader/wgsl/parser_impl_struct_body_decl_test.cc", "../../src/tint/reader/wgsl/parser_impl_struct_decl_test.cc", @@ -534,7 +534,7 @@ tint_unittests_source_set("tint_unittests_wgsl_reader_src") { "../../src/tint/reader/wgsl/parser_impl_test_helper.cc", "../../src/tint/reader/wgsl/parser_impl_test_helper.h", "../../src/tint/reader/wgsl/parser_impl_texel_format_test.cc", - "../../src/tint/reader/wgsl/parser_impl_texture_sampler_types_test.cc", + "../../src/tint/reader/wgsl/parser_impl_texture_sampler_test.cc", "../../src/tint/reader/wgsl/parser_impl_type_alias_test.cc", "../../src/tint/reader/wgsl/parser_impl_type_decl_test.cc", "../../src/tint/reader/wgsl/parser_impl_unary_expression_test.cc",