diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-09-11 08:19:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-11 08:19:35 -0700 |
| commit | 465283cdf98ed9ab5285ca7b9814e430fca1d452 (patch) | |
| tree | 12127f410d1e3720ae472f1a5c01f52c00722148 /src/gpu/effects/GrBitmapTextGeoProc.cpp | |
| parent | ae48877c37092e96bc89891d3160a60645edb75b (diff) | |
Remove batchtracker
BUG=skia:
Review URL: https://codereview.chromium.org/1332923003
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.cpp')
| -rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 69c2029edb..e8bcd57e6d 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -15,10 +15,9 @@ class GrGLBitmapTextGeoProc : public GrGLGeometryProcessor { public: - GrGLBitmapTextGeoProc(const GrGeometryProcessor&, const GrBatchTracker&) - : fColor(GrColor_ILLEGAL) {} + GrGLBitmapTextGeoProc() : fColor(GrColor_ILLEGAL) {} - void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{ + void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override { const GrBitmapTextGeoProc& cte = args.fGP.cast<GrBitmapTextGeoProc>(); GrGLGPBuilder* pb = args.fPB; @@ -73,9 +72,7 @@ public: } } - virtual void setData(const GrGLProgramDataManager& pdman, - const GrPrimitiveProcessor& gp, - const GrBatchTracker& bt) override { + void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& gp) override { const GrBitmapTextGeoProc& btgp = gp.cast<GrBitmapTextGeoProc>(); if (btgp.color() != fColor && !btgp.hasVertexColor()) { GrGLfloat c[4]; @@ -93,7 +90,6 @@ public: } static inline void GenKey(const GrGeometryProcessor& proc, - const GrBatchTracker& bt, const GrGLSLCaps&, GrProcessorKeyBuilder* b) { const GrBitmapTextGeoProc& gp = proc.cast<GrBitmapTextGeoProc>(); @@ -143,16 +139,12 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, GrTexture* texture, this->addTextureAccess(&fTextureAccess); } -void GrBitmapTextGeoProc::getGLProcessorKey(const GrBatchTracker& bt, - const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { - GrGLBitmapTextGeoProc::GenKey(*this, bt, caps, b); +void GrBitmapTextGeoProc::getGLProcessorKey(const GrGLSLCaps& caps,GrProcessorKeyBuilder* b) const { + GrGLBitmapTextGeoProc::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* -GrBitmapTextGeoProc::createGLInstance(const GrBatchTracker& bt, - const GrGLSLCaps& caps) const { - return new GrGLBitmapTextGeoProc(*this, bt); +GrGLPrimitiveProcessor* GrBitmapTextGeoProc::createGLInstance(const GrGLSLCaps& caps) const { + return new GrGLBitmapTextGeoProc(); } /////////////////////////////////////////////////////////////////////////////// |