fix hal view formats

xiaopengli89 · Oct 30, 2023 · 1950abe · 1950abe
1 parent 981d16a
commit 1950abe
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/wgpu-core/src/device/resource.rs b/wgpu-core/src/device/resource.rs
@@ -703,17 +703,18 @@ impl<A: HalApi> Device<A> {
             if desc.format == *format {
                 continue;
             }
-            if let (
-                TextureFormat::NV12,
-                TextureFormat::R8Unorm
-                | TextureFormat::R8Uint
-                | TextureFormat::Rg8Unorm
-                | TextureFormat::Rg8Uint,
-            ) = (desc.format, *format)
+
+            if !matches!(
+                (desc.format, *format),
+                (
+                    TextureFormat::NV12,
+                    TextureFormat::R8Unorm
+                        | TextureFormat::R8Uint
+                        | TextureFormat::Rg8Unorm
+                        | TextureFormat::Rg8Uint,
+                )
+            ) && desc.format.remove_srgb_suffix() != format.remove_srgb_suffix()
             {
-                continue;
-            }
-            if desc.format.remove_srgb_suffix() != format.remove_srgb_suffix() {
                 return Err(CreateTextureError::InvalidViewFormat(*format, desc.format));
             }
             hal_view_formats.push(*format);