From 3ada73160665a5bfea9dd79150e1639b48496ef3 Mon Sep 17 00:00:00 2001 From: Brian Sheedy Date: Fri, 9 Sep 2022 21:26:19 +0000 Subject: [PATCH] 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. Bug: dawn:1462 Change-Id: Iba0041fd0f9deafeb3fb770867ffa2e2e4d12553 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101901 Reviewed-by: Austin Eng Commit-Queue: Brian Sheedy Auto-Submit: Brian Sheedy Kokoro: Kokoro Commit-Queue: Austin Eng --- src/dawn/tests/end2end/MultisampledRenderingTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dawn/tests/end2end/MultisampledRenderingTests.cpp b/src/dawn/tests/end2end/MultisampledRenderingTests.cpp index 07114a9168..65ae9aec9c 100644 --- a/src/dawn/tests/end2end/MultisampledRenderingTests.cpp +++ b/src/dawn/tests/end2end/MultisampledRenderingTests.cpp @@ -630,7 +630,7 @@ TEST_P(MultisampledRenderingTest, ResolveInto2DTextureWithEmptyFinalSampleMask) // 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 @@ TEST_P(MultisampledRenderingTest, ResolveIntoMultipleResolveTargetsWithShaderOut 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();