From 8ac7f8ae9e44449fff507cd86333187a832b5c34 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 22 Mar 2021 21:26:17 +0000 Subject: [PATCH] Fix typo in enum This enum isn't being used in Dawn yet, so it is safe to change without deprecating it first. BUG=dawn:700 Change-Id: I0f3cc788f26a8001f82aba4f9b3920e84204e4e4 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/45620 Commit-Queue: Ryan Harrison Auto-Submit: Ryan Harrison Reviewed-by: Ben Clayton Reviewed-by: David Neto --- samples/main.cc | 4 ++-- src/inspector/inspector.cc | 2 +- src/inspector/inspector.h | 2 +- src/inspector/inspector_test.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/main.cc b/samples/main.cc index eab18f4dca..b1db3a7b79 100644 --- a/samples/main.cc +++ b/samples/main.cc @@ -341,8 +341,8 @@ std::string ResourceTypeToString( return "ComparisonSampler"; case tint::inspector::ResourceBinding::ResourceType::kSampledTexture: return "SampledTexture"; - case tint::inspector::ResourceBinding::ResourceType::kMulitsampledTexture: - return "MulitsampledTexture"; + case tint::inspector::ResourceBinding::ResourceType::kMultisampledTexture: + return "MultisampledTexture"; case tint::inspector::ResourceBinding::ResourceType:: kReadOnlyStorageTexture: return "ReadOnlyStorageTexture"; diff --git a/src/inspector/inspector.cc b/src/inspector/inspector.cc index 88e7600f10..a45c811a1b 100644 --- a/src/inspector/inspector.cc +++ b/src/inspector/inspector.cc @@ -596,7 +596,7 @@ std::vector Inspector::GetSampledTextureResourceBindingsImpl( ResourceBinding entry; entry.resource_type = - multisampled_only ? ResourceBinding::ResourceType::kMulitsampledTexture + multisampled_only ? ResourceBinding::ResourceType::kMultisampledTexture : ResourceBinding::ResourceType::kSampledTexture; entry.bind_group = binding_info.group->value(); entry.binding = binding_info.binding->value(); diff --git a/src/inspector/inspector.h b/src/inspector/inspector.h index 3d9efcd6a5..ac966e5a63 100644 --- a/src/inspector/inspector.h +++ b/src/inspector/inspector.h @@ -100,7 +100,7 @@ struct ResourceBinding { kSampler, kComparisonSampler, kSampledTexture, - kMulitsampledTexture, + kMultisampledTexture, kReadOnlyStorageTexture, kWriteOnlyStorageTexture, kDepthTexture, diff --git a/src/inspector/inspector_test.cc b/src/inspector/inspector_test.cc index 97f9f551d3..fc95f29f56 100644 --- a/src/inspector/inspector_test.cc +++ b/src/inspector/inspector_test.cc @@ -2484,7 +2484,7 @@ TEST_P(InspectorGetMultisampledTextureResourceBindingsTestWithParam, auto result = inspector.GetMultisampledTextureResourceBindings("ep"); ASSERT_FALSE(inspector.has_error()) << inspector.error(); - EXPECT_EQ(ResourceBinding::ResourceType::kMulitsampledTexture, + EXPECT_EQ(ResourceBinding::ResourceType::kMultisampledTexture, result[0].resource_type); ASSERT_EQ(1u, result.size()); EXPECT_EQ(0u, result[0].bind_group); @@ -2554,7 +2554,7 @@ TEST_P(InspectorGetMultisampledArrayTextureResourceBindingsTestWithParam, ASSERT_FALSE(inspector.has_error()) << inspector.error(); ASSERT_EQ(1u, result.size()); - EXPECT_EQ(ResourceBinding::ResourceType::kMulitsampledTexture, + EXPECT_EQ(ResourceBinding::ResourceType::kMultisampledTexture, result[0].resource_type); EXPECT_EQ(0u, result[0].bind_group); EXPECT_EQ(0u, result[0].binding);