Index: src/gpu/GrDrawTarget.cpp |
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp |
index 7b1464ca7fb94d3151d785dc1c57d03e4eafd68a..4b8ee7d73874d279fa4d97220ec7f94e7560dc7f 100644 |
--- a/src/gpu/GrDrawTarget.cpp |
+++ b/src/gpu/GrDrawTarget.cpp |
@@ -228,7 +228,7 @@ void GrDrawTarget::drawBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawBat |
} |
GrPipeline::CreateArgs args; |
- if (!this->installPipelineInDrawBatch(&pipelineBuilder, &clip.scissorState(), batch)) { |
+ if (!this->installPipelineInDrawBatch(&pipelineBuilder, clip, batch)) { |
return; |
} |
@@ -365,7 +365,7 @@ void GrDrawTarget::drawPathBatch(const GrPipelineBuilder& pipelineBuilder, |
batch->setStencilSettings(stencilSettings); |
GrPipeline::CreateArgs args; |
- if (!this->installPipelineInDrawBatch(&pipelineBuilder, &clip.scissorState(), batch)) { |
+ if (!this->installPipelineInDrawBatch(&pipelineBuilder, clip, batch)) { |
return; |
} |
@@ -545,14 +545,16 @@ void GrDrawTarget::recordBatch(GrBatch* batch) { |
/////////////////////////////////////////////////////////////////////////////// |
bool GrDrawTarget::installPipelineInDrawBatch(const GrPipelineBuilder* pipelineBuilder, |
- const GrScissorState* scissor, |
+ const GrAppliedClip& clip, |
GrDrawBatch* batch) { |
GrPipeline::CreateArgs args; |
args.fPipelineBuilder = pipelineBuilder; |
args.fCaps = this->caps(); |
- args.fScissor = scissor; |
+ args.fScissor = &clip.scissorState(); |
args.fColorPOI = pipelineBuilder->colorProcInfo(batch); |
args.fCoveragePOI = pipelineBuilder->coverageProcInfo(batch); |
+ args.fAdditionalFlags = clip.additionalPipelineFlags(); |
+ args.fBlockedFlags = clip.blockedPipelineFlags(); |
if (!this->setupDstReadIfNecessary(*pipelineBuilder, args.fColorPOI, |
args.fCoveragePOI, &args.fDstTexture, |
batch->bounds())) { |