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

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 <rharrison@chromium.org>
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
Ryan Harrison 2021-03-22 21:26:17 +00:00 committed by Commit Bot service account
parent 5622b6bbd1
commit 8ac7f8ae9e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/main.cc
View File

@ -341,8 +341,8 @@ std::string ResourceTypeToString(
return "ComparisonSampler"; return "ComparisonSampler";
case tint::inspector::ResourceBinding::ResourceType::kSampledTexture: case tint::inspector::ResourceBinding::ResourceType::kSampledTexture:
return "SampledTexture"; return "SampledTexture";
case tint::inspector::ResourceBinding::ResourceType::kMulitsampledTexture: case tint::inspector::ResourceBinding::ResourceType::kMultisampledTexture:
return "MulitsampledTexture"; return "MultisampledTexture";
case tint::inspector::ResourceBinding::ResourceType:: case tint::inspector::ResourceBinding::ResourceType::
kReadOnlyStorageTexture: kReadOnlyStorageTexture:
return "ReadOnlyStorageTexture"; return "ReadOnlyStorageTexture";

2
src/inspector/inspector.cc
View File

@ -596,7 +596,7 @@ std::vector<ResourceBinding> Inspector::GetSampledTextureResourceBindingsImpl(
ResourceBinding entry; ResourceBinding entry;
entry.resource_type = entry.resource_type =
multisampled_only ? ResourceBinding::ResourceType::kMulitsampledTexture multisampled_only ? ResourceBinding::ResourceType::kMultisampledTexture
: ResourceBinding::ResourceType::kSampledTexture; : ResourceBinding::ResourceType::kSampledTexture;
entry.bind_group = binding_info.group->value(); entry.bind_group = binding_info.group->value();
entry.binding = binding_info.binding->value(); entry.binding = binding_info.binding->value();

2
src/inspector/inspector.h
View File

@ -100,7 +100,7 @@ struct ResourceBinding {
kSampler, kSampler,
kComparisonSampler, kComparisonSampler,
kSampledTexture, kSampledTexture,
kMulitsampledTexture, kMultisampledTexture,
kReadOnlyStorageTexture, kReadOnlyStorageTexture,
kWriteOnlyStorageTexture, kWriteOnlyStorageTexture,
kDepthTexture, kDepthTexture,

4
src/inspector/inspector_test.cc
View File

@ -2484,7 +2484,7 @@ TEST_P(InspectorGetMultisampledTextureResourceBindingsTestWithParam,
auto result = inspector.GetMultisampledTextureResourceBindings("ep"); auto result = inspector.GetMultisampledTextureResourceBindings("ep");
ASSERT_FALSE(inspector.has_error()) << inspector.error(); ASSERT_FALSE(inspector.has_error()) << inspector.error();
EXPECT_EQ(ResourceBinding::ResourceType::kMulitsampledTexture, EXPECT_EQ(ResourceBinding::ResourceType::kMultisampledTexture,
result[0].resource_type); result[0].resource_type);
ASSERT_EQ(1u, result.size()); ASSERT_EQ(1u, result.size());
EXPECT_EQ(0u, result[0].bind_group); EXPECT_EQ(0u, result[0].bind_group);
@ -2554,7 +2554,7 @@ TEST_P(InspectorGetMultisampledArrayTextureResourceBindingsTestWithParam,
ASSERT_FALSE(inspector.has_error()) << inspector.error(); ASSERT_FALSE(inspector.has_error()) << inspector.error();
ASSERT_EQ(1u, result.size()); ASSERT_EQ(1u, result.size());
EXPECT_EQ(ResourceBinding::ResourceType::kMulitsampledTexture, EXPECT_EQ(ResourceBinding::ResourceType::kMultisampledTexture,
result[0].resource_type); result[0].resource_type);
EXPECT_EQ(0u, result[0].bind_group); EXPECT_EQ(0u, result[0].bind_group);
EXPECT_EQ(0u, result[0].binding); EXPECT_EQ(0u, result[0].binding);