commit daef06ae3bdf6b61bdd13ed1eeb20f51fbedd763
author Chris Dalton <csmartdalton@google.com> Wed May 23 17:11:09 2018 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 24 00:11:51 2018 +0000
tree ece16cd0dc576e90f669b893b4153e3182515f53
parent 13235d8966e4242ef69264aa76ad71ac4021e506

ccpr: Handle winding and even-odd in the same shader

We are already waiting for an entire texture lookup anyway. A couple
extra flops should still complete before the texture fetch. This also
gives us better batching.

TBR=bsalomon@google.com

Bug: skia:
Change-Id: I7b8e3021c8baad200af99600c9592df5ed0e46bd
Reviewed-on: https://skia-review.googlesource.com/129881
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Auto-Submit: Chris Dalton <csmartdalton@google.com>

src/gpu/ccpr/GrCCPerFlushResources.cpp

diff --git a/src/gpu/ccpr/GrCCPerFlushResources.cpp b/src/gpu/ccpr/GrCCPerFlushResources.cpp
index a658bf7..3f02ac7 100644
--- a/src/gpu/ccpr/GrCCPerFlushResources.cpp
+++ b/src/gpu/ccpr/GrCCPerFlushResources.cpp
@@ -38,10 +38,10 @@
     SkDEBUGCODE(fPathInstanceBufferCount = numPathDraws);
 }
 
-GrCCAtlas* GrCCPerFlushResources::addPathToAtlas(const GrCaps& caps, const SkIRect& clipIBounds,
-                                                 const SkMatrix& m, const SkPath& path,
-                                                 SkRect* devBounds, SkRect* devBounds45,
-                                                 int16_t* atlasOffsetX, int16_t* atlasOffsetY) {
+GrCCAtlas* GrCCPerFlushResources::renderPathInAtlas(const GrCaps& caps, const SkIRect& clipIBounds,
+                                                    const SkMatrix& m, const SkPath& path,
+                                                    SkRect* devBounds, SkRect* devBounds45,
+                                                    int16_t* atlasOffsetX, int16_t* atlasOffsetY) {
     SkASSERT(this->isMapped());
     SkIRect devIBounds;
     fPathParser->parsePath(m, path, devBounds, devBounds45);
@@ -49,12 +49,12 @@
     return this->placeParsedPathInAtlas(caps, clipIBounds, devIBounds, atlasOffsetX, atlasOffsetY);
 }
 
-GrCCAtlas* GrCCPerFlushResources::addDeviceSpacePathToAtlas(const GrCaps& caps,
-                                                            const SkIRect& clipIBounds,
-                                                            const SkPath& devPath,
-                                                            const SkIRect& devPathIBounds,
-                                                            int16_t* atlasOffsetX,
-                                                            int16_t* atlasOffsetY) {
+GrCCAtlas* GrCCPerFlushResources::renderDeviceSpacePathInAtlas(const GrCaps& caps,
+                                                               const SkIRect& clipIBounds,
+                                                               const SkPath& devPath,
+                                                               const SkIRect& devPathIBounds,
+                                                               int16_t* atlasOffsetX,
+                                                               int16_t* atlasOffsetY) {
     SkASSERT(this->isMapped());
     fPathParser->parseDeviceSpacePath(devPath);
     return this->placeParsedPathInAtlas(caps, clipIBounds, devPathIBounds, atlasOffsetX,