Commit e983f39d authored by Christopher Cameron's avatar Christopher Cameron Committed by Commit Bot

macOS/ARM: Use cc_unittests ARM64 tolerance on macOS too

There exist separate tolerances for desktop ARM64 (Windows and Fuchsia)
already. They are needed for macOS as well.

Bug: 1128443
Change-Id: I93b14ea6acf26c1d1aea6748134988690fa9990f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424712Reviewed-by: default avatarSunny Sachanandani <sunnyps@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809567}
parent be6a8a34
...@@ -817,10 +817,10 @@ TEST_P(LayerTreeHostFiltersPixelTest, RotatedFilter) { ...@@ -817,10 +817,10 @@ TEST_P(LayerTreeHostFiltersPixelTest, RotatedFilter) {
background->AddChild(child); background->AddChild(child);
#if defined(OS_WIN) || defined(OS_FUCHSIA) #if defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_MAC)
#if defined (ARCH_CPU_ARM64) #if defined(ARCH_CPU_ARM64)
// Windows ARM64 and Fuchsia has some pixels difference // Windows, macOS, and Fuchsia on ARM64 has some pixels difference
// crbug.com/1029728, crbug.com/1048249 // crbug.com/1029728, crbug.com/1048249, crbug.com/1128443
float percentage_pixels_large_error = 0.391112f; float percentage_pixels_large_error = 0.391112f;
float average_error_allowed_in_bad_pixels = 1.1f; float average_error_allowed_in_bad_pixels = 1.1f;
int large_error_allowed = 3; int large_error_allowed = 3;
...@@ -879,13 +879,15 @@ TEST_P(LayerTreeHostFiltersPixelTest, RotatedDropShadowFilter) { ...@@ -879,13 +879,15 @@ TEST_P(LayerTreeHostFiltersPixelTest, RotatedDropShadowFilter) {
background->AddChild(child); background->AddChild(child);
#if defined(OS_WIN) || defined(ARCH_CPU_ARM64) #if defined(OS_WIN) || defined(ARCH_CPU_ARM64)
#if (defined(OS_WIN) && defined(ARCH_CPU_ARM64)) || defined(OS_FUCHSIA) #if defined(ARCH_CPU_ARM64) && \
// Windows ARM64 has some pixels difference: crbug.com/1029729 (defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_MAC))
// Windows, macOS, and Fuchsia on ARM64 has some pixels difference.
// crbug.com/1029728, crbug.com/1128443
float percentage_pixels_large_error = 0.89f; float percentage_pixels_large_error = 0.89f;
float average_error_allowed_in_bad_pixels = 5.f; float average_error_allowed_in_bad_pixels = 5.f;
int large_error_allowed = 17; int large_error_allowed = 17;
#else #else
// Windows and ARM64 have 3 pixels off by 1: crbug.com/259915 // Windows and all other ARM64 have 3 pixels off by 1: crbug.com/259915
float percentage_pixels_large_error = 0.00333334f; // 3px / (300*300) float percentage_pixels_large_error = 0.00333334f; // 3px / (300*300)
float average_error_allowed_in_bad_pixels = 1.f; float average_error_allowed_in_bad_pixels = 1.f;
int large_error_allowed = 1; int large_error_allowed = 1;
......
...@@ -774,10 +774,10 @@ class LayerTreeHostMaskAsBlendingPixelTest ...@@ -774,10 +774,10 @@ class LayerTreeHostMaskAsBlendingPixelTest
small_error_allowed = 1; small_error_allowed = 1;
} else { } else {
#if defined(ARCH_CPU_ARM64) #if defined(ARCH_CPU_ARM64)
#if defined(OS_WIN) || defined(OS_FUCHSIA) #if defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_MAC)
// Windows and Fuchsia ARM64 has some pixels difference // ARM Windows, macOS, and Fuchsia has some pixels difference
// Affected tests: RotatedClippedCircle, RotatedClippedCircleUnderflow // Affected tests: RotatedClippedCircle, RotatedClippedCircleUnderflow
// crbug.com/1030244, crbug.com/1048249 // crbug.com/1030244, crbug.com/1048249, crbug.com/1128443
percentage_pixels_error = 6.1f; percentage_pixels_error = 6.1f;
average_error_allowed_in_bad_pixels = 5.f; average_error_allowed_in_bad_pixels = 5.f;
large_error_allowed = 20; large_error_allowed = 20;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment