commit 2093157afe7644f13ed2166f6e6ad99c3003daba
author Corentin Wallez <cwallez@chromium.org> Tue Dec 08 15:56:44 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Dec 08 15:56:44 2020 +0000
tree f77f5e1e588751a3d381be48e30cead86d154b3a
parent 0664a30565d9b61a69170aa76a717b13d58c665a

Rename TryConvertAspect to better reflect what it does.

Bug: dawn:441
Change-Id: I51d28102926fb00a7c6225bc3b84324fe8f1f6fe
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/34902
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

src/dawn_native/CommandValidation.cpp

diff --git a/src/dawn_native/CommandValidation.cpp b/src/dawn_native/CommandValidation.cpp
index 1a3a241..cbf9c75 100644
--- a/src/dawn_native/CommandValidation.cpp
+++ b/src/dawn_native/CommandValidation.cpp
@@ -577,7 +577,7 @@
             return DAWN_VALIDATION_ERROR("mipLevel out of range");
         }
 
-        if (TryConvertAspect(texture->GetFormat(), textureCopy.aspect) == Aspect::None) {
+        if (SelectFormatAspects(texture->GetFormat(), textureCopy.aspect) == Aspect::None) {
             return DAWN_VALIDATION_ERROR("Texture does not have selected aspect for texture copy.");
         }
 

src/dawn_native/Subresource.cpp

diff --git a/src/dawn_native/Subresource.cpp b/src/dawn_native/Subresource.cpp
index 766cb1d..4e613a6 100644
--- a/src/dawn_native/Subresource.cpp
+++ b/src/dawn_native/Subresource.cpp
@@ -26,12 +26,12 @@
     }
 
     Aspect ConvertAspect(const Format& format, wgpu::TextureAspect aspect) {
-        Aspect aspectMask = TryConvertAspect(format, aspect);
+        Aspect aspectMask = SelectFormatAspects(format, aspect);
         ASSERT(aspectMask != Aspect::None);
         return aspectMask;
     }
 
-    Aspect TryConvertAspect(const Format& format, wgpu::TextureAspect aspect) {
+    Aspect SelectFormatAspects(const Format& format, wgpu::TextureAspect aspect) {
         switch (aspect) {
             case wgpu::TextureAspect::All:
                 return format.aspects;

src/dawn_native/Subresource.h

diff --git a/src/dawn_native/Subresource.h b/src/dawn_native/Subresource.h
index 927f665..3090e7b 100644
--- a/src/dawn_native/Subresource.h
+++ b/src/dawn_native/Subresource.h
@@ -44,9 +44,10 @@
     // does not exist in the format.
     Aspect ConvertAspect(const Format& format, wgpu::TextureAspect aspect);
 
-    // Try to convert the TextureAspect to an Aspect mask for the format. May return
-    // Aspect::None.
-    Aspect TryConvertAspect(const Format& format, wgpu::TextureAspect aspect);
+    // Returns the Aspects of the Format that are selected by the wgpu::TextureAspect.
+    // Note that this can return Aspect::None if the Format doesn't have any of the
+    // selected aspects.
+    Aspect SelectFormatAspects(const Format& format, wgpu::TextureAspect aspect);
 
     // Helper struct to make it clear that what the parameters of a range mean.
     template <typename T>

src/dawn_native/Texture.cpp

diff --git a/src/dawn_native/Texture.cpp b/src/dawn_native/Texture.cpp
index cc345e3..171f02b 100644
--- a/src/dawn_native/Texture.cpp
+++ b/src/dawn_native/Texture.cpp
@@ -266,7 +266,7 @@
         DAWN_TRY(ValidateTextureFormat(descriptor->format));
 
         DAWN_TRY(ValidateTextureAspect(descriptor->aspect));
-        if (TryConvertAspect(texture->GetFormat(), descriptor->aspect) == Aspect::None) {
+        if (SelectFormatAspects(texture->GetFormat(), descriptor->aspect) == Aspect::None) {
             return DAWN_VALIDATION_ERROR("Texture does not have selected aspect for texture view.");
         }