commit 9f0b827df13bff9c6d9b95e2dae72a1c3102b239
author Carl Woffenden <cwoffenden@gmail.com> Mon Jan 04 13:28:29 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon Jan 04 13:28:29 2021 +0000
tree 16efdaa876f88da0c1501265f2b0ca9bd0eae437
parent 86980018b3f2786aeb5ded1220ec94bc927fa6b2

Minor fix to build with MSVC: Removes constructor ambiguity

Fixes error C2440: 'return': cannot convert from 'dawn_native::Aspect' to 'Result<dawn_native::Aspect,dawn_native::ErrorData>'

Change-Id: Ia63ced7fe9582c88a4173db008226733bdd06cac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/36080
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Carl Woffenden <cwoffenden@gmail.com>

src/dawn_native/CommandValidation.cpp

diff --git a/src/dawn_native/CommandValidation.cpp b/src/dawn_native/CommandValidation.cpp
index bf7da68..9d4124c 100644
--- a/src/dawn_native/CommandValidation.cpp
+++ b/src/dawn_native/CommandValidation.cpp
@@ -655,7 +655,8 @@
         switch (view.aspect) {
             case wgpu::TextureAspect::All:
                 if (HasOneBit(format.aspects)) {
-                    return Aspect{format.aspects};
+                    Aspect single = format.aspects;
+                    return single;
                 } else {
                     return DAWN_VALIDATION_ERROR(
                         "A single aspect must be selected for multi-planar formats in "