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/GrCCClipPath.cpp

diff --git a/src/gpu/ccpr/GrCCClipPath.cpp b/src/gpu/ccpr/GrCCClipPath.cpp
index 6b8a96c..9b8a737 100644
--- a/src/gpu/ccpr/GrCCClipPath.cpp
+++ b/src/gpu/ccpr/GrCCClipPath.cpp
@@ -48,11 +48,12 @@
     fAccessRect = accessRect;
 }
 
-void GrCCClipPath::placePathInAtlas(GrCCPerFlushResources* resources,
-                                    GrOnFlushResourceProvider* onFlushRP) {
+void GrCCClipPath::renderPathInAtlas(GrCCPerFlushResources* resources,
+                                     GrOnFlushResourceProvider* onFlushRP) {
     SkASSERT(this->isInitialized());
     SkASSERT(!fHasAtlas);
-    fAtlas = resources->addDeviceSpacePathToAtlas(*onFlushRP->caps(), fAccessRect, fDeviceSpacePath,
-                                                  fPathDevIBounds, &fAtlasOffsetX, &fAtlasOffsetY);
+    fAtlas = resources->renderDeviceSpacePathInAtlas(*onFlushRP->caps(), fAccessRect,
+                                                     fDeviceSpacePath, fPathDevIBounds,
+                                                     &fAtlasOffsetX, &fAtlasOffsetY);
     SkDEBUGCODE(fHasAtlas = true);
 }