| Index: src/gpu/gl/GrGLGpu.cpp
|
| diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
|
| index 0eac373f2e81f1edf8a8ba975e4a937cebe88273..74fa5d0ebbdf99be60c89db2729e0cda7ec45a09 100644
|
| --- a/src/gpu/gl/GrGLGpu.cpp
|
| +++ b/src/gpu/gl/GrGLGpu.cpp
|
| @@ -1570,7 +1570,7 @@ bool GrGLGpu::flushGLState(const DrawArgs& args) {
|
| }
|
|
|
| SkSTArray<8, const GrTextureAccess*> textureAccesses;
|
| - program->setData(*args.fPrimitiveProcessor, pipeline, *args.fBatchTracker, &textureAccesses);
|
| + program->setData(*args.fPrimitiveProcessor, pipeline, &textureAccesses);
|
|
|
| int numTextureAccesses = textureAccesses.count();
|
| for (int i = 0; i < numTextureAccesses; i++) {
|
| @@ -1645,9 +1645,8 @@ void GrGLGpu::setupGeometry(const GrPrimitiveProcessor& primProc,
|
|
|
| void GrGLGpu::buildProgramDesc(GrProgramDesc* desc,
|
| const GrPrimitiveProcessor& primProc,
|
| - const GrPipeline& pipeline,
|
| - const GrBatchTracker& batchTracker) const {
|
| - if (!GrGLProgramDescBuilder::Build(desc, primProc, pipeline, this, batchTracker)) {
|
| + const GrPipeline& pipeline) const {
|
| + if (!GrGLProgramDescBuilder::Build(desc, primProc, pipeline, this)) {
|
| SkDEBUGFAIL("Failed to generate GL program descriptor");
|
| }
|
| }
|
|
|