| Index: src/gpu/batches/GrDrawPathBatch.cpp
|
| diff --git a/src/gpu/batches/GrDrawPathBatch.cpp b/src/gpu/batches/GrDrawPathBatch.cpp
|
| index 3e4c863e33abfa406a037bc1bdfac55045ab59b9..a47e665607f4bcc0e3e2a8831f1d405b517b0393 100644
|
| --- a/src/gpu/batches/GrDrawPathBatch.cpp
|
| +++ b/src/gpu/batches/GrDrawPathBatch.cpp
|
| @@ -19,10 +19,9 @@ void GrDrawPathBatch::onDraw(GrBatchFlushState* state) {
|
| SkAutoTUnref<GrPathProcessor> pathProc(GrPathProcessor::Create(this->color(),
|
| this->opts(),
|
| this->viewMatrix()));
|
| - state->gpu()->buildProgramDesc(&desc, *pathProc,
|
| - *this->pipeline(), *this->tracker());
|
| + state->gpu()->buildProgramDesc(&desc, *pathProc, *this->pipeline());
|
| GrPathRendering::DrawPathArgs args(pathProc, this->pipeline(),
|
| - &desc, this->tracker(), &this->stencilSettings());
|
| + &desc, &this->stencilSettings());
|
| state->gpu()->pathRendering()->drawPath(args, fPath.get());
|
| }
|
|
|
| @@ -113,10 +112,9 @@ void GrDrawPathRangeBatch::onDraw(GrBatchFlushState* state) {
|
| this->opts(),
|
| this->viewMatrix(),
|
| fLocalMatrix));
|
| - state->gpu()->buildProgramDesc(&desc, *pathProc, *this->pipeline(),
|
| - *this->tracker());
|
| + state->gpu()->buildProgramDesc(&desc, *pathProc, *this->pipeline());
|
| GrPathRendering::DrawPathArgs args(pathProc, this->pipeline(),
|
| - &desc, this->tracker(), &this->stencilSettings());
|
| + &desc, &this->stencilSettings());
|
| if (fDraws.count() == 1) {
|
| const GrPathRangeDraw& draw = **fDraws.head();
|
| state->gpu()->pathRendering()->drawPaths(args, draw.range(), draw.indices(),
|
|
|