commit 42c456fd20bd45dd02f6d5eb0af7acf04341b1ee
author Brian Salomon <bsalomon@google.com> Mon Mar 06 11:29:48 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 06 17:10:10 2017 +0000
tree 8ef8bc1815f2725a7d40822c78d12b1ae6f10db6
parent 0bb6f38e511365670b9917ad76ece6f0bee9e282

Remove PLS path renderer

Change-Id: Ib727b0749a5a7da95832970e79804417e8b6a247
Reviewed-on: https://skia-review.googlesource.com/9300
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index f09b668..d9e73f0 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -77,12 +77,9 @@
 
     this->setFragmentData(primProc, pipeline, &nextSamplerIdx);
 
-    if (primProc.getPixelLocalStorageState() !=
-        GrPixelLocalStorageState::kDraw_GrPixelLocalStorageState) {
-        const GrXferProcessor& xp = pipeline.getXferProcessor();
-        fXferProcessor->setData(fProgramDataManager, xp);
-        this->bindTextures(xp, pipeline.getAllowSRGBInputs(), &nextSamplerIdx);
-    }
+    const GrXferProcessor& xp = pipeline.getXferProcessor();
+    fXferProcessor->setData(fProgramDataManager, xp);
+    this->bindTextures(xp, pipeline.getAllowSRGBInputs(), &nextSamplerIdx);
 }
 
 void GrGLProgram::generateMipmaps(const GrPrimitiveProcessor& primProc,
@@ -93,12 +90,6 @@
     while (const GrFragmentProcessor* fp  = iter.next()) {
         this->generateMipmaps(*fp, pipeline.getAllowSRGBInputs());
     }
-
-    if (primProc.getPixelLocalStorageState() !=
-        GrPixelLocalStorageState::kDraw_GrPixelLocalStorageState) {
-        const GrXferProcessor& xp = pipeline.getXferProcessor();
-        this->generateMipmaps(xp, pipeline.getAllowSRGBInputs());
-    }
 }
 
 void GrGLProgram::setFragmentData(const GrPrimitiveProcessor& primProc,