encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ben Clayton 2022-04-28 18:49:04 +00:00 committed by Dawn LUCI CQ
parent 7e8df044c6
commit 01004b7732
124 changed files with 549 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/tint/BUILD.gn
View File

@ -384,47 +384,47 @@ libtint_source_set("libtint_core_all_src") {
"resolver/validator.h",
"scope_stack.h",
"sem/array.h",
"sem/atomic_type.h",
"sem/atomic.h",
"sem/behavior.h",
"sem/binding_point.h",
"sem/bool_type.h",
"sem/bool.h",
"sem/builtin.h",
"sem/builtin_type.h",
"sem/call.h",
"sem/call_target.h",
"sem/constant.h",
"sem/depth_multisampled_texture_type.h",
"sem/depth_texture_type.h",
"sem/depth_multisampled_texture.h",
"sem/depth_texture.h",
"sem/expression.h",
"sem/external_texture_type.h",
"sem/f32_type.h",
"sem/external_texture.h",
"sem/f32.h",
"sem/for_loop_statement.h",
"sem/i32_type.h",
"sem/i32.h",
"sem/if_statement.h",
"sem/info.h",
"sem/loop_statement.h",
"sem/matrix_type.h",
"sem/matrix.h",
"sem/module.h",
"sem/multisampled_texture_type.h",
"sem/multisampled_texture.h",
"sem/node.h",
"sem/parameter_usage.h",
"sem/pipeline_stage_set.h",
"sem/pointer_type.h",
"sem/reference_type.h",
"sem/sampled_texture_type.h",
"sem/pointer.h",
"sem/reference.h",
"sem/sampled_texture.h",
"sem/sampler_texture_pair.h",
"sem/sampler_type.h",
"sem/storage_texture_type.h",
"sem/sampler.h",
"sem/storage_texture.h",
"sem/switch_statement.h",
"sem/texture_type.h",
"sem/texture.h",
"sem/type.h",
"sem/type_constructor.h",
"sem/type_conversion.h",
"sem/type_manager.h",
"sem/type_mappings.h",
"sem/u32_type.h",
"sem/vector_type.h",
"sem/void_type.h",
"sem/u32.h",
"sem/vector.h",
"sem/void.h",
"source.cc",
"source.h",
"symbol.cc",
@ -557,14 +557,14 @@ libtint_source_set("libtint_sem_src") {
sources = [
"sem/array.cc",
"sem/array.h",
"sem/atomic_type.cc",
"sem/atomic_type.h",
"sem/atomic.cc",
"sem/atomic.h",
"sem/behavior.cc",
"sem/behavior.h",
"sem/binding_point.h",
"sem/block_statement.cc",
"sem/bool_type.cc",
"sem/bool_type.h",
"sem/bool.cc",
"sem/bool.h",
"sem/builtin.cc",
"sem/builtin.h",
"sem/builtin_type.cc",
@ -575,55 +575,55 @@ libtint_source_set("libtint_sem_src") {
"sem/call_target.h",
"sem/constant.cc",
"sem/constant.h",
"sem/depth_multisampled_texture_type.cc",
"sem/depth_multisampled_texture_type.h",
"sem/depth_texture_type.cc",
"sem/depth_texture_type.h",
"sem/depth_multisampled_texture.cc",
"sem/depth_multisampled_texture.h",
"sem/depth_texture.cc",
"sem/depth_texture.h",
"sem/expression.cc",
"sem/expression.h",
"sem/external_texture_type.cc",
"sem/external_texture_type.h",
"sem/f32_type.cc",
"sem/f32_type.h",
"sem/external_texture.cc",
"sem/external_texture.h",
"sem/f32.cc",
"sem/f32.h",
"sem/for_loop_statement.cc",
"sem/for_loop_statement.h",
"sem/function.cc",
"sem/i32_type.cc",
"sem/i32_type.h",
"sem/i32.cc",
"sem/i32.h",
"sem/if_statement.cc",
"sem/if_statement.h",
"sem/info.cc",
"sem/info.h",
"sem/loop_statement.cc",
"sem/loop_statement.h",
"sem/matrix_type.cc",
"sem/matrix_type.h",
"sem/matrix.cc",
"sem/matrix.h",
"sem/member_accessor_expression.cc",
"sem/module.cc",
"sem/module.h",
"sem/multisampled_texture_type.cc",
"sem/multisampled_texture_type.h",
"sem/multisampled_texture.cc",
"sem/multisampled_texture.h",
"sem/node.cc",
"sem/node.h",
"sem/parameter_usage.cc",
"sem/parameter_usage.h",
"sem/pipeline_stage_set.h",
"sem/pointer_type.cc",
"sem/pointer_type.h",
"sem/reference_type.cc",
"sem/reference_type.h",
"sem/sampled_texture_type.cc",
"sem/sampled_texture_type.h",
"sem/sampler_type.cc",
"sem/sampler_type.h",
"sem/pointer.cc",
"sem/pointer.h",
"sem/reference.cc",
"sem/reference.h",
"sem/sampled_texture.cc",
"sem/sampled_texture.h",
"sem/sampler.cc",
"sem/sampler.h",
"sem/statement.cc",
"sem/storage_texture_type.cc",
"sem/storage_texture_type.h",
"sem/storage_texture.cc",
"sem/storage_texture.h",
"sem/struct.cc",
"sem/switch_statement.cc",
"sem/switch_statement.h",
"sem/texture_type.cc",
"sem/texture_type.h",
"sem/texture.cc",
"sem/texture.h",
"sem/type.cc",
"sem/type.h",
"sem/type_constructor.cc",
@ -633,13 +633,13 @@ libtint_source_set("libtint_sem_src") {
"sem/type_manager.cc",
"sem/type_manager.h",
"sem/type_mappings.h",
"sem/u32_type.cc",
"sem/u32_type.h",
"sem/u32.cc",
"sem/u32.h",
"sem/variable.cc",
"sem/vector_type.cc",
"sem/vector_type.h",
"sem/void_type.cc",
"sem/void_type.h",
"sem/vector.cc",
"sem/vector.h",
"sem/void.cc",
"sem/void.h",
]
public_deps = [ ":libtint_core_all_src" ]

118
src/tint/CMakeLists.txt
View File

@ -266,8 +266,8 @@ set(TINT_LIB_SRCS
scope_stack.h
sem/array.cc
sem/array.h
sem/atomic_type.cc
sem/atomic_type.h
sem/atomic.cc
sem/atomic.h
sem/behavior.cc
sem/behavior.h
sem/binding_point.h
@ -283,8 +283,8 @@ set(TINT_LIB_SRCS
sem/call.h
sem/constant.cc
sem/constant.h
sem/depth_multisampled_texture_type.cc
sem/depth_multisampled_texture_type.h
sem/depth_multisampled_texture.cc
sem/depth_multisampled_texture.h
sem/expression.cc
sem/expression.h
sem/function.cc
@ -392,40 +392,40 @@ set(TINT_LIB_SRCS
transform/utils/get_insertion_point.h
transform/utils/hoist_to_decl_before.cc
transform/utils/hoist_to_decl_before.h
sem/bool_type.cc
sem/bool_type.h
sem/depth_texture_type.cc
sem/depth_texture_type.h
sem/external_texture_type.cc
sem/external_texture_type.h
sem/f32_type.cc
sem/f32_type.h
sem/bool.cc
sem/bool.h
sem/depth_texture.cc
sem/depth_texture.h
sem/external_texture.cc
sem/external_texture.h
sem/f32.cc
sem/f32.h
sem/for_loop_statement.cc
sem/for_loop_statement.h
sem/i32_type.cc
sem/i32_type.h
sem/i32.cc
sem/i32.h
sem/if_statement.cc
sem/if_statement.h
sem/loop_statement.cc
sem/loop_statement.h
sem/matrix_type.cc
sem/matrix_type.h
sem/multisampled_texture_type.cc
sem/multisampled_texture_type.h
sem/pointer_type.cc
sem/pointer_type.h
sem/reference_type.cc
sem/reference_type.h
sem/sampled_texture_type.cc
sem/sampled_texture_type.h
sem/sampler_type.cc
sem/sampler_type.h
sem/storage_texture_type.cc
sem/storage_texture_type.h
sem/matrix.cc
sem/matrix.h
sem/multisampled_texture.cc
sem/multisampled_texture.h
sem/pointer.cc
sem/pointer.h
sem/reference.cc
sem/reference.h
sem/sampled_texture.cc
sem/sampled_texture.h
sem/sampler.cc
sem/sampler.h
sem/storage_texture.cc
sem/storage_texture.h
sem/switch_statement.cc
sem/switch_statement.h
sem/texture_type.cc
sem/texture_type.h
sem/texture.cc
sem/texture.h
sem/type_constructor.cc
sem/type_constructor.h
sem/type_conversion.cc
@ -434,12 +434,12 @@ set(TINT_LIB_SRCS
sem/type.h
sem/type_manager.cc
sem/type_manager.h
sem/u32_type.cc
sem/u32_type.h
sem/vector_type.cc
sem/vector_type.h
sem/void_type.cc
sem/void_type.h
sem/u32.cc
sem/u32.h
sem/vector.cc
sem/vector.h
sem/void.cc
sem/void.h
utils/block_allocator.h
utils/crc32.h
utils/enum_set.h
@ -779,27 +779,27 @@ if(TINT_BUILD_TESTS)
resolver/var_let_test.cc
resolver/var_let_validation_test.cc
scope_stack_test.cc
sem/atomic_type_test.cc
sem/bool_type_test.cc
sem/atomic.cc
sem/bool_test.cc
sem/builtin_test.cc
sem/depth_multisampled_texture_type_test.cc
sem/depth_texture_type_test.cc
sem/external_texture_type_test.cc
sem/f32_type_test.cc
sem/i32_type_test.cc
sem/matrix_type_test.cc
sem/multisampled_texture_type_test.cc
sem/pointer_type_test.cc
sem/reference_type_test.cc
sem/sampled_texture_type_test.cc
sem/sampler_type_test.cc
sem/depth_multisampled_texture_test.cc
sem/depth_texture_test.cc
sem/external_texture_test.cc
sem/f32_test.cc
sem/i32_test.cc
sem/matrix_test.cc
sem/multisampled_texture_test.cc
sem/pointer_test.cc
sem/reference_test.cc
sem/sampled_texture_test.cc
sem/sampler_test.cc
sem/sem_array_test.cc
sem/sem_struct_test.cc
sem/storage_texture_type_test.cc
sem/texture_type_test.cc
sem/storage_texture_test.cc
sem/texture_test.cc
sem/type_manager_test.cc
sem/u32_type_test.cc
sem/vector_type_test.cc
sem/u32_test.cc
sem/vector_test.cc
source_test.cc
symbol_table_test.cc
symbol_test.cc
@ -894,9 +894,9 @@ if(TINT_BUILD_TESTS)
reader/wgsl/parser_impl_const_literal_test.cc
reader/wgsl/parser_impl_continue_stmt_test.cc
reader/wgsl/parser_impl_continuing_stmt_test.cc
reader/wgsl/parser_impl_depth_texture_type_test.cc
reader/wgsl/parser_impl_depth_texture_test.cc
reader/wgsl/parser_impl_enable_directive_test.cc
reader/wgsl/parser_impl_external_texture_type_test.cc
reader/wgsl/parser_impl_external_texture_test.cc
reader/wgsl/parser_impl_elseif_stmt_test.cc
reader/wgsl/parser_impl_equality_expression_test.cc
reader/wgsl/parser_impl_error_msg_test.cc
@ -923,14 +923,14 @@ if(TINT_BUILD_TESTS)
reader/wgsl/parser_impl_primary_expression_test.cc
reader/wgsl/parser_impl_relational_expression_test.cc
reader/wgsl/parser_impl_reserved_keyword_test.cc
reader/wgsl/parser_impl_sampled_texture_type_test.cc
reader/wgsl/parser_impl_sampler_type_test.cc
reader/wgsl/parser_impl_sampled_texture_test.cc
reader/wgsl/parser_impl_sampler_test.cc
reader/wgsl/parser_impl_shift_expression_test.cc
reader/wgsl/parser_impl_singular_expression_test.cc
reader/wgsl/parser_impl_statement_test.cc
reader/wgsl/parser_impl_statements_test.cc
reader/wgsl/parser_impl_storage_class_test.cc
reader/wgsl/parser_impl_storage_texture_type_test.cc
reader/wgsl/parser_impl_storage_texture_test.cc
reader/wgsl/parser_impl_struct_body_decl_test.cc
reader/wgsl/parser_impl_struct_decl_test.cc
reader/wgsl/parser_impl_struct_attribute_decl_test.cc
@ -943,7 +943,7 @@ if(TINT_BUILD_TESTS)
reader/wgsl/parser_impl_test_helper.cc
reader/wgsl/parser_impl_test_helper.h
reader/wgsl/parser_impl_texel_format_test.cc
reader/wgsl/parser_impl_texture_sampler_types_test.cc
reader/wgsl/parser_impl_texture_sampler_test.cc
reader/wgsl/parser_impl_type_alias_test.cc
reader/wgsl/parser_impl_type_decl_test.cc
reader/wgsl/parser_impl_unary_expression_test.cc

6
src/tint/ast/builtin_texture_helper_test.cc
View File

@ -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 {

2
src/tint/ast/builtin_texture_helper_test.h
View File

@ -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 {

14
src/tint/builtin_table.cc
View File

@ -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"

16
src/tint/builtin_table_test.cc
View File

@ -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 {

2
src/tint/fuzzers/tint_ast_fuzzer/mutations/change_binary_operator.cc
View File

@ -16,7 +16,7 @@
#include <utility>
#include "src/tint/sem/reference_type.h"
#include "src/tint/sem/reference.h"
namespace tint::fuzzers::ast_fuzzer {

20
src/tint/inspector/inspector.cc
View File

@ -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"

8
src/tint/inspector/inspector_test.cc
View File

@ -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"

10
src/tint/inspector/resource_binding.cc
View File

@ -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 {

8
src/tint/inspector/test_inspector_builder.h
View File

@ -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"

26
src/tint/program_builder.h
View File

@ -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"

2
src/tint/reader/spirv/enum_converter.h
View File

@ -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 {

4
src/tint/reader/spirv/function.cc
View File

@ -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

8
src/tint/reader/spirv/parser_impl.cc
View File

@ -27,9 +27,9 @@
#include "src/tint/ast/type_name.h"
#include "src/tint/ast/unary_op_expression.h"
#include "src/tint/reader/spirv/function.h"
#include "src/tint/sem/depth_texture_type.h"
#include "src/tint/sem/multisampled_texture_type.h"
#include "src/tint/sem/sampled_texture_type.h"
#include "src/tint/sem/depth_texture.h"
#include "src/tint/sem/multisampled_texture.h"
#include "src/tint/sem/sampled_texture.h"
#include "src/tint/utils/unique_vector.h"
namespace tint::reader::spirv {
@ -623,7 +623,7 @@ Source ParserImpl::GetSourceForInst(
if (where == inst_source_.end()) {
return {};
}
return Source{where->second };
return Source{where->second};
}
bool ParserImpl::ParseInternalModuleExceptFunctions() {

62
src/tint/reader/wgsl/parser_impl.cc
View File

@ -37,10 +37,10 @@
#include "src/tint/ast/vector.h"
#include "src/tint/ast/workgroup_attribute.h"
#include "src/tint/reader/wgsl/lexer.h"
#include "src/tint/sem/depth_texture_type.h"
#include "src/tint/sem/external_texture_type.h"
#include "src/tint/sem/multisampled_texture_type.h"
#include "src/tint/sem/sampled_texture_type.h"
#include "src/tint/sem/depth_texture.h"
#include "src/tint/sem/external_texture.h"
#include "src/tint/sem/multisampled_texture.h"
#include "src/tint/sem/sampled_texture.h"
namespace tint::reader::wgsl {
namespace {
@ -610,29 +610,29 @@ Maybe<ParserImpl::VarDeclInfo> ParserImpl::variable_decl(bool allow_inferred) {
decl->type};
}
// texture_sampler_types
// : sampler_type
// | depth_texture_type
// | sampled_texture_type LESS_THAN type_decl GREATER_THAN
// | multisampled_texture_type LESS_THAN type_decl GREATER_THAN
// | storage_texture_type LESS_THAN texel_format
// texture_samplers
// : sampler
// | depth_texture
// | sampled_texture LESS_THAN type_decl GREATER_THAN
// | multisampled_texture LESS_THAN type_decl GREATER_THAN
// | storage_texture LESS_THAN texel_format
// COMMA access GREATER_THAN
Maybe<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 @@ Maybe<const ast::Type*> ParserImpl::texture_sampler_types() {
return builder_.ty.sampled_texture(source_range, dim.value, subtype.value);
}
auto ms_dim = multisampled_texture_type();
auto ms_dim = multisampled_texture();
if (ms_dim.matched) {
const char* use = "multisampled texture type";
@ -655,7 +655,7 @@ Maybe<const ast::Type*> ParserImpl::texture_sampler_types() {
subtype.value);
}
auto storage = storage_texture_type();
auto storage = storage_texture();
if (storage.matched) {
const char* use = "storage texture type";
using StorageTextureInfo =
@ -689,10 +689,10 @@ Maybe<const ast::Type*> ParserImpl::texture_sampler_types() {
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 @@ Maybe<const ast::Type*> ParserImpl::sampler_type() {
return Failure::kNoMatch;
}
// sampled_texture_type
// sampled_texture
// : TEXTURE_SAMPLED_1D
// | TEXTURE_SAMPLED_2D
// | TEXTURE_SAMPLED_2D_ARRAY
// | TEXTURE_SAMPLED_3D
// | TEXTURE_SAMPLED_CUBE
// | TEXTURE_SAMPLED_CUBE_ARRAY
Maybe<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 @@ Maybe<const ast::TextureDimension> ParserImpl::sampled_texture_type() {
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 @@ Maybe<const ast::Type*> ParserImpl::external_texture_type() {
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 @@ Maybe<const ast::TextureDimension> ParserImpl::storage_texture_type() {
return Failure::kNoMatch;
}
// depth_texture_type
// depth_texture
// : TEXTURE_DEPTH_2D
// | TEXTURE_DEPTH_2D_ARRAY
// | TEXTURE_DEPTH_CUBE
// | TEXTURE_DEPTH_CUBE_ARRAY
// | TEXTURE_DEPTH_MULTISAMPLED_2D
Maybe<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 @@ Maybe<const ast::Alias*> ParserImpl::type_alias() {
// | MAT4x2 LESS_THAN type_decl GREATER_THAN
// | MAT4x3 LESS_THAN type_decl GREATER_THAN
// | MAT4x4 LESS_THAN type_decl GREATER_THAN
// | texture_sampler_types
// | texture_samplers
Maybe<const ast::Type*> ParserImpl::type_decl() {
auto t = peek();
Source source;
@ -1032,7 +1032,7 @@ Maybe<const ast::Type*> ParserImpl::type_decl() {
return expect_type_decl_matrix(t);
}
auto texture_or_sampler = texture_sampler_types();
auto texture_or_sampler = texture_samplers();
if (texture_or_sampler.errored)
return Failure::kErrored;
if (texture_or_sampler.matched)

28
src/tint/reader/wgsl/parser_impl.h
View File

@ -27,7 +27,7 @@
#include "src/tint/program_builder.h"
#include "src/tint/reader/wgsl/parser_impl_detail.h"
#include "src/tint/reader/wgsl/token.h"
#include "src/tint/sem/storage_texture_type.h"
#include "src/tint/sem/storage_texture.h"
namespace tint::ast {
class BreakStatement;
@ -437,29 +437,29 @@ class ParserImpl {
/// @param attrs the list of attributes for the function declaration.
/// @returns the parsed function, nullptr otherwise
Maybe<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.

14
src/tint/reader/wgsl/parser_impl_depth_texture_type_test.cc → src/tint/reader/wgsl/parser_impl_depth_texture_test.cc
View File

@ -13,14 +13,14 @@
// limitations under the License.
#include "src/tint/reader/wgsl/parser_impl_test_helper.h"
#include "src/tint/sem/depth_texture_type.h"
#include "src/tint/sem/depth_texture.h"
namespace tint::reader::wgsl {
namespace {
TEST_F(ParserImplTest, DepthTextureType_Invalid) {
auto p = parser("1234");
auto t = p->depth_texture_type();
auto t = p->depth_texture();
EXPECT_FALSE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_FALSE(p->has_error());
@ -28,7 +28,7 @@ TEST_F(ParserImplTest, DepthTextureType_Invalid) {
TEST_F(ParserImplTest, DepthTextureType_2d) {
auto p = parser("texture_depth_2d");
auto t = p->depth_texture_type();
auto t = p->depth_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
ASSERT_NE(t.value, nullptr);
@ -41,7 +41,7 @@ TEST_F(ParserImplTest, DepthTextureType_2d) {
TEST_F(ParserImplTest, DepthTextureType_2dArray) {
auto p = parser("texture_depth_2d_array");
auto t = p->depth_texture_type();
auto t = p->depth_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
ASSERT_NE(t.value, nullptr);
@ -54,7 +54,7 @@ TEST_F(ParserImplTest, DepthTextureType_2dArray) {
TEST_F(ParserImplTest, DepthTextureType_Cube) {
auto p = parser("texture_depth_cube");
auto t = p->depth_texture_type();
auto t = p->depth_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
ASSERT_NE(t.value, nullptr);
@ -67,7 +67,7 @@ TEST_F(ParserImplTest, DepthTextureType_Cube) {
TEST_F(ParserImplTest, DepthTextureType_CubeArray) {
auto p = parser("texture_depth_cube_array");
auto t = p->depth_texture_type();
auto t = p->depth_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
ASSERT_NE(t.value, nullptr);
@ -80,7 +80,7 @@ TEST_F(ParserImplTest, DepthTextureType_CubeArray) {
TEST_F(ParserImplTest, DepthTextureType_Multisampled2d) {
auto p = parser("texture_depth_multisampled_2d");
auto t = p->depth_texture_type();
auto t = p->depth_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
ASSERT_NE(t.value, nullptr);

4
src/tint/reader/wgsl/parser_impl_external_texture_type_test.cc → src/tint/reader/wgsl/parser_impl_external_texture_test.cc
View File

@ -19,7 +19,7 @@ namespace {
TEST_F(ParserImplTest, ExternalTextureType_Invalid) {
auto p = parser("1234");
auto t = p->external_texture_type();
auto t = p->external_texture();
EXPECT_FALSE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_FALSE(p->has_error());
@ -27,7 +27,7 @@ TEST_F(ParserImplTest, ExternalTextureType_Invalid) {
TEST_F(ParserImplTest, ExternalTextureType) {
auto p = parser("texture_external");
auto t = p->external_texture_type();
auto t = p->external_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value->source.range, (Source::Range{{1u, 1u}, {1u, 17u}}));

14
src/tint/reader/wgsl/parser_impl_sampled_texture_type_test.cc → src/tint/reader/wgsl/parser_impl_sampled_texture_test.cc
View File

@ -19,7 +19,7 @@ namespace {
TEST_F(ParserImplTest, SampledTextureType_Invalid) {
auto p = parser("1234");
auto t = p->sampled_texture_type();
auto t = p->sampled_texture();
EXPECT_FALSE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_FALSE(p->has_error());
@ -27,7 +27,7 @@ TEST_F(ParserImplTest, SampledTextureType_Invalid) {
TEST_F(ParserImplTest, SampledTextureType_1d) {
auto p = parser("texture_1d");
auto t = p->sampled_texture_type();
auto t = p->sampled_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::k1d);
@ -36,7 +36,7 @@ TEST_F(ParserImplTest, SampledTextureType_1d) {
TEST_F(ParserImplTest, SampledTextureType_2d) {
auto p = parser("texture_2d");
auto t = p->sampled_texture_type();
auto t = p->sampled_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::k2d);
@ -45,7 +45,7 @@ TEST_F(ParserImplTest, SampledTextureType_2d) {
TEST_F(ParserImplTest, SampledTextureType_2dArray) {
auto p = parser("texture_2d_array");
auto t = p->sampled_texture_type();
auto t = p->sampled_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::k2dArray);
@ -54,7 +54,7 @@ TEST_F(ParserImplTest, SampledTextureType_2dArray) {
TEST_F(ParserImplTest, SampledTextureType_3d) {
auto p = parser("texture_3d");
auto t = p->sampled_texture_type();
auto t = p->sampled_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::k3d);
@ -63,7 +63,7 @@ TEST_F(ParserImplTest, SampledTextureType_3d) {
TEST_F(ParserImplTest, SampledTextureType_Cube) {
auto p = parser("texture_cube");
auto t = p->sampled_texture_type();
auto t = p->sampled_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::kCube);
@ -72,7 +72,7 @@ TEST_F(ParserImplTest, SampledTextureType_Cube) {
TEST_F(ParserImplTest, SampledTextureType_kCubeArray) {
auto p = parser("texture_cube_array");
auto t = p->sampled_texture_type();
auto t = p->sampled_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::kCubeArray);

6
src/tint/reader/wgsl/parser_impl_sampler_type_test.cc → src/tint/reader/wgsl/parser_impl_sampler_test.cc
View File

@ -19,7 +19,7 @@ namespace {
TEST_F(ParserImplTest, SamplerType_Invalid) {
auto p = parser("1234");
auto t = p->sampler_type();
auto t = p->sampler();
EXPECT_FALSE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, nullptr);
@ -28,7 +28,7 @@ TEST_F(ParserImplTest, SamplerType_Invalid) {
TEST_F(ParserImplTest, SamplerType_Sampler) {
auto p = parser("sampler");
auto t = p->sampler_type();
auto t = p->sampler();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
ASSERT_NE(t.value, nullptr);
@ -40,7 +40,7 @@ TEST_F(ParserImplTest, SamplerType_Sampler) {
TEST_F(ParserImplTest, SamplerType_ComparisonSampler) {
auto p = parser("sampler_comparison");
auto t = p->sampler_type();
auto t = p->sampler();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
ASSERT_NE(t.value, nullptr);

10
src/tint/reader/wgsl/parser_impl_storage_texture_type_test.cc → src/tint/reader/wgsl/parser_impl_storage_texture_test.cc
View File

@ -19,7 +19,7 @@ namespace {
TEST_F(ParserImplTest, StorageTextureType_Invalid) {
auto p = parser("abc");
auto t = p->storage_texture_type();
auto t = p->storage_texture();
EXPECT_FALSE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_FALSE(p->has_error());
@ -27,7 +27,7 @@ TEST_F(ParserImplTest, StorageTextureType_Invalid) {
TEST_F(ParserImplTest, StorageTextureType_1d) {
auto p = parser("texture_storage_1d");
auto t = p->storage_texture_type();
auto t = p->storage_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::k1d);
@ -36,7 +36,7 @@ TEST_F(ParserImplTest, StorageTextureType_1d) {
TEST_F(ParserImplTest, StorageTextureType_2d) {
auto p = parser("texture_storage_2d");
auto t = p->storage_texture_type();
auto t = p->storage_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::k2d);
@ -45,7 +45,7 @@ TEST_F(ParserImplTest, StorageTextureType_2d) {
TEST_F(ParserImplTest, StorageTextureType_2dArray) {
auto p = parser("texture_storage_2d_array");
auto t = p->storage_texture_type();
auto t = p->storage_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::k2dArray);
@ -54,7 +54,7 @@ TEST_F(ParserImplTest, StorageTextureType_2dArray) {
TEST_F(ParserImplTest, StorageTextureType_3d) {
auto p = parser("texture_storage_3d");
auto t = p->storage_texture_type();
auto t = p->storage_texture();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
EXPECT_EQ(t.value, ast::TextureDimension::k3d);

48
src/tint/reader/wgsl/parser_impl_texture_sampler_types_test.cc → src/tint/reader/wgsl/parser_impl_texture_sampler_test.cc
View File

@ -13,16 +13,16 @@
// limitations under the License.
#include "src/tint/reader/wgsl/parser_impl_test_helper.h"
#include "src/tint/sem/depth_texture_type.h"
#include "src/tint/sem/multisampled_texture_type.h"
#include "src/tint/sem/sampled_texture_type.h"
#include "src/tint/sem/depth_texture.h"
#include "src/tint/sem/multisampled_texture.h"
#include "src/tint/sem/sampled_texture.h"
namespace tint::reader::wgsl {
namespace {
TEST_F(ParserImplTest, TextureSamplerTypes_Invalid) {
auto p = parser("1234");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
EXPECT_EQ(t.value, nullptr);
EXPECT_FALSE(t.matched);
EXPECT_FALSE(t.errored);
@ -31,7 +31,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_Invalid) {
TEST_F(ParserImplTest, TextureSamplerTypes_Sampler) {
auto p = parser("sampler");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
ASSERT_FALSE(p->has_error()) << p->error();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
@ -43,7 +43,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_Sampler) {
TEST_F(ParserImplTest, TextureSamplerTypes_SamplerComparison) {
auto p = parser("sampler_comparison");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
ASSERT_FALSE(p->has_error()) << p->error();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
@ -55,7 +55,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SamplerComparison) {
TEST_F(ParserImplTest, TextureSamplerTypes_DepthTexture) {
auto p = parser("texture_depth_2d");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
ASSERT_FALSE(p->has_error()) << p->error();
EXPECT_TRUE(t.matched);
EXPECT_FALSE(t.errored);
@ -68,7 +68,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_DepthTexture) {
TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_F32) {
auto p = parser("texture_1d<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_F32) {
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_I32) {
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_U32) {
TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingType) {
auto p = parser("texture_1d<>");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
ASSERT_TRUE(p->has_error());
EXPECT_EQ(t.value, nullptr);
EXPECT_FALSE(t.matched);
@ -120,7 +120,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingType) {
TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingLessThan) {
auto p = parser("texture_1d");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
ASSERT_TRUE(p->has_error());
EXPECT_EQ(t.value, nullptr);
EXPECT_FALSE(t.matched);
@ -130,7 +130,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingLessThan) {
TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_MissingGreaterThan) {
auto p = parser("texture_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_SampledTexture_MissingGreaterThan) {
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_I32) {
TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_MissingType) {
auto p = parser("texture_multisampled_2d<>");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
ASSERT_TRUE(p->has_error());
EXPECT_EQ(t.value, nullptr);
EXPECT_FALSE(t.matched);
@ -165,7 +165,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_MissingType) {
TEST_F(ParserImplTest,
TextureSamplerTypes_MultisampledTexture_MissingLessThan) {
auto p = parser("texture_multisampled_2d");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
EXPECT_EQ(t.value, nullptr);
EXPECT_FALSE(t.matched);
EXPECT_TRUE(t.errored);
@ -175,7 +175,7 @@ TEST_F(ParserImplTest,
TEST_F(ParserImplTest,
TextureSamplerTypes_MultisampledTexture_MissingGreaterThan) {
auto p = parser("texture_multisampled_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,
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_Readonly1dRg32Float) {
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_Writeonly2dR32Uint) {
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_InvalidType) {
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_InvalidAccess) {
TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingType) {
auto p = parser("texture_storage_1d<>");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
EXPECT_EQ(t.value, nullptr);
EXPECT_FALSE(t.matched);
EXPECT_TRUE(t.errored);
@ -243,7 +243,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingType) {
TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingLessThan) {
auto p = parser("texture_storage_1d");
auto t = p->texture_sampler_types();
auto t = p->texture_samplers();
EXPECT_EQ(t.value, nullptr);
EXPECT_FALSE(t.matched);
EXPECT_TRUE(t.errored);
@ -252,7 +252,7 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingLessThan) {
TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_MissingGreaterThan) {
auto p = parser("texture_storage_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);

2
src/tint/reader/wgsl/parser_impl_type_decl_test.cc
View File

@ -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 {

2
src/tint/resolver/array_accessor_test.cc
View File

@ -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 {

2
src/tint/resolver/assignment_validation_test.cc
View File

@ -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 {

4
src/tint/resolver/atomics_test.cc
View File

@ -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"

4
src/tint/resolver/atomics_validation_test.cc
View File

@ -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"

2
src/tint/resolver/builtin_test.cc
View File

@ -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"

2
src/tint/resolver/compound_assignment_validation_test.cc
View File

@ -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 {

2
src/tint/resolver/is_host_shareable_test.cc
View File

@ -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 {

2
src/tint/resolver/is_storeable_test.cc
View File

@ -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 {

2
src/tint/resolver/ptr_ref_test.cc
View File

@ -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"

2
src/tint/resolver/ptr_ref_validation_test.cc
View File

@ -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"

18
src/tint/resolver/resolver.cc
View File

@ -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"

2
src/tint/resolver/resolver_is_storeable_test.cc
View File

@ -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 {

4
src/tint/resolver/resolver_test.cc
View File

@ -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"

2
src/tint/resolver/type_constructor_validation_test.cc
View File

@ -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"

4
src/tint/resolver/type_validation_test.cc
View File

@ -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"

2
src/tint/resolver/validation_test.cc
View File

@ -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"

18
src/tint/resolver/validator.cc
View File

@ -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"

2
src/tint/resolver/validator_is_storeable_test.cc
View File

@ -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 {

2
src/tint/resolver/var_let_test.cc
View File

@ -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"

4
src/tint/sem/atomic_type.cc → src/tint/sem/atomic.cc
View File

@ -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);

6
src/tint/sem/atomic_type.h → src/tint/sem/atomic.h
View File

@ -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 @@ class Atomic final : public Castable<Atomic, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_ATOMIC_TYPE_H_
#endif // SRC_TINT_SEM_ATOMIC_H_

2
src/tint/sem/atomic_type_test.cc → src/tint/sem/atomic_test.cc
View File

@ -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"

2
src/tint/sem/bool_type.cc → src/tint/sem/bool.cc
View File

@ -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"

6
src/tint/sem/bool_type.h → src/tint/sem/bool.h
View File

@ -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 @@ class Bool final : public Castable<Bool, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_BOOL_TYPE_H_
#endif // SRC_TINT_SEM_BOOL_H_

2
src/tint/sem/bool_type_test.cc → src/tint/sem/bool_test.cc
View File

@ -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 {

2
src/tint/sem/call_target.h
View File

@ -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"

2
src/tint/sem/depth_multisampled_texture_type.cc → src/tint/sem/depth_multisampled_texture.cc
View File

@ -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"

8
src/tint/sem/depth_multisampled_texture_type.h → src/tint/sem/depth_multisampled_texture.h
View File

@ -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 @@ class DepthMultisampledTexture final
} // namespace tint::sem
#endif // SRC_TINT_SEM_DEPTH_MULTISAMPLED_TEXTURE_TYPE_H_
#endif // SRC_TINT_SEM_DEPTH_MULTISAMPLED_TEXTURE_H_

8
src/tint/sem/depth_multisampled_texture_type_test.cc → src/tint/sem/depth_multisampled_texture_test.cc
View File

@ -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 {

2
src/tint/sem/depth_texture_type.cc → src/tint/sem/depth_texture.cc
View File

@ -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"

8
src/tint/sem/depth_texture_type.h → src/tint/sem/depth_texture.h
View File

@ -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 @@ class DepthTexture final : public Castable<DepthTexture, Texture> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_DEPTH_TEXTURE_TYPE_H_
#endif // SRC_TINT_SEM_DEPTH_TEXTURE_H_

8
src/tint/sem/depth_texture_type_test.cc → src/tint/sem/depth_texture_test.cc
View File

@ -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 {

2
src/tint/sem/external_texture_type.cc → src/tint/sem/external_texture.cc
View File

@ -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"

8
src/tint/sem/external_texture_type.h → src/tint/sem/external_texture.h
View File

@ -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 @@ class ExternalTexture final : public Castable<ExternalTexture, Texture> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_EXTERNAL_TEXTURE_TYPE_H_
#endif // SRC_TINT_SEM_EXTERNAL_TEXTURE_H_

10
src/tint/sem/external_texture_type_test.cc → src/tint/sem/external_texture_test.cc
View File

@ -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 {

2
src/tint/sem/f32_type.cc → src/tint/sem/f32.cc
View File

@ -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"

6
src/tint/sem/f32_type.h → src/tint/sem/f32.h
View File

@ -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 @@ class F32 final : public Castable<F32, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_F32_TYPE_H_
#endif // SRC_TINT_SEM_F32_H_

2
src/tint/sem/f32_type_test.cc → src/tint/sem/f32_test.cc
View File

@ -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 {

10
src/tint/sem/function.cc
View File

@ -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"

2
src/tint/sem/i32_type.cc → src/tint/sem/i32.cc
View File

@ -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"

6
src/tint/sem/i32_type.h → src/tint/sem/i32.h
View File

@ -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 @@ class I32 final : public Castable<I32, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_I32_TYPE_H_
#endif // SRC_TINT_SEM_I32_H_

2
src/tint/sem/i32_type_test.cc → src/tint/sem/i32_test.cc
View File

@ -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 {

4
src/tint/sem/matrix_type.cc → src/tint/sem/matrix.cc
View File

@ -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);

6
src/tint/sem/matrix_type.h → src/tint/sem/matrix.h
View File

@ -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 @@ class Matrix final : public Castable<Matrix, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_MATRIX_TYPE_H_
#endif // SRC_TINT_SEM_MATRIX_H_

2
src/tint/sem/matrix_type_test.cc → src/tint/sem/matrix_test.cc
View File

@ -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 {

2
src/tint/sem/multisampled_texture_type.cc → src/tint/sem/multisampled_texture.cc
View File

@ -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"

8
src/tint/sem/multisampled_texture_type.h → src/tint/sem/multisampled_texture.h
View File

@ -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 @@ class MultisampledTexture final
} // namespace tint::sem
#endif // SRC_TINT_SEM_MULTISAMPLED_TEXTURE_TYPE_H_
#endif // SRC_TINT_SEM_MULTISAMPLED_TEXTURE_H_

10
src/tint/sem/multisampled_texture_type_test.cc → src/tint/sem/multisampled_texture_test.cc
View File

@ -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 {

4
src/tint/sem/pointer_type.cc → src/tint/sem/pointer.cc
View File

@ -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);

6
src/tint/sem/pointer_type.h → src/tint/sem/pointer.h
View File

@ -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 @@ class Pointer final : public Castable<Pointer, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_POINTER_TYPE_H_
#endif // SRC_TINT_SEM_POINTER_H_

2
src/tint/sem/pointer_type_test.cc → src/tint/sem/pointer_test.cc
View File

@ -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 {

2
src/tint/sem/reference_type.cc → src/tint/sem/reference.cc
View File

@ -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"

6
src/tint/sem/reference_type.h → src/tint/sem/reference.h
View File

@ -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 @@ class Reference final : public Castable<Reference, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_REFERENCE_TYPE_H_
#endif // SRC_TINT_SEM_REFERENCE_H_

2
src/tint/sem/reference_type_test.cc → src/tint/sem/reference_test.cc
View File

@ -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 {

2
src/tint/sem/sampled_texture_type.cc → src/tint/sem/sampled_texture.cc
View File

@ -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"

8
src/tint/sem/sampled_texture_type.h → src/tint/sem/sampled_texture.h
View File

@ -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 @@ class SampledTexture final : public Castable<SampledTexture, Texture> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_SAMPLED_TEXTURE_TYPE_H_
#endif // SRC_TINT_SEM_SAMPLED_TEXTURE_H_

8
src/tint/sem/sampled_texture_type_test.cc → src/tint/sem/sampled_texture_test.cc
View File

@ -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 {

2
src/tint/sem/sampler_type.cc → src/tint/sem/sampler.cc
View File

@ -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"

6
src/tint/sem/sampler_type.h → src/tint/sem/sampler.h
View File

@ -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 @@ class Sampler final : public Castable<Sampler, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_SAMPLER_TYPE_H_
#endif // SRC_TINT_SEM_SAMPLER_H_

4
src/tint/sem/sampler_type_test.cc → src/tint/sem/sampler_test.cc
View File

@ -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 {

2
src/tint/sem/sem_array_test.cc
View File

@ -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 {

2
src/tint/sem/sem_struct_test.cc
View File

@ -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 {

2
src/tint/sem/storage_texture_type.cc → src/tint/sem/storage_texture.cc
View File

@ -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"

8
src/tint/sem/storage_texture_type.h → src/tint/sem/storage_texture.h
View File

@ -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 @@ class StorageTexture final : public Castable<StorageTexture, Texture> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_STORAGE_TEXTURE_TYPE_H_
#endif // SRC_TINT_SEM_STORAGE_TEXTURE_H_

8
src/tint/sem/storage_texture_type_test.cc → src/tint/sem/storage_texture_test.cc
View File

@ -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 {

2
src/tint/sem/texture_type.cc → src/tint/sem/texture.cc
View File

@ -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);

6
src/tint/sem/texture_type.h → src/tint/sem/texture.h
View File

@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_TINT_SEM_TEXTURE_TYPE_H_
#define SRC_TINT_SEM_TEXTURE_TYPE_H_
#ifndef SRC_TINT_SEM_TEXTURE_H_
#define SRC_TINT_SEM_TEXTURE_H_
#include "src/tint/ast/texture.h"
#include "src/tint/sem/type.h"
@ -39,4 +39,4 @@ class Texture : public Castable<Texture, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_TEXTURE_TYPE_H_
#endif // SRC_TINT_SEM_TEXTURE_H_

4
src/tint/sem/texture_type_test.cc → src/tint/sem/texture_test.cc
View File

@ -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 {

20
src/tint/sem/type.cc
View File

@ -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);

4
src/tint/sem/type_manager_test.cc
View File

@ -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 {

2
src/tint/sem/u32_type.cc → src/tint/sem/u32.cc
View File

@ -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"

6
src/tint/sem/u32_type.h → src/tint/sem/u32.h
View File

@ -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 @@ class U32 final : public Castable<U32, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_U32_TYPE_H_
#endif // SRC_TINT_SEM_U32_H_

2
src/tint/sem/u32_type_test.cc → src/tint/sem/u32_test.cc
View File

@ -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 {

2
src/tint/sem/vector_type.cc → src/tint/sem/vector.cc
View File

@ -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"

6
src/tint/sem/vector_type.h → src/tint/sem/vector.h
View File

@ -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 @@ class Vector final : public Castable<Vector, Type> {
} // namespace tint::sem
#endif // SRC_TINT_SEM_VECTOR_TYPE_H_
#endif // SRC_TINT_SEM_VECTOR_H_

2
src/tint/sem/vector_type_test.cc → src/tint/sem/vector_test.cc
View File

@ -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 {

Some files were not shown because too many files have changed in this diff Show More