From 7fc08585d0d4daada1c8600b6cdef970ee6c2369 Mon Sep 17 00:00:00 2001 From: msarett Date: Thu, 18 Aug 2016 14:29:22 -0700 Subject: Revert of Batched implementation of drawLattice() for GPU (patchset #7 id:180001 of https://codereview.chromium.org/2255963002/ ) Reason for revert: Things drawing weird. Original issue's description: > Batched implementation of drawLattice() for GPU > > Bechmarks (Nexus 6P): > > Src=100x100, Dst=250x250, NumRects=9 > Android 77.7us > Skia (without patch) 57.2us > Skia (with patch) 34.7us > > Src=100x100, Dst=500x500, NumRects=9 > Android 77.0us > Skia (without patch) 56.9us > Skia (with patch) 44.5us > > Src=100x100, Dst=1000x1000, NumRects=9 > Android 180us > Skia (without patch) 96.8us > Skia (with patch) 70.5us > > Src=100x100, Dst=250x250, NumRects=15 > Android 208us > Skia (without patch) 155us > Skia (with patch) 55.9us > > Src=100x100, Dst=500x500, NumRects=15 > Android 207us > Skia (without patch) 152us > Skia (with patch) 63.0us > > Src=100x100, Dst=1000x1000, NumRects=15 > Android 233us > Skia (without patch) 156us > Skia (with patch) 99.9us > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2255963002 > > Committed: https://skia.googlesource.com/skia/+/93242c4ae50dfcc0d922cdb3ba80bbc7b4bbe93d TBR=bsalomon@google.com,reed@google.com,djsollen@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2255683004 --- src/gpu/batches/GrNinePatch.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/gpu/batches/GrNinePatch.h') diff --git a/src/gpu/batches/GrNinePatch.h b/src/gpu/batches/GrNinePatch.h index 02664c6449..0a4ffd6e03 100644 --- a/src/gpu/batches/GrNinePatch.h +++ b/src/gpu/batches/GrNinePatch.h @@ -9,18 +9,16 @@ #define GrNinePatch_DEFINED #include "GrColor.h" -#include "SkCanvas.h" class GrDrawBatch; class SkBitmap; -class SkLatticeIter; class SkMatrix; struct SkIRect; struct SkRect; namespace GrNinePatch { GrDrawBatch* CreateNonAA(GrColor color, const SkMatrix& viewMatrix, int imageWidth, int imageHeight, - std::unique_ptr iter, const SkRect& dst); + const SkIRect& center, const SkRect& dst); }; #endif -- cgit v1.2.3