Index: src/gpu/glsl/GrGLSLProgramBuilder.cpp |
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp |
index 900b6eee6b7044940bf7eae68e9548c2e8a1e27b..6e0e95f16abb635da9edb37ed1f4694f5a95fa2b 100644 |
--- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp |
+++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp |
@@ -53,13 +53,9 @@ bool GrGLSLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, |
this->emitAndInstallFragProcs(0, this->pipeline().numColorFragmentProcessors(), inputColor); |
this->emitAndInstallFragProcs(this->pipeline().numColorFragmentProcessors(), numProcs, |
inputCoverage); |
- if (primProc.getPixelLocalStorageState() != |
- GrPixelLocalStorageState::kDraw_GrPixelLocalStorageState) { |
- this->emitAndInstallXferProc(this->pipeline().getXferProcessor(), *inputColor, |
- *inputCoverage, this->pipeline().ignoresCoverage(), |
- primProc.getPixelLocalStorageState()); |
- this->emitFSOutputSwizzle(this->pipeline().getXferProcessor().hasSecondaryOutput()); |
- } |
+ this->emitAndInstallXferProc(this->pipeline().getXferProcessor(), *inputColor, *inputCoverage, |
+ this->pipeline().ignoresCoverage()); |
+ this->emitFSOutputSwizzle(this->pipeline().getXferProcessor().hasSecondaryOutput()); |
return true; |
} |
@@ -155,8 +151,7 @@ void GrGLSLProgramBuilder::emitAndInstallFragProc(const GrFragmentProcessor& fp, |
void GrGLSLProgramBuilder::emitAndInstallXferProc(const GrXferProcessor& xp, |
const GrGLSLExpr4& colorIn, |
const GrGLSLExpr4& coverageIn, |
- bool ignoresCoverage, |
- GrPixelLocalStorageState plsState) { |
+ bool ignoresCoverage) { |
// Program builders have a bit of state we need to clear with each effect |
AutoStageAdvance adv(this); |
@@ -179,7 +174,6 @@ void GrGLSLProgramBuilder::emitAndInstallXferProc(const GrXferProcessor& xp, |
SkSTArray<4, GrGLSLTextureSampler> samplers(xp.numTextures()); |
this->emitSamplers(xp, &samplers); |
- bool usePLSDstRead = (plsState == GrPixelLocalStorageState::kFinish_GrPixelLocalStorageState); |
GrGLSLXferProcessor::EmitArgs args(&fFS, |
this->uniformHandler(), |
this->glslCaps(), |
@@ -187,8 +181,7 @@ void GrGLSLProgramBuilder::emitAndInstallXferProc(const GrXferProcessor& xp, |
ignoresCoverage ? nullptr : coverageIn.c_str(), |
fFS.getPrimaryColorOutputName(), |
fFS.getSecondaryColorOutputName(), |
- samplers, |
- usePLSDstRead); |
+ samplers); |
fXferProcessor->emitCode(args); |
// We have to check that effects and the code they emit are consistent, ie if an effect |