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 <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 065e208..f2a1ce3 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -384,47 +384,47 @@
"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 @@
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 @@
"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 @@
"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 88b5cab..35b5f69 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -266,8 +266,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 85567e0..1c6d1a4 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 ad60757..f4ae37a 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 13e7c5f..f298faf 100644
--- a/src/tint/builtin_table.cc
+++ b/src/tint/builtin_table.cc
@@ -20,14 +20,14 @@
#include <utility>
#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 b8454d1..135f0b5 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 4b4888b..d01135c 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 <utility>
-#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 40c5f5a..1bb3e07 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 f72ba26..e5aec46 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 5095e2d..6e3e3d6 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 97a2ae3..a8e5d2f 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 4f61014..f64bade 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 4a31cfe..e8b066d 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 43a3140..e148050 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 4b7e0b6..4383f3f 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 @@
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 7bb4a2d..d1a0dc2 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 @@
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<const ast::Type*> ParserImpl::texture_sampler_types() {
- auto type = sampler_type();
+Maybe<const ast::Type*> 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 @@
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 @@
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 @@
return Failure::kNoMatch;
}
-// sampler_type
+// sampler
// : SAMPLER
// | SAMPLER_COMPARISON
-Maybe<const ast::Type*> ParserImpl::sampler_type() {
+Maybe<const ast::Type*> ParserImpl::sampler() {
Source source;
if (match(Token::Type::kSampler, &source))
return builder_.ty.sampler(source, ast::SamplerKind::kSampler);
@@ -703,14 +703,14 @@
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<const ast::TextureDimension> ParserImpl::sampled_texture_type() {
+Maybe<const ast::TextureDimension> ParserImpl::sampled_texture() {
if (match(Token::Type::kTextureSampled1d))
return ast::TextureDimension::k1d;
@@ -732,9 +732,9 @@
return Failure::kNoMatch;
}
-// external_texture_type
+// external_texture
// : TEXTURE_EXTERNAL
-Maybe<const ast::Type*> ParserImpl::external_texture_type() {
+Maybe<const ast::Type*> ParserImpl::external_texture() {
Source source;
if (match(Token::Type::kTextureExternal, &source)) {
return builder_.ty.external_texture(source);
@@ -743,21 +743,21 @@
return Failure::kNoMatch;
}
-// multisampled_texture_type
+// multisampled_texture
// : TEXTURE_MULTISAMPLED_2D
-Maybe<const ast::TextureDimension> ParserImpl::multisampled_texture_type() {
+Maybe<const ast::TextureDimension> 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<const ast::TextureDimension> ParserImpl::storage_texture_type() {
+Maybe<const ast::TextureDimension> ParserImpl::storage_texture() {
if (match(Token::Type::kTextureStorage1d))
return ast::TextureDimension::k1d;
if (match(Token::Type::kTextureStorage2d))
@@ -770,13 +770,13 @@
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<const ast::Type*> ParserImpl::depth_texture_type() {
+Maybe<const ast::Type*> ParserImpl::depth_texture() {
Source source;
if (match(Token::Type::kTextureDepth2d, &source)) {
return builder_.ty.depth_texture(source, ast::TextureDimension::k2d);
@@ -989,7 +989,7 @@
// | 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<const ast::Type*> ParserImpl::type_decl() {
auto t = peek();
Source source;
@@ -1032,7 +1032,7 @@
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 1dc0fe6..2f5b5e2 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 @@
/// @param attrs the list of attributes for the function declaration.
/// @returns the parsed function, nullptr otherwise
Maybe<const ast::Function*> 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<const ast::Type*> texture_sampler_types();
- /// Parses a `sampler_type` grammar element
+ Maybe<const ast::Type*> texture_samplers();
+ /// Parses a `sampler` grammar element
/// @returns the parsed Type or nullptr if none matched.
- Maybe<const ast::Type*> sampler_type();
- /// Parses a `multisampled_texture_type` grammar element
+ Maybe<const ast::Type*> sampler();
+ /// Parses a `multisampled_texture` grammar element
/// @returns returns the multisample texture dimension or kNone if none
/// matched.
- Maybe<const ast::TextureDimension> multisampled_texture_type();
- /// Parses a `sampled_texture_type` grammar element
+ Maybe<const ast::TextureDimension> multisampled_texture();
+ /// Parses a `sampled_texture` grammar element
/// @returns returns the sample texture dimension or kNone if none matched.
- Maybe<const ast::TextureDimension> sampled_texture_type();
- /// Parses a `storage_texture_type` grammar element
+ Maybe<const ast::TextureDimension> sampled_texture();
+ /// Parses a `storage_texture` grammar element
/// @returns returns the storage texture dimension.
/// Returns kNone if none matched.
- Maybe<const ast::TextureDimension> storage_texture_type();
- /// Parses a `depth_texture_type` grammar element
+ Maybe<const ast::TextureDimension> storage_texture();
+ /// Parses a `depth_texture` grammar element
/// @returns the parsed Type or nullptr if none matched.
- Maybe<const ast::Type*> depth_texture_type();
+ Maybe<const ast::Type*> depth_texture();
/// Parses a 'texture_external_type' grammar element
/// @returns the parsed Type or nullptr if none matched
- Maybe<const ast::Type*> external_texture_type();
+ Maybe<const ast::Type*> 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 91%
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 6a9c528..e2c8008 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_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_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_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_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_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 b567634..d5c8813 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 @@
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) {
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 a48c32c..75d722f 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 @@
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_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_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_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_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_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_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 230d58b..296070f 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 @@
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_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_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 8991198..92fe07f 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 @@
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_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_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_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_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 89%
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 25a0698..206260d 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_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_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_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_SampledTexture_F32) {
auto p = parser("texture_1d<f32>");
- 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_I32) {
auto p = parser("texture_2d<i32>");
- 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_U32) {
auto p = parser("texture_3d<u32>");
- 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_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_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_MissingGreaterThan) {
auto p = parser("texture_1d<u32");
- 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);
@@ -140,7 +140,7 @@
TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_I32) {
auto p = parser("texture_multisampled_2d<i32>");
- 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_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_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,
TextureSamplerTypes_MultisampledTexture_MissingGreaterThan) {
auto p = parser("texture_multisampled_2d<u32");
- auto t = p->texture_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, TextureSamplerTypes_StorageTexture_Readonly1dRg32Float) {
auto p = parser("texture_storage_1d<rg32float, read>");
- 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_Writeonly2dR32Uint) {
auto p = parser("texture_storage_2d<r32uint, write>");
- 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_InvalidType) {
auto p = parser("texture_storage_1d<abc, read>");
- 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_InvalidAccess) {
auto p = parser("texture_storage_1d<r32float, abc>");
- 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_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_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_MissingGreaterThan) {
auto p = parser("texture_storage_1d<r32uint, read");
- auto t = p->texture_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 f649a26..905ded5 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 eeae5ad..87e28c82 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 ad5ad50..bfb4361 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 02f800d..5c91066 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 5e9668f..cb3dd96 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 732e707..64bb60a 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 4fb972c..c28a489 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 df28e72..fbd6728 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 c9691f7..23f798d 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 f6851b5..36273b3 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 3331cfb..6c0a76a 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 21f4bf0..483b9a9 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 de180a3..7c2de64 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 1387d65..ef4d927 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 07bc95e..4782147 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 e74f0c8..45b8793 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 4d458af..15f9418 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 365fb25..22ecb97 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 b3d6954..3c82a72 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 c3c36f2..26f4cbc 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 94%
rename from src/tint/sem/atomic_type.cc
rename to src/tint/sem/atomic.cc
index 6376a7b..030be7b 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 93%
rename from src/tint/sem/atomic_type.h
rename to src/tint/sem/atomic.h
index e0dcb15..0bc9808 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 <string>
@@ -63,4 +63,4 @@
} // 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 15aa484..9dfbc6f 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 96%
rename from src/tint/sem/bool_type.cc
rename to src/tint/sem/bool.cc
index 7a20768..ab4c7e4 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 9e949bd..4084595 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 <string>
@@ -65,4 +65,4 @@
} // 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 390de43..0962cdb 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 01650eb..b4d8967 100644
--- a/src/tint/sem/call_target.h
+++ b/src/tint/sem/call_target.h
@@ -18,7 +18,7 @@
#include <vector>
#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 bb5b8a7..32154f8 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 de23417..b6d662f 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 <string>
-#include "src/tint/sem/texture_type.h"
+#include "src/tint/sem/texture.h"
namespace tint::sem {
@@ -47,4 +47,4 @@
} // 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 89%
rename from src/tint/sem/depth_multisampled_texture_type_test.cc
rename to src/tint/sem/depth_multisampled_texture_test.cc
index ea92986..af6172b 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 1ff0060..db191af 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 0f25785..95bbdab 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 <string>
-#include "src/tint/sem/texture_type.h"
+#include "src/tint/sem/texture.h"
namespace tint::sem {
@@ -46,4 +46,4 @@
} // 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 91%
rename from src/tint/sem/depth_texture_type_test.cc
rename to src/tint/sem/depth_texture_test.cc
index 28bb84a..bdd265a 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 95%
rename from src/tint/sem/external_texture_type.cc
rename to src/tint/sem/external_texture.cc
index adfd373..ad5d53c 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 4a07005..5117c74 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 <string>
-#include "src/tint/sem/texture_type.h"
+#include "src/tint/sem/texture.h"
namespace tint::sem {
@@ -46,4 +46,4 @@
} // 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 87%
rename from src/tint/sem/external_texture_type_test.cc
rename to src/tint/sem/external_texture_test.cc
index 439b3bc..832f578 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 96%
rename from src/tint/sem/f32_type.cc
rename to src/tint/sem/f32.cc
index c5b013e..358da72 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 93%
rename from src/tint/sem/f32_type.h
rename to src/tint/sem/f32.h
index 0d0fabf..26f32fa 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 <string>
@@ -55,4 +55,4 @@
} // 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 7fd7b76..0fc46e8 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 4ffda9a..21eed58 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 96%
rename from src/tint/sem/i32_type.cc
rename to src/tint/sem/i32.cc
index 0865c03..0c385c2 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 93%
rename from src/tint/sem/i32_type.h
rename to src/tint/sem/i32.h
index f6747a2..54e2251 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 <string>
@@ -55,4 +55,4 @@
} // 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 679331a..8afd09d 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 95%
rename from src/tint/sem/matrix_type.cc
rename to src/tint/sem/matrix.cc
index cfd9c1c..a3c03b8 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 b5b9669..54b53c3 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 <string>
@@ -82,4 +82,4 @@
} // 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 52ae36b..83abb66 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 72ce2f5..05f3149 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 0e993ec..3077949 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 <string>
-#include "src/tint/sem/texture_type.h"
+#include "src/tint/sem/texture.h"
namespace tint::sem {
@@ -54,4 +54,4 @@
} // 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 eb53ccd..b373c08 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 b1f137a..c0cc769 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 c3697c1..0e47f8c 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 <string>
@@ -67,4 +67,4 @@
} // 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 713677d..b623c59 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 6eaceda..1b2c8a96 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 d2639a4..bb03ee5 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 <string>
@@ -67,4 +67,4 @@
} // 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 9d99598..6b224b1 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 96%
rename from src/tint/sem/sampled_texture_type.cc
rename to src/tint/sem/sampled_texture.cc
index 5d9d9c5..694a05c 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 b67737e..7b97615 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 <string>
-#include "src/tint/sem/texture_type.h"
+#include "src/tint/sem/texture.h"
namespace tint::sem {
@@ -53,4 +53,4 @@
} // 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 93%
rename from src/tint/sem/sampled_texture_type_test.cc
rename to src/tint/sem/sampled_texture_test.cc
index 7ddb482..cc35848 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 96%
rename from src/tint/sem/sampler_type.cc
rename to src/tint/sem/sampler.cc
index 6558a17..40dc254 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 d1fffab..8eb4d54 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 <string>
@@ -58,4 +58,4 @@
} // 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 edd57d2..3a5ed92 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 fc78f38..3d635b8 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 d788be9..7750a3c 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 97%
rename from src/tint/sem/storage_texture_type.cc
rename to src/tint/sem/storage_texture.cc
index 1b017dd..61bbbef 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 71569e7..9b0b8e8 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 <string>
#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 @@
} // 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 73361ce..d60c9a4 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 e14b606..02fc918 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 9aa3330..5bcccba 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 @@
} // 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 8737415..e6d4702 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 f8c32e7..b4afa08 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 6cbea9b..c86c8f6 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 96%
rename from src/tint/sem/u32_type.cc
rename to src/tint/sem/u32.cc
index f73b617..eef196d 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 93%
rename from src/tint/sem/u32_type.h
rename to src/tint/sem/u32.h
index d81886c..7040b0e 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 <string>
@@ -55,4 +55,4 @@
} // 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 dae4c42..fffce22 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 97%
rename from src/tint/sem/vector_type.cc
rename to src/tint/sem/vector.cc
index 1df3945..79cc255 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 4542c5b..90a304b 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 <string>
@@ -76,4 +76,4 @@
} // 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 97%
rename from src/tint/sem/vector_type_test.cc
rename to src/tint/sem/vector_test.cc
index 4d53918..e12112b 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 6dae921..44d0e60 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 1131cb8..8c22a15 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 <string>
@@ -45,4 +45,4 @@
} // 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 699eeb4..a357c93 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 ccf9f0b..fda3faa 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 4a67d49..082c4ac 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 018bc95..adb709b 100644
--- a/src/tint/transform/transform.cc
+++ b/src/tint/transform/transform.cc
@@ -18,12 +18,12 @@
#include <string>
#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 6eb6d39..15d0926 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 4cf19ec..13f2f79 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 44bd262..11fcff1 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 40a9e2e..f21f96d 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 @@
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<sem::F32>()) {
} else if (subtype->Is<sem::I32>()) {
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 c6dbf53..39db113 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 9b4fc51..c34a1c6 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 bea99ce..db74daa 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 f50ff15..dbe1114 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 1efffbb..58aa0df 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 6ebacd3..aab35fd 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 cb3ba30..7ef316f 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 555e3db..3c42299 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 23c5e67..5b6ecec 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 e1c6422..962caa1 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 65d70ea..69bd8e4 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 251c577..14a76db 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 8dc9add..c1c34b2 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 {
