commit 0c8ad696caa0fbb61bb742ab9d3ee5ca0e56abd0
author Ryan Harrison <rharrison@chromium.org> Wed May 07 14:25:44 2025 -0700
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 07 14:25:44 2025 -0700
tree 582a692398709424a6655d8b05f2087c950c1777
parent 2c7270e2539378085bcf2ac97c0055987acd92fe

[tint][ir][val] Check MultisampledTextures

Fixes: 414949493
Change-Id: I88484c4beff3e023f22804e52ba0a6223e6fa4a7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/241115
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Commit-Queue: James Price <jrprice@google.com>

src/tint/lang/core/ir/validator.cc

diff --git a/src/tint/lang/core/ir/validator.cc b/src/tint/lang/core/ir/validator.cc
index 05b29da..5a21d64 100644
--- a/src/tint/lang/core/ir/validator.cc
+++ b/src/tint/lang/core/ir/validator.cc
@@ -1899,6 +1899,23 @@
                 }
                 return true;
             },
+            [&](const core::type::MultisampledTexture* ms) {
+                if (!ms->Type()->IsAnyOf<core::type::F32, core::type::I32, core::type::U32>()) {
+                    diag() << "invalid multisampled texture sample type: " << NameOf(ms->Type());
+                    return false;
+                }
+
+                switch (ms->Dim()) {
+                    case core::type::TextureDimension::k2d:
+                    case core::type::TextureDimension::k2dArray:
+                        break;
+                    default:
+                        diag() << "invalid multisampled texture dimension: "
+                               << style::Literal(ToString(ms->Dim()));
+                        return false;
+                }
+                return true;
+            },
             [&](const core::type::StorageTexture* s) {
                 switch (s->Dim()) {
                     case core::type::TextureDimension::kCube:

src/tint/lang/core/ir/validator_type_test.cc

diff --git a/src/tint/lang/core/ir/validator_type_test.cc b/src/tint/lang/core/ir/validator_type_test.cc
index 314e90d..38f09dc 100644
--- a/src/tint/lang/core/ir/validator_type_test.cc
+++ b/src/tint/lang/core/ir/validator_type_test.cc
@@ -397,6 +397,69 @@
                                          std::make_tuple(false, TypeBuilder<core::type::Bool>),
                                          std::make_tuple(false, TypeBuilder<core::type::Void>)));
 
+using Type_MultisampledTextureTypeAndDimension =
+    IRTestParamHelper<std::tuple<std::tuple<
+                                     /* type_allowed */ bool,
+                                     /* type_builder */ TypeBuilderFn>,
+                                 std::tuple<
+                                     /* dim_allowed */ bool,
+                                     /* dim */ core::type::TextureDimension>>>;
+
+TEST_P(Type_MultisampledTextureTypeAndDimension, Test) {
+    auto type_params = std::get<0>(GetParam());
+    bool type_allowed = std::get<0>(type_params);
+    auto* type = std::get<1>(type_params)(ty);
+
+    auto dim_params = std::get<1>(GetParam());
+    bool dim_allowed = std::get<0>(dim_params);
+    auto dim = std::get<1>(dim_params);
+
+    bool allowed = type_allowed && dim_allowed;
+
+    b.Append(mod.root_block, [&] {
+        auto* var = b.Var("ms", AddressSpace::kHandle, ty.multisampled_texture(dim, type));
+        var->SetBindingPoint(0, 0);
+    });
+
+    auto res = ir::Validate(mod);
+    if (allowed) {
+        ASSERT_EQ(res, Success) << res.Failure();
+    } else {
+        ASSERT_NE(res, Success);
+        if (!type_allowed) {
+            EXPECT_THAT(
+                res.Failure().reason,
+                testing::HasSubstr(":2:3 error: var: invalid multisampled texture sample type: '" +
+                                   type->FriendlyName()))
+                << res.Failure();
+        } else {
+            EXPECT_THAT(
+                res.Failure().reason,
+                testing::HasSubstr(":2:3 error: var: invalid multisampled texture dimension: '" +
+                                   std::string(ToString(dim))))
+                << res.Failure();
+        }
+    }
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    IR_ValidatorTest,
+    Type_MultisampledTextureTypeAndDimension,
+    testing::Combine(testing::Values(std::make_tuple(true, TypeBuilder<f32>),
+                                     std::make_tuple(true, TypeBuilder<i32>),
+                                     std::make_tuple(true, TypeBuilder<u32>),
+                                     std::make_tuple(false, TypeBuilder<f16>),
+                                     std::make_tuple(false, TypeBuilder<core::type::Bool>),
+                                     std::make_tuple(false, TypeBuilder<core::type::Void>)),
+                     testing::Values(std::make_tuple(false, core::type::TextureDimension::k1d),
+                                     std::make_tuple(true, core::type::TextureDimension::k2d),
+                                     std::make_tuple(true, core::type::TextureDimension::k2dArray),
+                                     std::make_tuple(false, core::type::TextureDimension::k3d),
+                                     std::make_tuple(false, core::type::TextureDimension::kCube),
+                                     std::make_tuple(false,
+                                                     core::type::TextureDimension::kCubeArray),
+                                     std::make_tuple(false, core::type::TextureDimension::kNone))));
+
 using Type_StorageTextureDimension = IRTestParamHelper<std::tuple<
     /* allowed */ bool,
     /* dim */ core::type::TextureDimension>>;