SkQP: relax tests again
also, never execute `atlastext`.
BUG=skia:7691
Change-Id: I190d9603085bc085e54290a522f98b12578032d9
Reviewed-on: https://skia-review.googlesource.com/112402
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index 3d3a9bf..75db39a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -53,7 +53,7 @@
skia_jumper_ccache = ""
skia_skqp_enable_driver_correctness_workarounds = false
- skia_skqp_global_error_tolerance = 0
+ skia_skqp_global_error_tolerance = 8
}
declare_args() {
skia_use_dng_sdk = !is_fuchsia && skia_use_libjpeg_turbo && skia_use_zlib
diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt
index 141e3f7..c0aeccc 100644
--- a/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt
+++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt
@@ -2,6 +2,7 @@
OverStroke
aaxfermodes
addarc
+addarc_meas
animated-image-blurs
anisotropic_hq
arcs_as_paths
@@ -19,6 +20,7 @@
blurs
bmp_filter_quality_repeat
circles
+circular_arcs_stroke_and_fill_butt
circular_arcs_stroke_butt
circular_arcs_stroke_round
circular_arcs_stroke_square
@@ -33,12 +35,18 @@
convex-lineonly-paths-stroke-and-fill
convex-polygon-inset
convex_poly_clip
+convexpaths
dash_line_zero_off_interval
dashcircle
dashing
dashing4
+dashing5_bw
dftext
dftext_blob_persp
+downsamplebitmap_checkerboard_high_512_256
+downsamplebitmap_checkerboard_low_512_256
+downsamplebitmap_checkerboard_medium_512_256
+downsamplebitmap_checkerboard_none_512_256
downsamplebitmap_image_high
downsamplebitmap_image_low
downsamplebitmap_image_medium
@@ -48,6 +56,8 @@
downsamplebitmap_text_medium_72.00pt
downsamplebitmap_text_none_72.00pt
draw-atlas
+drawminibitmaprect
+drawminibitmaprect_aa
drawregionmodes
encode-platform
encode-srgb-webp
@@ -71,18 +81,26 @@
filterbitmap_text_3.00pt
filterbitmap_text_7.00pt
filterfastbounds
+filterindiabox
fontmgr_bounds
+fontmgr_bounds_0.75_0
fontmgr_bounds_1_-0.25
+getpostextpath
glyph_pos_h_s
gradients_2pt_conical_edge
gradients_2pt_conical_edge_mirror
gradients_2pt_conical_edge_repeat
+gradients_2pt_conical_outside
+gradients_2pt_conical_outside_mirror
+gradients_2pt_conical_outside_nodither
+gradients_2pt_conical_outside_repeat
gradients_degenerate_2pt
gradients_local_perspective
gradients_many
gradients_no_texture
gradients_no_texture_nodither
hairlines
+hittestpath
image-cacherator-from-picture
image-cacherator-from-raster
image-cacherator-from-texture
@@ -99,9 +117,12 @@
imagefiltersscaled
imagefiltersstroked
imagefilterstransformed
+imagemagnifier
linear_gradient
+longpathdash
lumafilter
manycircles
+mipmap
mipmap_srgb
nested_aa
nested_flipY_aa
@@ -113,9 +134,12 @@
parsedpaths
pathfill
perlinnoise
+persp_shaders_aa
+persp_shaders_bw
pictureshader
polygons
rects
+repeated_bitmap_jpg
rrect
rrect_draw_aa
savelayer_with_backdrop
@@ -137,6 +161,7 @@
strokerects
strokes3
strokes_round
+sweep_tiling
tablecolorfilter
tall_stretched_bitmaps
testgradient
@@ -147,7 +172,9 @@
varied_text_clipped_lcd
varied_text_clipped_no_lcd
varied_text_ignorable_clip_no_lcd
+verttext
verylarge_picture_image
+verylargebitmap
windowrectangles_mask
yuv_to_rgb_effect
zeroPath
diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGMs.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGMs.txt
index fc2813b..6c31761 100644
--- a/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGMs.txt
+++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGMs.txt
@@ -24,7 +24,6 @@
arcs_as_paths
arcto
arithmode
-atlastext
badpaint
bezier_conic_effects
bezier_cubic_effects
diff --git a/tools/skqp/generate_gn_args b/tools/skqp/generate_gn_args
index c9b1891..52fdc04 100755
--- a/tools/skqp/generate_gn_args
+++ b/tools/skqp/generate_gn_args
@@ -15,7 +15,7 @@
ndk_api = {api_level}
skia_enable_fontmgr_empty = true
skia_enable_pdf = false
-skia_skqp_global_error_tolerance = 4
+skia_skqp_global_error_tolerance = 8
skia_use_dng_sdk = false
skia_use_expat = false
skia_use_icu = false
diff --git a/tools/skqp/gn_to_bp.py b/tools/skqp/gn_to_bp.py
index 299b1c9..86152e8 100644
--- a/tools/skqp/gn_to_bp.py
+++ b/tools/skqp/gn_to_bp.py
@@ -127,7 +127,7 @@
# setup skqp
'is_debug': 'false',
'ndk_api': '26',
- 'skia_skqp_global_error_tolerance': '4',
+ 'skia_skqp_global_error_tolerance': '8',
# setup vulkan
'skia_use_vulkan': 'true',
