encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-18 01:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename type::Array to type::ArrayType

Browse Source 
This is to avoid name conflicts once we move all classes from namespace
`type` to `sem`.

Bug: tint:724
Change-Id: Icc3d81ae62eb3b329ce28e78a23ea27f29c9263b
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/48360
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
Antonio Maiorano
2021-04-19 21:13:12 +00:00
committed by Commit Bot service account
parent e94237dcdd
commit cf4057be01
44 changed files with 179 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/inspector/inspector.cc
View File

@@ -82,7 +82,7 @@ ResourceBinding::SampledKind BaseTypeToSampledKind(type::Type* base_type) {
return ResourceBinding::SampledKind::kUnknown;
}
if (auto* at = base_type->As<type::Array>()) {
if (auto* at = base_type->As<type::ArrayType>()) {
base_type = at->type();
} else if (auto* mt = base_type->As<type::Matrix>()) {
base_type = mt->type();

12
src/inspector/inspector_test.cc
View File

@@ -645,13 +645,13 @@ class InspectorHelper : public ProgramBuilder {
return *inspector_;
}
type::Array* u32_array_type(uint32_t count) {
type::ArrayType* u32_array_type(uint32_t count) {
if (array_type_memo_.find(count) == array_type_memo_.end()) {
array_type_memo_[count] =
create<type::Array>(ty.u32(), count,
ast::DecorationList{
create<ast::StrideDecoration>(4),
});
create<type::ArrayType>(ty.u32(), count,
ast::DecorationList{
create<ast::StrideDecoration>(4),
});
}
return array_type_memo_[count];
}
@@ -671,7 +671,7 @@ class InspectorHelper : public ProgramBuilder {
std::unique_ptr<Inspector> inspector_;
type::Sampler sampler_type_;
type::Sampler comparison_sampler_type_;
std::map<uint32_t, type::Array*> array_type_memo_;
std::map<uint32_t, type::ArrayType*> array_type_memo_;
std::map<std::tuple<type::Type*, uint32_t>, type::Vector*> vector_type_memo_;
};