Move TexelFormat to builtin
This CL moves ast::TexelFormat to builtin::TexelFormat.
Change-Id: Ifb39cc58babdd7e7aa89c19af5336a9498b082ae
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/120402
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/src/tint/resolver/assignment_validation_test.cc b/src/tint/resolver/assignment_validation_test.cc
index b549daf..1d0cd27 100644
--- a/src/tint/resolver/assignment_validation_test.cc
+++ b/src/tint/resolver/assignment_validation_test.cc
@@ -231,7 +231,7 @@
// a = b;
auto make_type = [&] {
- return ty.storage_texture(type::TextureDimension::k1d, type::TexelFormat::kRgba8Unorm,
+ return ty.storage_texture(type::TextureDimension::k1d, builtin::TexelFormat::kRgba8Unorm,
builtin::Access::kWrite);
};
diff --git a/src/tint/resolver/builtin_test.cc b/src/tint/resolver/builtin_test.cc
index 0193596..5f4e5be 100644
--- a/src/tint/resolver/builtin_test.cc
+++ b/src/tint/resolver/builtin_test.cc
@@ -2083,7 +2083,7 @@
struct TextureTestParams {
type::TextureDimension dim;
Texture type = Texture::kF32;
- type::TexelFormat format = type::TexelFormat::kR32Float;
+ builtin::TexelFormat format = builtin::TexelFormat::kR32Float;
};
inline std::ostream& operator<<(std::ostream& out, TextureTestParams data) {
out << data.dim << "_" << data.type;
diff --git a/src/tint/resolver/dependency_graph.cc b/src/tint/resolver/dependency_graph.cc
index 7fddf16..66ca071 100644
--- a/src/tint/resolver/dependency_graph.cc
+++ b/src/tint/resolver/dependency_graph.cc
@@ -484,7 +484,7 @@
graph_.resolved_identifiers.Add(from, ResolvedIdentifier(addr));
return;
}
- if (auto fmt = type::ParseTexelFormat(s); fmt != type::TexelFormat::kUndefined) {
+ if (auto fmt = builtin::ParseTexelFormat(s); fmt != builtin::TexelFormat::kUndefined) {
graph_.resolved_identifiers.Add(from, ResolvedIdentifier(fmt));
return;
}
@@ -868,7 +868,7 @@
if (auto addr = AddressSpace(); addr != builtin::AddressSpace::kUndefined) {
return "address space '" + utils::ToString(addr) + "'";
}
- if (auto fmt = TexelFormat(); fmt != type::TexelFormat::kUndefined) {
+ if (auto fmt = TexelFormat(); fmt != builtin::TexelFormat::kUndefined) {
return "texel format '" + utils::ToString(fmt) + "'";
}
TINT_UNREACHABLE(Resolver, diagnostics) << "unhandled ResolvedIdentifier";
diff --git a/src/tint/resolver/dependency_graph.h b/src/tint/resolver/dependency_graph.h
index 9cf8819..6c9d4e8 100644
--- a/src/tint/resolver/dependency_graph.h
+++ b/src/tint/resolver/dependency_graph.h
@@ -20,11 +20,11 @@
#include "src/tint/ast/module.h"
#include "src/tint/builtin/access.h"
+#include "src/tint/builtin/texel_format.h"
#include "src/tint/diagnostic/diagnostic.h"
#include "src/tint/sem/builtin_type.h"
#include "src/tint/symbol_table.h"
#include "src/tint/type/builtin.h"
-#include "src/tint/type/texel_format.h"
#include "src/tint/utils/hashmap.h"
namespace tint::resolver {
@@ -38,7 +38,7 @@
/// - builtin::Access
/// - builtin::AddressSpace
/// - type::Builtin
-/// - type::TexelFormat
+/// - builtin::TexelFormat
class ResolvedIdentifier {
public:
ResolvedIdentifier() = default;
@@ -95,13 +95,13 @@
return type::Builtin::kUndefined;
}
- /// @return the texel format if the ResolvedIdentifier holds type::TexelFormat, otherwise
- /// type::TexelFormat::kUndefined
- type::TexelFormat TexelFormat() const {
- if (auto n = std::get_if<type::TexelFormat>(&value_)) {
+ /// @return the texel format if the ResolvedIdentifier holds builtin::TexelFormat, otherwise
+ /// builtin::TexelFormat::kUndefined
+ builtin::TexelFormat TexelFormat() const {
+ if (auto n = std::get_if<builtin::TexelFormat>(&value_)) {
return *n;
}
- return type::TexelFormat::kUndefined;
+ return builtin::TexelFormat::kUndefined;
}
/// @param value the value to compare the ResolvedIdentifier to
@@ -133,7 +133,7 @@
builtin::Access,
builtin::AddressSpace,
type::Builtin,
- type::TexelFormat>
+ builtin::TexelFormat>
value_;
};
diff --git a/src/tint/resolver/dependency_graph_test.cc b/src/tint/resolver/dependency_graph_test.cc
index 03d1a69..8b91d1e 100644
--- a/src/tint/resolver/dependency_graph_test.cc
+++ b/src/tint/resolver/dependency_graph_test.cc
@@ -1501,7 +1501,7 @@
} // namespace resolve_to_address_space
////////////////////////////////////////////////////////////////////////////////
-// Resolve to type::TexelFormat tests
+// Resolve to builtin::TexelFormat tests
////////////////////////////////////////////////////////////////////////////////
namespace resolve_to_texel_format {
@@ -1519,7 +1519,7 @@
auto resolved = Build().resolved_identifiers.Get(ident);
ASSERT_TRUE(resolved);
- EXPECT_EQ(resolved->TexelFormat(), type::ParseTexelFormat(name))
+ EXPECT_EQ(resolved->TexelFormat(), builtin::ParseTexelFormat(name))
<< resolved->String(Symbols(), Diagnostics());
}
@@ -1571,17 +1571,17 @@
INSTANTIATE_TEST_SUITE_P(Types,
ResolverDependencyGraphResolveToTexelFormat,
testing::Combine(testing::ValuesIn(kTypeUseKinds),
- testing::ValuesIn(type::kTexelFormatStrings)));
+ testing::ValuesIn(builtin::kTexelFormatStrings)));
INSTANTIATE_TEST_SUITE_P(Values,
ResolverDependencyGraphResolveToTexelFormat,
testing::Combine(testing::ValuesIn(kValueUseKinds),
- testing::ValuesIn(type::kTexelFormatStrings)));
+ testing::ValuesIn(builtin::kTexelFormatStrings)));
INSTANTIATE_TEST_SUITE_P(Functions,
ResolverDependencyGraphResolveToTexelFormat,
testing::Combine(testing::ValuesIn(kFuncUseKinds),
- testing::ValuesIn(type::kTexelFormatStrings)));
+ testing::ValuesIn(builtin::kTexelFormatStrings)));
} // namespace resolve_to_texel_format
@@ -1735,8 +1735,8 @@
GlobalVar(Sym(), ty.depth_multisampled_texture(type::TextureDimension::k2d));
GlobalVar(Sym(), ty.external_texture());
GlobalVar(Sym(), ty.multisampled_texture(type::TextureDimension::k2d, T));
- GlobalVar(Sym(), ty.storage_texture(type::TextureDimension::k2d, type::TexelFormat::kR32Float,
- builtin::Access::kRead));
+ GlobalVar(Sym(), ty.storage_texture(type::TextureDimension::k2d,
+ builtin::TexelFormat::kR32Float, builtin::Access::kRead));
GlobalVar(Sym(), ty.sampler(type::SamplerKind::kSampler));
GlobalVar(Sym(), ty.i32(), utils::Vector{Binding(V), Group(V)});
diff --git a/src/tint/resolver/expression_kind_test.cc b/src/tint/resolver/expression_kind_test.cc
index c3b14f2..681b5c3 100644
--- a/src/tint/resolver/expression_kind_test.cc
+++ b/src/tint/resolver/expression_kind_test.cc
@@ -184,9 +184,9 @@
sym = Sym("rgba8unorm");
check_expr = [](const sem::Expression* expr) {
ASSERT_NE(expr, nullptr);
- auto* enum_expr = expr->As<sem::BuiltinEnumExpression<type::TexelFormat>>();
+ auto* enum_expr = expr->As<sem::BuiltinEnumExpression<builtin::TexelFormat>>();
ASSERT_NE(enum_expr, nullptr);
- EXPECT_EQ(enum_expr->Value(), type::TexelFormat::kRgba8Unorm);
+ EXPECT_EQ(enum_expr->Value(), builtin::TexelFormat::kRgba8Unorm);
};
break;
}
diff --git a/src/tint/resolver/intrinsic_table.cc b/src/tint/resolver/intrinsic_table.cc
index febd610..d9a9185 100644
--- a/src/tint/resolver/intrinsic_table.cc
+++ b/src/tint/resolver/intrinsic_table.cc
@@ -328,7 +328,7 @@
// TODO(bclayton): See if we can move more of this hand-rolled code to the
// template
////////////////////////////////////////////////////////////////////////////////
-using TexelFormat = type::TexelFormat;
+using TexelFormat = builtin::TexelFormat;
using Access = builtin::Access;
using AddressSpace = builtin::AddressSpace;
using ParameterUsage = sem::ParameterUsage;
diff --git a/src/tint/resolver/intrinsic_table_test.cc b/src/tint/resolver/intrinsic_table_test.cc
index d1b5530..5aee480 100644
--- a/src/tint/resolver/intrinsic_table_test.cc
+++ b/src/tint/resolver/intrinsic_table_test.cc
@@ -414,9 +414,9 @@
auto* i32 = create<type::I32>();
auto* vec2_i32 = create<type::Vector>(i32, 2u);
auto* vec4_f32 = create<type::Vector>(f32, 4u);
- auto* subtype = type::StorageTexture::SubtypeFor(type::TexelFormat::kR32Float, Types());
+ auto* subtype = type::StorageTexture::SubtypeFor(builtin::TexelFormat::kR32Float, Types());
auto* tex =
- create<type::StorageTexture>(type::TextureDimension::k2d, type::TexelFormat::kR32Float,
+ create<type::StorageTexture>(type::TextureDimension::k2d, builtin::TexelFormat::kR32Float,
builtin::Access::kWrite, subtype);
auto result = table->Lookup(BuiltinType::kTextureStore, utils::Vector{tex, vec2_i32, vec4_f32},
diff --git a/src/tint/resolver/resolver.cc b/src/tint/resolver/resolver.cc
index a664334..ba318fa 100644
--- a/src/tint/resolver/resolver.cc
+++ b/src/tint/resolver/resolver.cc
@@ -89,7 +89,7 @@
TINT_INSTANTIATE_TYPEINFO(tint::sem::BuiltinEnumExpression<tint::builtin::Access>);
TINT_INSTANTIATE_TYPEINFO(tint::sem::BuiltinEnumExpression<tint::builtin::AddressSpace>);
-TINT_INSTANTIATE_TYPEINFO(tint::sem::BuiltinEnumExpression<tint::type::TexelFormat>);
+TINT_INSTANTIATE_TYPEINFO(tint::sem::BuiltinEnumExpression<tint::builtin::TexelFormat>);
namespace tint::resolver {
namespace {
@@ -1502,7 +1502,7 @@
return sem_.AsAddressSpace(Expression(expr));
}
-sem::BuiltinEnumExpression<type::TexelFormat>* Resolver::TexelFormatExpression(
+sem::BuiltinEnumExpression<builtin::TexelFormat>* Resolver::TexelFormatExpression(
const ast::Expression* expr) {
return sem_.AsTexelFormat(Expression(expr));
}
@@ -2987,8 +2987,8 @@
expr, current_statement_, addr);
}
- if (auto fmt = resolved->TexelFormat(); fmt != type::TexelFormat::kUndefined) {
- return builder_->create<sem::BuiltinEnumExpression<type::TexelFormat>>(
+ if (auto fmt = resolved->TexelFormat(); fmt != builtin::TexelFormat::kUndefined) {
+ return builder_->create<sem::BuiltinEnumExpression<builtin::TexelFormat>>(
expr, current_statement_, fmt);
}
diff --git a/src/tint/resolver/resolver.h b/src/tint/resolver/resolver.h
index b94467d..aa688c3 100644
--- a/src/tint/resolver/resolver.h
+++ b/src/tint/resolver/resolver.h
@@ -145,10 +145,11 @@
sem::BuiltinEnumExpression<builtin::AddressSpace>* AddressSpaceExpression(
const ast::Expression* expr);
- /// @returns the call of Expression() cast to a sem::BuiltinEnumExpression<type::TexelFormat>.
- /// If the sem::Expression is not a sem::BuiltinEnumExpression<type::TexelFormat>, then an error
- /// diagnostic is raised and nullptr is returned.
- sem::BuiltinEnumExpression<type::TexelFormat>* TexelFormatExpression(
+ /// @returns the call of Expression() cast to a
+ /// sem::BuiltinEnumExpression<builtin::TexelFormat>. If the sem::Expression is not a
+ /// sem::BuiltinEnumExpression<builtin::TexelFormat>, then an error diagnostic is raised and
+ /// nullptr is returned.
+ sem::BuiltinEnumExpression<builtin::TexelFormat>* TexelFormatExpression(
const ast::Expression* expr);
/// @returns the call of Expression() cast to a sem::BuiltinEnumExpression<builtin::Access>*.
diff --git a/src/tint/resolver/sem_helper.cc b/src/tint/resolver/sem_helper.cc
index 87f506b..3379ad2 100644
--- a/src/tint/resolver/sem_helper.cc
+++ b/src/tint/resolver/sem_helper.cc
@@ -84,7 +84,7 @@
std::string(wanted),
addr->Declaration()->source);
},
- [&](const sem::BuiltinEnumExpression<type::TexelFormat>* fmt) {
+ [&](const sem::BuiltinEnumExpression<builtin::TexelFormat>* fmt) {
AddError("cannot use texel format '" + utils::ToString(fmt->Value()) + "' as " +
std::string(wanted),
fmt->Declaration()->source);
diff --git a/src/tint/resolver/sem_helper.h b/src/tint/resolver/sem_helper.h
index 9aedcd1..e8940d1 100644
--- a/src/tint/resolver/sem_helper.h
+++ b/src/tint/resolver/sem_helper.h
@@ -120,11 +120,11 @@
/// @param expr the semantic node
/// @returns nullptr if @p expr is nullptr, or @p expr cast to
- /// sem::BuiltinEnumExpression<type::TexelFormat> if the cast is successful, otherwise an error
- /// diagnostic is raised.
- sem::BuiltinEnumExpression<type::TexelFormat>* AsTexelFormat(sem::Expression* expr) const {
+ /// sem::BuiltinEnumExpression<builtin::TexelFormat> if the cast is successful, otherwise an
+ /// error diagnostic is raised.
+ sem::BuiltinEnumExpression<builtin::TexelFormat>* AsTexelFormat(sem::Expression* expr) const {
if (TINT_LIKELY(expr)) {
- auto* enum_expr = expr->As<sem::BuiltinEnumExpression<type::TexelFormat>>();
+ auto* enum_expr = expr->As<sem::BuiltinEnumExpression<builtin::TexelFormat>>();
if (TINT_LIKELY(enum_expr)) {
return enum_expr;
}
diff --git a/src/tint/resolver/side_effects_test.cc b/src/tint/resolver/side_effects_test.cc
index 88c51ef..6f23ed3 100644
--- a/src/tint/resolver/side_effects_test.cc
+++ b/src/tint/resolver/side_effects_test.cc
@@ -17,6 +17,7 @@
#include "gtest/gtest.h"
#include "src/tint/builtin/address_space.h"
#include "src/tint/builtin/extension.h"
+#include "src/tint/builtin/texel_format.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "src/tint/sem/index_accessor_expression.h"
#include "src/tint/sem/member_accessor_expression.h"
@@ -191,10 +192,11 @@
Group(0_a), Binding(AInt(next_binding++)));
GlobalVar("t2d_multi", ty.multisampled_texture(type::TextureDimension::k2d, ty.f32()),
Group(0_a), Binding(AInt(next_binding++)));
- GlobalVar("tstorage2d",
- ty.storage_texture(type::TextureDimension::k2d, type::TexelFormat::kR32Float,
- tint::builtin::Access::kWrite),
- Group(0_a), Binding(AInt(next_binding++)));
+ GlobalVar(
+ "tstorage2d",
+ ty.storage_texture(type::TextureDimension::k2d, tint::builtin::TexelFormat::kR32Float,
+ tint::builtin::Access::kWrite),
+ Group(0_a), Binding(AInt(next_binding++)));
GlobalVar("s2d", ty.sampler(type::SamplerKind::kSampler), Group(0_a),
Binding(AInt(next_binding++)));
GlobalVar("scomp", ty.sampler(type::SamplerKind::kComparisonSampler), Group(0_a),
diff --git a/src/tint/resolver/type_validation_test.cc b/src/tint/resolver/type_validation_test.cc
index 5e46134..b9f2edb 100644
--- a/src/tint/resolver/type_validation_test.cc
+++ b/src/tint/resolver/type_validation_test.cc
@@ -1074,7 +1074,7 @@
// var a : texture_storage_*<r32uint, write>;
auto& params = GetParam();
- auto st = ty(Source{{12, 34}}, params.name, utils::ToString(type::TexelFormat::kR32Uint),
+ auto st = ty(Source{{12, 34}}, params.name, utils::ToString(builtin::TexelFormat::kR32Uint),
utils::ToString(builtin::Access::kWrite));
GlobalVar("a", st, Group(0_a), Binding(0_a));
@@ -1091,27 +1091,28 @@
testing::ValuesIn(Dimension_cases));
struct FormatParams {
- type::TexelFormat format;
+ builtin::TexelFormat format;
bool is_valid;
};
-static constexpr FormatParams format_cases[] = {FormatParams{type::TexelFormat::kBgra8Unorm, true},
- FormatParams{type::TexelFormat::kR32Float, true},
- FormatParams{type::TexelFormat::kR32Sint, true},
- FormatParams{type::TexelFormat::kR32Uint, true},
- FormatParams{type::TexelFormat::kRg32Float, true},
- FormatParams{type::TexelFormat::kRg32Sint, true},
- FormatParams{type::TexelFormat::kRg32Uint, true},
- FormatParams{type::TexelFormat::kRgba16Float, true},
- FormatParams{type::TexelFormat::kRgba16Sint, true},
- FormatParams{type::TexelFormat::kRgba16Uint, true},
- FormatParams{type::TexelFormat::kRgba32Float, true},
- FormatParams{type::TexelFormat::kRgba32Sint, true},
- FormatParams{type::TexelFormat::kRgba32Uint, true},
- FormatParams{type::TexelFormat::kRgba8Sint, true},
- FormatParams{type::TexelFormat::kRgba8Snorm, true},
- FormatParams{type::TexelFormat::kRgba8Uint, true},
- FormatParams{type::TexelFormat::kRgba8Unorm, true}};
+static constexpr FormatParams format_cases[] = {
+ FormatParams{builtin::TexelFormat::kBgra8Unorm, true},
+ FormatParams{builtin::TexelFormat::kR32Float, true},
+ FormatParams{builtin::TexelFormat::kR32Sint, true},
+ FormatParams{builtin::TexelFormat::kR32Uint, true},
+ FormatParams{builtin::TexelFormat::kRg32Float, true},
+ FormatParams{builtin::TexelFormat::kRg32Sint, true},
+ FormatParams{builtin::TexelFormat::kRg32Uint, true},
+ FormatParams{builtin::TexelFormat::kRgba16Float, true},
+ FormatParams{builtin::TexelFormat::kRgba16Sint, true},
+ FormatParams{builtin::TexelFormat::kRgba16Uint, true},
+ FormatParams{builtin::TexelFormat::kRgba32Float, true},
+ FormatParams{builtin::TexelFormat::kRgba32Sint, true},
+ FormatParams{builtin::TexelFormat::kRgba32Uint, true},
+ FormatParams{builtin::TexelFormat::kRgba8Sint, true},
+ FormatParams{builtin::TexelFormat::kRgba8Snorm, true},
+ FormatParams{builtin::TexelFormat::kRgba8Uint, true},
+ FormatParams{builtin::TexelFormat::kRgba8Unorm, true}};
using StorageTextureFormatTest = ResolverTestWithParam<FormatParams>;
TEST_P(StorageTextureFormatTest, All) {
@@ -1185,7 +1186,7 @@
// var a : texture_storage_1d<r32uint, read_write>;
auto st = ty.storage_texture(Source{{12, 34}}, type::TextureDimension::k1d,
- type::TexelFormat::kR32Uint, builtin::Access::kReadWrite);
+ builtin::TexelFormat::kR32Uint, builtin::Access::kReadWrite);
GlobalVar("a", st, Group(0_a), Binding(0_a));
@@ -1199,7 +1200,7 @@
// var a : texture_storage_1d<r32uint, read>;
auto st = ty.storage_texture(Source{{12, 34}}, type::TextureDimension::k1d,
- type::TexelFormat::kR32Uint, builtin::Access::kRead);
+ builtin::TexelFormat::kR32Uint, builtin::Access::kRead);
GlobalVar("a", st, Group(0_a), Binding(0_a));
@@ -1212,7 +1213,7 @@
// @group(0) @binding(0)
// var a : texture_storage_1d<r32uint, write>;
- auto st = ty.storage_texture(type::TextureDimension::k1d, type::TexelFormat::kR32Uint,
+ auto st = ty.storage_texture(type::TextureDimension::k1d, builtin::TexelFormat::kR32Uint,
builtin::Access::kWrite);
GlobalVar("a", st, Group(0_a), Binding(0_a));
diff --git a/src/tint/resolver/validator.cc b/src/tint/resolver/validator.cc
index 242a462..9577d59 100644
--- a/src/tint/resolver/validator.cc
+++ b/src/tint/resolver/validator.cc
@@ -88,25 +88,25 @@
}
}
-bool IsValidStorageTextureTexelFormat(type::TexelFormat format) {
+bool IsValidStorageTextureTexelFormat(builtin::TexelFormat format) {
switch (format) {
- case type::TexelFormat::kBgra8Unorm:
- case type::TexelFormat::kR32Uint:
- case type::TexelFormat::kR32Sint:
- case type::TexelFormat::kR32Float:
- case type::TexelFormat::kRg32Uint:
- case type::TexelFormat::kRg32Sint:
- case type::TexelFormat::kRg32Float:
- case type::TexelFormat::kRgba8Unorm:
- case type::TexelFormat::kRgba8Snorm:
- case type::TexelFormat::kRgba8Uint:
- case type::TexelFormat::kRgba8Sint:
- case type::TexelFormat::kRgba16Uint:
- case type::TexelFormat::kRgba16Sint:
- case type::TexelFormat::kRgba16Float:
- case type::TexelFormat::kRgba32Uint:
- case type::TexelFormat::kRgba32Sint:
- case type::TexelFormat::kRgba32Float:
+ case builtin::TexelFormat::kBgra8Unorm:
+ case builtin::TexelFormat::kR32Uint:
+ case builtin::TexelFormat::kR32Sint:
+ case builtin::TexelFormat::kR32Float:
+ case builtin::TexelFormat::kRg32Uint:
+ case builtin::TexelFormat::kRg32Sint:
+ case builtin::TexelFormat::kRg32Float:
+ case builtin::TexelFormat::kRgba8Unorm:
+ case builtin::TexelFormat::kRgba8Snorm:
+ case builtin::TexelFormat::kRgba8Uint:
+ case builtin::TexelFormat::kRgba8Sint:
+ case builtin::TexelFormat::kRgba16Uint:
+ case builtin::TexelFormat::kRgba16Sint:
+ case builtin::TexelFormat::kRgba16Float:
+ case builtin::TexelFormat::kRgba32Uint:
+ case builtin::TexelFormat::kRgba32Sint:
+ case builtin::TexelFormat::kRgba32Float:
return true;
default:
return false;
