diff options
| author |  joshualitt <joshualitt@google.com> | 2014-12-04 06:00:41 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-04 06:00:41 -0800 |
| commit | 841a6b54c11137e210aa81e8b56e1763c3571cb8 (patch) | |
| tree | fac39d5628255390df36a6fc7def7b4d13d8f30d /src/gpu/GrOvalRenderer.cpp | |
| parent | b8eb85cd2fae475f17b713b6739ede545a78f647 (diff) | |
Revert of create and thread batch tracker object (patchset #9 id:160001 of https://codereview.chromium.org/772513002/)
Reason for revert:
Breaking linux layout test
Original issue's description:
> create and thread batch tracker object
>
> I remove the factory on the next CL
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c3a6eb23483e5d28073b509a5f637f41660de294
TBR=bsalomon@google.com,joshualitt@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/774133003
Diffstat (limited to 'src/gpu/GrOvalRenderer.cpp')
| -rw-r--r-- | src/gpu/GrOvalRenderer.cpp | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index c6586120a9..a9dda840aa 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -91,9 +91,7 @@ public: class GLProcessor : public GrGLGeometryProcessor { public: - GLProcessor(const GrBackendProcessorFactory& factory, - const GrGeometryProcessor&, - const GrBatchTracker&) + GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&) : INHERITED (factory) {} virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { @@ -124,17 +122,13 @@ public: fsBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage); } - static void GenKey(const GrGeometryProcessor& processor, - const GrBatchTracker&, - const GrGLCaps&, + static void GenKey(const GrProcessor& processor, const GrGLCaps&, GrProcessorKeyBuilder* b) { const CircleEdgeEffect& circleEffect = processor.cast<CircleEdgeEffect>(); b->add32(circleEffect.isStroked()); } - virtual void setData(const GrGLProgramDataManager&, - const GrGeometryProcessor&, - const GrBatchTracker&) SK_OVERRIDE {} + virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE {} private: typedef GrGLGeometryProcessor INHERITED; @@ -218,9 +212,7 @@ public: class GLProcessor : public GrGLGeometryProcessor { public: - GLProcessor(const GrBackendProcessorFactory& factory, - const GrGeometryProcessor&, - const GrBatchTracker&) + GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&) : INHERITED (factory) {} virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { @@ -273,17 +265,13 @@ public: fsBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage); } - static void GenKey(const GrGeometryProcessor& processor, - const GrBatchTracker&, - const GrGLCaps&, + static void GenKey(const GrProcessor& processor, const GrGLCaps&, GrProcessorKeyBuilder* b) { const EllipseEdgeEffect& ellipseEffect = processor.cast<EllipseEdgeEffect>(); b->add32(ellipseEffect.isStroked()); } - virtual void setData(const GrGLProgramDataManager&, - const GrGeometryProcessor&, - const GrBatchTracker&) SK_OVERRIDE { + virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE { } private: @@ -376,9 +364,7 @@ public: class GLProcessor : public GrGLGeometryProcessor { public: - GLProcessor(const GrBackendProcessorFactory& factory, - const GrGeometryProcessor&, - const GrBatchTracker&) + GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&) : INHERITED (factory) {} virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { @@ -445,18 +431,14 @@ public: fsBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage); } - static void GenKey(const GrGeometryProcessor& processor, - const GrBatchTracker&, - const GrGLCaps&, + static void GenKey(const GrProcessor& processor, const GrGLCaps&, GrProcessorKeyBuilder* b) { const DIEllipseEdgeEffect& ellipseEffect = processor.cast<DIEllipseEdgeEffect>(); b->add32(ellipseEffect.getMode()); } - virtual void setData(const GrGLProgramDataManager&, - const GrGeometryProcessor&, - const GrBatchTracker&) SK_OVERRIDE { + virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE { } private: |