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/gl/builders | |
| parent | ae48877c37092e96bc89891d3160a60645edb75b (diff) | |
Remove batchtracker
BUG=skia:
Review URL: https://codereview.chromium.org/1332923003
Diffstat (limited to 'src/gpu/gl/builders')
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 5 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index e6e93e9f28..84e4a99be2 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -302,13 +302,12 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrPrimitiveProcessor& gp, SkASSERT(!fGeometryProcessor); fGeometryProcessor = new GrGLInstalledGeoProc; - const GrBatchTracker& bt = this->batchTracker(); - fGeometryProcessor->fGLProc.reset(gp.createGLInstance(bt, *fGpu->glCaps().glslCaps())); + fGeometryProcessor->fGLProc.reset(gp.createGLInstance(*fGpu->glCaps().glslCaps())); SkSTArray<4, GrGLProcessor::TextureSampler> samplers(gp.numTextures()); this->emitSamplers(gp, &samplers, fGeometryProcessor); - GrGLGeometryProcessor::EmitArgs args(this, gp, bt, outColor, outCoverage, samplers, + GrGLGeometryProcessor::EmitArgs args(this, gp, outColor, outCoverage, samplers, fCoordTransforms, &fOutCoords); fGeometryProcessor->fGLProc->emitCode(args); diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h index 1d5e5fbcfe..4eea150ae2 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h @@ -290,7 +290,6 @@ protected: const GrPrimitiveProcessor& primitiveProcessor() const { return *fArgs.fPrimitiveProcessor; } const GrPipeline& pipeline() const { return *fArgs.fPipeline; } const GrProgramDesc& desc() const { return *fArgs.fDesc; } - const GrBatchTracker& batchTracker() const { return *fArgs.fBatchTracker; } const GrProgramDesc::KeyHeader& header() const { return fArgs.fDesc->header(); } // Generates a name for a variable. The generated string will be name prefixed by the prefix |