From 2a284de7a51c198096a6f34ec1cbfe9118db554c Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 20 Jun 2018 20:59:06 +0000 Subject: Revert "Update GPU DM/nanobench configs for color testing" This reverts commit 5e11777a06d591c1e6ab0523e9c7f4739e164609. Reason for revert: Bots with no F16 support failing (as expected). Original change's description: > 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 TBR=mtklein@google.com,bsalomon@google.com,brianosman@google.com Change-Id: I091269b93bc9e76c9d42f701d2018610b9c33a89 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/136300 Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- gm/path_stroke_with_zero_length.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gm') diff --git a/gm/path_stroke_with_zero_length.cpp b/gm/path_stroke_with_zero_length.cpp index 3cb789f0ac..63ffe951c6 100644 --- a/gm/path_stroke_with_zero_length.cpp +++ b/gm/path_stroke_with_zero_length.cpp @@ -35,9 +35,7 @@ static bool draw_path_cell(SkCanvas* canvas, SkImage* img, int expectedCaps) { SkImageInfo info = SkImageInfo::MakeN32Premul(w, h); SkAutoPixmapStorage pmap; pmap.alloc(info); - if (!img->readPixels(pmap, 0, 0)) { - return false; - } + SkAssertResult(img->readPixels(pmap, 0, 0)); // 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