commit 9884ea0f30e423aca5f7ddcc77c2ab43c8a00c3e
author Brian Sheedy <bsheedy@google.com> Thu Sep 15 20:52:00 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 15 20:52:00 2022 +0000
tree 98ec1d5dbac42fe985fe2a1194a6a6905570a907
parent 2d334ed4f01b00211acd0360a5f9dc91d83354cb

[M104] Expand Mac Metal Intel suppression

Expands a couple of existing suppressions to also apply to Mac 12.5, as
the issue still occurs after the upgrade from Mac 12.4 to 12.5.

Cherrypick submitted with No-Try since Dawn trybots don't work
properly with branches.

Bug: dawn:1462
No-Try: true
Change-Id: Iba0041fd0f9deafeb3fb770867ffa2e2e4d12553
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101901
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>
(cherry picked from commit 3ada73160665a5bfea9dd79150e1639b48496ef3)
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/102404

src/dawn/tests/end2end/MultisampledRenderingTests.cpp

diff --git a/src/dawn/tests/end2end/MultisampledRenderingTests.cpp b/src/dawn/tests/end2end/MultisampledRenderingTests.cpp
index 8ef9de5..1d310ec 100644
--- a/src/dawn/tests/end2end/MultisampledRenderingTests.cpp
+++ b/src/dawn/tests/end2end/MultisampledRenderingTests.cpp
@@ -630,7 +630,7 @@
 // mask.
 TEST_P(MultisampledRenderingTest, ResolveIntoMultipleResolveTargetsWithSampleMask) {
     // TODO(crbug.com/dawn/1462): Re-enable on Mac Intel 12.4.
-    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && IsMacOS(12, 4));
+    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && (IsMacOS(12, 4) || IsMacOS(12, 5)));
 
     wgpu::TextureView multisampledColorView2 =
         CreateTextureForRenderAttachment(kColorFormat, kSampleCount).CreateView();
@@ -790,7 +790,7 @@
     DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_sample_variables"));
 
     // TODO(crbug.com/dawn/1462): Re-enable on Mac Intel 12.4.
-    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && IsMacOS(12, 4));
+    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && (IsMacOS(12, 4) || IsMacOS(12, 5)));
 
     wgpu::TextureView multisampledColorView2 =
         CreateTextureForRenderAttachment(kColorFormat, kSampleCount).CreateView();