Revert of Fix to set correct output type when blending when we've read dst

include/gpu/effects/GrPorterDuffXferProcessor.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrPorterDuffXferProcessor_DEFINED
 #define GrPorterDuffXferProcessor_DEFINED
 
@@ skipping 18 matching lines @@
     void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE;
 
     GrGLXferProcessor* createGLInstance() const SK_OVERRIDE;
 
     virtual bool hasSecondaryOutput() const SK_OVERRIDE;
 
     ///////////////////////////////////////////////////////////////////////////
     /// @name Stage Output Types
     ////
 
-    enum PrimaryOutputType {
-        // Modulate color and coverage, write result as the color output.
-        kModulate_PrimaryOutputType,
-        // Combines the coverage, dst, and color as coverage * color + (1 - coverage) * dst. This
-        // can only be set if fDstReadKey is non-zero.
-        kCombineWithDst_PrimaryOutputType,
-    };
-
     enum SecondaryOutputType {
         // There is no secondary output
         kNone_SecondaryOutputType,
         // Writes coverage as the secondary output. Only set if dual source blending is supported
         // and primary output is kModulate.
         kCoverage_SecondaryOutputType,
         // Writes coverage * (1 - colorA) as the secondary output. Only set if dual source blending
         // is supported and primary output is kModulate.
         kCoverageISA_SecondaryOutputType,
         // Writes coverage * (1 - colorRGBA) as the secondary output. Only set if dual source
         // blending is supported and primary output is kModulate.
         kCoverageISC_SecondaryOutputType,
 
         kSecondaryOutputTypeCnt,
     };
 
-    PrimaryOutputType primaryOutputType() const { return fPrimaryOutputType; }
     SecondaryOutputType secondaryOutputType() const { return fSecondaryOutputType; }
 
     GrXferProcessor::OptFlags getOptimizations(const GrProcOptInfo& colorPOI,
                                                const GrProcOptInfo& coveragePOI,
                                                bool isCoverageDrawing,
                                                bool colorWriteDisabled,
                                                bool doesStencilWrite,
                                                GrColor* color,
                                                uint8_t* coverage,
                                                const GrDrawTargetCaps& caps) SK_OVERRIDE;
 
     void getBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const SK_OVERRIDE {
         blendInfo->fSrcBlend = fSrcBlend;
         blendInfo->fDstBlend = fDstBlend;
         blendInfo->fBlendConstant = fBlendConstant;
     }
 
 private:
     GrPorterDuffXferProcessor(GrBlendCoeff srcBlend, GrBlendCoeff dstBlend, GrColor constant);
 
     bool onIsEqual(const GrXferProcessor& xpBase) const SK_OVERRIDE {
         const GrPorterDuffXferProcessor& xp = xpBase.cast<GrPorterDuffXferProcessor>();
         if (fSrcBlend != xp.fSrcBlend ||
             fDstBlend != xp.fDstBlend ||
             fBlendConstant != xp.fBlendConstant ||
-            fPrimaryOutputType != xp.fPrimaryOutputType || 
             fSecondaryOutputType != xp.fSecondaryOutputType) {
             return false;
         }
         return true;
     }
 
     void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
 
     GrXferProcessor::OptFlags internalGetOptimizations(const GrProcOptInfo& colorPOI,
                                                        const GrProcOptInfo& coveragePOI,
                                                        bool isCoverageDrawing,
                                                        bool colorWriteDisabled,
                                                        bool doesStencilWrite,
                                                        GrColor* color,
                                                        uint8_t* coverage);
 
     void calcOutputTypes(GrXferProcessor::OptFlags blendOpts, const GrDrawTargetCaps& caps,
                          bool isCoverageDrawing, bool readDst);
 
     GrBlendCoeff fSrcBlend;
     GrBlendCoeff fDstBlend;
     GrColor      fBlendConstant;
-    PrimaryOutputType fPrimaryOutputType;
     SecondaryOutputType fSecondaryOutputType;
 
     typedef GrXferProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class GrPorterDuffXPFactory : public GrXPFactory {
 public:
     static GrXPFactory* Create(SkXfermode::Mode mode); 
@@ skipping 34 matching lines @@
 
     GR_DECLARE_XP_FACTORY_TEST;
 
     GrBlendCoeff fSrcCoeff;
     GrBlendCoeff fDstCoeff;
 
     typedef GrXPFactory INHERITED;
 };
 
 #endif