Revert of Rework GrPipelineInfo

include/gpu/GrXferProcessor.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 GrXferProcessor_DEFINED
 #define GrXferProcessor_DEFINED
 
@@ skipping 86 matching lines @@
     /** Returns a new instance of the appropriate *GL* implementation class
         for the given GrXferProcessor; caller is responsible for deleting
         the object. */
     virtual GrGLXferProcessor* createGLInstance() const = 0;
 
     /**
      * Optimizations for blending / coverage that an OptDrawState should apply to itself.
      */
     enum OptFlags {
         /**
+         * No optimizations needed
+         */
+        kNone_Opt                         = 0,
+        /**
          * The draw can be skipped completely.
          */
         kSkipDraw_OptFlag                 = 0x1,
         /**
          * GrXferProcessor will ignore color, thus no need to provide
          */
         kIgnoreColor_OptFlag              = 0x2,
         /**
          * GrXferProcessor will ignore coverage, thus no need to provide
          */
         kIgnoreCoverage_OptFlag           = 0x4,
         /**
          * Clear color stages and override input color to that returned by getOptimizations
          */
         kOverrideColor_OptFlag            = 0x8,
         /**
          * Can tweak alpha for coverage. Currently this flag should only be used by a batch
          */
         kCanTweakAlphaForCoverage_OptFlag = 0x20,
     };
 
-    static const OptFlags kNone_OptFlags = (OptFlags)0;
-
     GR_DECL_BITFIELD_OPS_FRIENDS(OptFlags);
 
     /**
      * Determines which optimizations (as described by the ptFlags above) can be performed by
      * the draw with this xfer processor. If this function is called, the xfer processor may change
      * its state to reflected the given blend optimizations. If the XP needs to see a specific input
      * color to blend correctly, it will set the OverrideColor flag and the output parameter
      * overrideColor will be the required value that should be passed into the XP. 
      * A caller who calls this function on a XP is required to honor the returned OptFlags
      * and color values for its draw.
@@ skipping 258 matching lines @@
     enum {
         kIllegalXPFClassID = 0,
     };
     static int32_t gCurrXPFClassID;
 
     typedef GrProgramElement INHERITED;
 };
 
 #endif