Remove willReadDst from GrFragmentProcessor.

src/gpu/GrOptDrawState.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrOptDrawState.h"
 
 #include "GrDrawState.h"
@@ skipping 71 matching lines @@
     // TODO: Once we can handle single or four channel input into coverage stages then we can use
     // drawState's coverageProcInfo (like color above) to set this initial information.
     int firstCoverageStageIdx = 0;
 
     GrXferProcessor::BlendInfo blendInfo;
     fXferProcessor->getBlendInfo(&blendInfo);
 
     this->adjustProgramFromOptimizations(drawState, optFlags, colorPOI, coveragePOI,
                                          &firstColorStageIdx, &firstCoverageStageIdx);
 
+    fDescInfo.fReadsDst = fXferProcessor->willReadDstColor();
+
     bool usesLocalCoords = false;
 
     // Copy Stages from DS to ODS
     for (int i = firstColorStageIdx; i < drawState.numColorStages(); ++i) {
         SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
                                GrPendingFragmentStage,
                                (drawState.fColorStages[i]));
         usesLocalCoords = usesLocalCoords ||
                           drawState.fColorStages[i].processor()->usesLocalCoords();
     }
@@ skipping 15 matching lines @@
     init.fUsesLocalCoords = usesLocalCoords;
     fPrimitiveProcessor->initBatchTracker(&fBatchTracker, init);
 }
 
 void GrOptDrawState::adjustProgramFromOptimizations(const GrDrawState& ds,
                                                     GrXferProcessor::OptFlags flags,
                                                     const GrProcOptInfo& colorPOI,
                                                     const GrProcOptInfo& coveragePOI,
                                                     int* firstColorStageIdx,
                                                     int* firstCoverageStageIdx) {
-    fDescInfo.fReadsDst = false;
     fDescInfo.fReadsFragPosition = false;
 
     if ((flags & GrXferProcessor::kIgnoreColor_OptFlag) ||
         (flags & GrXferProcessor::kOverrideColor_OptFlag)) {
         *firstColorStageIdx = ds.numColorStages();
     } else {
-        fDescInfo.fReadsDst = colorPOI.readsDst();
         fDescInfo.fReadsFragPosition = colorPOI.readsFragPosition();
     }
 
     if (flags & GrXferProcessor::kIgnoreCoverage_OptFlag) {
         *firstCoverageStageIdx = ds.numCoverageStages();
     } else {
-        if (coveragePOI.readsDst()) {
-            fDescInfo.fReadsDst = true;
-        }
         if (coveragePOI.readsFragPosition()) {
             fDescInfo.fReadsFragPosition = true;
         }
     }
-
-    if (fXferProcessor->willReadDstColor()) {
-        fDescInfo.fReadsDst = true;
-    }
 }
 
 void GrOptDrawState::finalize(GrGpu* gpu) {
     gpu->buildProgramDesc(*this, fDescInfo, fDrawType, &fDesc);
     fFinalized = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 bool GrOptDrawState::combineIfPossible(const GrOptDrawState& that) {
@@ skipping 30 matching lines @@
         if (this->getFragmentStage(i) != that.getFragmentStage(i)) {
             return false;
         }
     }
 
     // Now update the GrPrimitiveProcessor's batch tracker
     fPrimitiveProcessor->makeEqual(&fBatchTracker, that.getBatchTracker());
     return true;
 }