diff options
| author |  joshualitt <joshualitt@google.com> | 2015-09-17 11:43:01 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-17 11:43:02 -0700 |
| commit | a7008403dcd03302e88e2df546d8427afe9e0e80 (patch) | |
| tree | 5bce1f3fd012c399e17401605e3d9f5dcba53169 /src/gpu/batches/GrAAConvexPathRenderer.cpp | |
| parent | 4078d529e9e199eea13456db7bf3a63a104ab5b9 (diff) | |
Revert of add a ClassID function to GrBatch (patchset #5 id:80001 of https://codereview.chromium.org/1352813003/ )
Reason for revert:
breaks mac bot
Original issue's description:
> add a ClassID function to GrBatch
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4078d529e9e199eea13456db7bf3a63a104ab5b9
TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1345393003
Diffstat (limited to 'src/gpu/batches/GrAAConvexPathRenderer.cpp')
| -rw-r--r-- | src/gpu/batches/GrAAConvexPathRenderer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/batches/GrAAConvexPathRenderer.cpp index 543885e54f..75bf332790 100644 --- a/src/gpu/batches/GrAAConvexPathRenderer.cpp +++ b/src/gpu/batches/GrAAConvexPathRenderer.cpp @@ -733,7 +733,6 @@ static const GrGeometryProcessor* create_fill_gp(bool tweakAlphaForCoverage, class AAConvexPathBatch : public GrVertexBatch { public: - DEFINE_BATCH_CLASS_ID struct Geometry { GrColor fColor; SkMatrix fViewMatrix; @@ -753,6 +752,7 @@ public: } private: + void initBatchTracker(const GrPipelineOptimizations& opt) override { // Handle any color overrides if (!opt.readsColor()) { @@ -921,7 +921,8 @@ private: SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; } - AAConvexPathBatch(const Geometry& geometry) : INHERITED(ClassID()) { + AAConvexPathBatch(const Geometry& geometry) { + this->initClassID<AAConvexPathBatch>(); fGeoData.push_back(geometry); // compute bounds @@ -978,8 +979,6 @@ private: BatchTracker fBatch; SkSTArray<1, Geometry, true> fGeoData; - - typedef GrVertexBatch INHERITED; }; bool GrAAConvexPathRenderer::onDrawPath(const DrawPathArgs& args) { |