From 5e11777a06d591c1e6ab0523e9c7f4739e164609 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 20 Jun 2018 14:53:06 -0400 Subject: Update GPU DM/nanobench configs for color testing - Rename '*srgbnl' to '*srgb'. - Add '*narrow' and '*enarrow' for testing a gamut narrower than sRGB. - Stopped blacklisting glessrgb. It no longer uses sRGB pixel configs, so should work fine on all GPUs. - Also runs 'esrgb' (F16 sRGB) everywhere. This is likely to fail on some devices that have poor (or no) F16 support. Change-Id: I941d0758adb3b0c895c7a8a85ff0ae4aa5bff6e7 Reviewed-on: https://skia-review.googlesource.com/136171 Commit-Queue: Brian Osman Reviewed-by: Brian Salomon Reviewed-by: Mike Klein --- gm/path_stroke_with_zero_length.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gm') diff --git a/gm/path_stroke_with_zero_length.cpp b/gm/path_stroke_with_zero_length.cpp index 63ffe951c6..3cb789f0ac 100644 --- a/gm/path_stroke_with_zero_length.cpp +++ b/gm/path_stroke_with_zero_length.cpp @@ -35,7 +35,9 @@ static bool draw_path_cell(SkCanvas* canvas, SkImage* img, int expectedCaps) { SkImageInfo info = SkImageInfo::MakeN32Premul(w, h); SkAutoPixmapStorage pmap; pmap.alloc(info); - SkAssertResult(img->readPixels(pmap, 0, 0)); + if (!img->readPixels(pmap, 0, 0)) { + return false; + } // To account for rasterization differences, we scan the middle two rows [y, y+1] of the image SkASSERT(h % 2 == 0); -- cgit v1.2.3