commit 56995b5cc00c9c83bd5fcf86bca9a67e939a96cb
author joshualitt <joshualitt@chromium.org> Thu Dec 11 15:44:02 2014 -0800
committer Commit bot <commit-bot@chromium.org> Thu Dec 11 15:44:02 2014 -0800
tree 5afd6c8625f50f0dcdb17e0c7ac8854fbda53495
parent 5756aff40921e700dc40f2a1757291a64acddeaa

Remove GP from drawstate, revision of invariant output for GP

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/c6bc58eded89b0c0a36b8e20e193c200f297a0da

Review URL: https://codereview.chromium.org/791743003

src/gpu/GrDefaultPathRenderer.cpp

diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index 24d3c45..d8f723e 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -498,12 +498,14 @@
                 drawState->enableState(GrDrawState::kNoColorWrites_StateBit);
             }
             GrDrawState::AutoRestoreEffects are(drawState);
-            drawState->setGeometryProcessor(
+            SkAutoTUnref<const GrGeometryProcessor> gp(
                     GrDefaultGeoProcFactory::Create(color,
                                                     GrDefaultGeoProcFactory::kPosition_GPType,
-                                                    newCoverage))->unref();
+                                                    false,
+                                                    newCoverage));
             if (indexCnt) {
                 target->drawIndexed(drawState,
+                                    gp,
                                     primType,
                                     0,
                                     0,
@@ -511,7 +513,7 @@
                                     indexCnt,
                                     &devBounds);
             } else {
-                target->drawNonIndexed(drawState, primType, 0, vertexCnt, &devBounds);
+                target->drawNonIndexed(drawState, gp, primType, 0, vertexCnt, &devBounds);
             }
         }
     }