| Index: src/gpu/GrPipelineBuilder.cpp
|
| diff --git a/src/gpu/GrPipelineBuilder.cpp b/src/gpu/GrPipelineBuilder.cpp
|
| index 1d8aa4f2b4f9baa9b21496272dfac6b7f04c85f7..d904175fce53e3f63b9c724dc81488616372b61d 100644
|
| --- a/src/gpu/GrPipelineBuilder.cpp
|
| +++ b/src/gpu/GrPipelineBuilder.cpp
|
| @@ -48,7 +48,8 @@ GrPipelineBuilder& GrPipelineBuilder::operator=(const GrPipelineBuilder& that) {
|
| return *this;
|
| }
|
|
|
| -void GrPipelineBuilder::setFromPaint(const GrPaint& paint, GrRenderTarget* rt, const GrClip& clip) {
|
| +void GrPipelineBuilder::setFromPaint(const GrPaint& paint, GrRenderTarget* rt, const GrClip& clip,
|
| + GrPipelineStage pipelineStage) {
|
| SkASSERT(0 == fBlockEffectRemovalCnt || 0 == this->numFragmentStages());
|
|
|
| fColorStages.reset();
|
| @@ -75,7 +76,7 @@ void GrPipelineBuilder::setFromPaint(const GrPaint& paint, GrRenderTarget* rt, c
|
|
|
| this->setState(GrPipelineBuilder::kDither_StateBit, paint.isDither());
|
| this->setState(GrPipelineBuilder::kHWAntialias_StateBit,
|
| - rt->isMultisampled() && paint.isAntiAlias());
|
| + rt->isMultisampled(pipelineStage) && paint.isAntiAlias());
|
|
|
| fColorProcInfoValid = false;
|
| fCoverageProcInfoValid = false;
|
|
|