From 67973e67062fe2605953cea6d641e85d12aaf1ff Mon Sep 17 00:00:00 2001 From: Brian Sheedy Date: Fri, 10 Jun 2022 22:12:43 +0000 Subject: [PATCH] Suppress Mac Intel 12.4 failures Suppresses failures found when switching from 11.5.2 to 12.4 on the Intel Mac Minis. Bug: dawn:1461, dawn:1462, dawn:1463, chromium:1334335 Change-Id: Ie0d42a1b4aa81f457145a53eebb1501a5eb77fbe Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/93308 Reviewed-by: Austin Eng Auto-Submit: Brian Sheedy Commit-Queue: Brian Sheedy Kokoro: Kokoro --- src/dawn/tests/end2end/MultisampledRenderingTests.cpp | 6 ++++++ src/dawn/tests/end2end/RenderPassLoadOpTests.cpp | 4 ++++ webgpu-cts/expectations.txt | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/src/dawn/tests/end2end/MultisampledRenderingTests.cpp b/src/dawn/tests/end2end/MultisampledRenderingTests.cpp index 453375986e..8ef9de5afe 100644 --- a/src/dawn/tests/end2end/MultisampledRenderingTests.cpp +++ b/src/dawn/tests/end2end/MultisampledRenderingTests.cpp @@ -629,6 +629,9 @@ TEST_P(MultisampledRenderingTest, ResolveInto2DTextureWithEmptyFinalSampleMask) // Test doing MSAA resolve into multiple resolve targets works correctly with a non-default sample // 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)); + wgpu::TextureView multisampledColorView2 = CreateTextureForRenderAttachment(kColorFormat, kSampleCount).CreateView(); wgpu::Texture resolveTexture2 = CreateTextureForRenderAttachment(kColorFormat, 1); @@ -786,6 +789,9 @@ TEST_P(MultisampledRenderingTest, ResolveIntoMultipleResolveTargetsWithShaderOut // supported on some platforms. 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)); + wgpu::TextureView multisampledColorView2 = CreateTextureForRenderAttachment(kColorFormat, kSampleCount).CreateView(); wgpu::Texture resolveTexture2 = CreateTextureForRenderAttachment(kColorFormat, 1); diff --git a/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp b/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp index 69a250c836..681ec95819 100644 --- a/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp +++ b/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp @@ -246,6 +246,10 @@ TEST_P(RenderPassLoadOpTests, LoadOpClearIntegerFormatsToLargeValues) { // TODO(crbug.com/dawn/1109): Re-enable once fixed on Mac Mini 8,1s w/ 11.5. DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && IsMacOS(11, 5)); + // TODO(crbug.com/dawn/1463): Re-enable, might be the same as above just on + // 12.4 instead of 11.5. + DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && IsMacOS(12, 4)); + constexpr double kUint32MaxDouble = 4294967295.0; constexpr uint32_t kUint32Max = static_cast(kUint32MaxDouble); // RGBA32Uint for UINT32_MAX diff --git a/webgpu-cts/expectations.txt b/webgpu-cts/expectations.txt index dcb370e928..41ddf7314b 100644 --- a/webgpu-cts/expectations.txt +++ b/webgpu-cts/expectations.txt @@ -299,6 +299,14 @@ crbug.com/tint/1502 webgpu:shader,validation,parse,literal:abstract_float:val="1 crbug.com/tint/1502 webgpu:shader,validation,parse,literal:abstract_float:val="2.4e-2h" [ Failure ] crbug.com/tint/1525 webgpu:shader,validation,parse,literal:u32:val="-2147483648" [ Failure ] +################################################################################ +# Failures from upgrading Intel Mac Minis to 12.4 +# KEEP +################################################################################ +crbug.com/dawn/1461 [ monterey intel ] webgpu:api,operation,command_buffer,copyTextureToTexture:copy_depth_stencil:format="depth16unorm" [ Failure ] +crbug.com/dawn/1461 [ monterey intel ] webgpu:api,operation,command_buffer,copyTextureToTexture:copy_depth_stencil:format="depth24plus" [ Failure ] +crbug.com/dawn/1461 [ monterey intel ] webgpu:api,operation,command_buffer,copyTextureToTexture:copy_depth_stencil:format="depth24plus-stencil8" [ Failure ] + ################################################################################ # untriaged failures # KEEP