| Index: src/gpu/GrXferProcessor.cpp
|
| diff --git a/src/gpu/GrXferProcessor.cpp b/src/gpu/GrXferProcessor.cpp
|
| index 3e2ffaa660a2cc625af44c80a026ab22fd0c8578..910b873e861aa42a893da1cb2302ca03b2913a76 100644
|
| --- a/src/gpu/GrXferProcessor.cpp
|
| +++ b/src/gpu/GrXferProcessor.cpp
|
| @@ -197,7 +197,7 @@ GrXferProcessor* GrXPFactory::createXferProcessor(const GrPipelineOptimizations&
|
| const DstTexture* dstTexture,
|
| const GrCaps& caps) const {
|
| #ifdef SK_DEBUG
|
| - if (this->willReadDstColor(caps, optimizations, hasMixedSamples)) {
|
| + if (this->willReadDstColor(caps, optimizations)) {
|
| if (!caps.shaderCaps()->dstReadInShaderSupport()) {
|
| SkASSERT(dstTexture && dstTexture->texture());
|
| } else {
|
| @@ -212,15 +212,12 @@ GrXferProcessor* GrXPFactory::createXferProcessor(const GrPipelineOptimizations&
|
| }
|
|
|
| bool GrXPFactory::willNeedDstTexture(const GrCaps& caps,
|
| - const GrPipelineOptimizations& optimizations,
|
| - bool hasMixedSamples) const {
|
| - return (this->willReadDstColor(caps, optimizations, hasMixedSamples) &&
|
| + const GrPipelineOptimizations& optimizations) const {
|
| + return (this->willReadDstColor(caps, optimizations) &&
|
| !caps.shaderCaps()->dstReadInShaderSupport());
|
| }
|
|
|
| bool GrXPFactory::willReadDstColor(const GrCaps& caps,
|
| - const GrPipelineOptimizations& optimizations,
|
| - bool hasMixedSamples) const {
|
| - return optimizations.fOverrides.fUsePLSDstRead || this->onWillReadDstColor(caps, optimizations,
|
| - hasMixedSamples);
|
| + const GrPipelineOptimizations& optimizations) const {
|
| + return optimizations.fOverrides.fUsePLSDstRead || this->onWillReadDstColor(caps, optimizations);
|
| }
|
|
|