diff options
author | 2015-09-17 20:16:13 -0700 | |
---|---|---|
committer | 2015-09-17 20:16:13 -0700 | |
commit | 1b55a963a2374a14bb82eb887bb99ee91680f0eb (patch) | |
tree | a15774af26154d677a16d718ba52d7a401bfa868 /src/gpu/effects/GrDashingEffect.cpp | |
parent | 48e3a45ade15c52c0c1a10cb00907dd444897745 (diff) |
Reland of add a ClassID function to GrBatch (patchset #1 id:1 of https://codereview.chromium.org/1353043002/ )
Reason for revert:
DEPS roll seems to have landed w/o this revert, so revert it again
Original issue's description:
> Revert of add a ClassID function to GrBatch (patchset #5 id:80001 of https://codereview.chromium.org/1352813003/ )
>
> Reason for revert:
> Speculative revert to unblock DEPS roll
>
> Original issue's description:
> > add a ClassID function to GrBatch
> >
> > BUG=skia:
> >
> > Committed: https://skia.googlesource.com/skia/+/4078d529e9e199eea13456db7bf3a63a104ab5b9
> >
> > Committed: https://skia.googlesource.com/skia/+/eb44d53cf96a7eaf103a98d76079ce1f5495e343
>
> TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/48e3a45ade15c52c0c1a10cb00907dd444897745
TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1344373005
Diffstat (limited to 'src/gpu/effects/GrDashingEffect.cpp')
-rw-r--r-- | src/gpu/effects/GrDashingEffect.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index 3ca4c7ae4b..106ee49672 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -245,8 +245,9 @@ static GrGeometryProcessor* create_dash_gp(GrColor, class DashBatch : public GrVertexBatch { public: + DEFINE_BATCH_CLASS_ID + struct Geometry { - GrColor fColor; SkMatrix fViewMatrix; SkMatrix fSrcRotInv; SkPoint fPtsRot[2]; @@ -255,6 +256,7 @@ public: SkScalar fIntervals[2]; SkScalar fParallelScale; SkScalar fPerpendicularScale; + GrColor fColor; }; static GrDrawBatch* Create(const Geometry& geometry, SkPaint::Cap cap, DashAAMode aaMode, @@ -275,8 +277,8 @@ public: SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; } private: - DashBatch(const Geometry& geometry, SkPaint::Cap cap, DashAAMode aaMode, bool fullDash) { - this->initClassID<DashBatch>(); + DashBatch(const Geometry& geometry, SkPaint::Cap cap, DashAAMode aaMode, bool fullDash) + : INHERITED(ClassID()) { fGeoData.push_back(geometry); fBatch.fAAMode = aaMode; @@ -674,6 +676,8 @@ private: BatchTracker fBatch; SkSTArray<1, Geometry, true> fGeoData; + + typedef GrVertexBatch INHERITED; }; static GrDrawBatch* create_batch(GrColor color, const SkMatrix& viewMatrix, const SkPoint pts[2], |