Remove GrPipelineOptimizations member from GrPipeline

src/gpu/GrPrimitiveProcessor.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrPrimitiveProcessor_DEFINED
 #define GrPrimitiveProcessor_DEFINED
 
@@ skipping 65 matching lines @@
  * GrBatch which should be forwarded to the GrPrimitiveProcessor(s) created by the batch.
  * These are not properly part of the pipeline because they assume the specific inputs
  * that the batch provided when it created the pipeline. Identical pipelines may be
  * created by different batches with different input assumptions and therefore different
  * computed optimizations. It is the batch-specific optimizations that allow the pipelines
  * to be equal.
  */
 class GrPipelineOptimizations {
 public:
     /** Does the pipeline require the GrPrimitiveProcessor's color? */
-    bool readsColor() const { return SkToBool(kReadsColor_GrPipelineOptimizationsFlag & fFlags); }
+    bool readsColor() const { return SkToBool(kReadsColor_Flag & fFlags); }
 
     /** Does the pipeline require the GrPrimitiveProcessor's coverage? */
     bool readsCoverage() const { return
-        SkToBool(kReadsCoverage_GrPipelineOptimizationsFlag & fFlags); }
+        SkToBool(kReadsCoverage_Flag & fFlags); }
 
     /** Does the pipeline require access to (implicit or explicit) local coordinates? */
     bool readsLocalCoords() const {
-        return SkToBool(kReadsLocalCoords_GrPipelineOptimizationsFlag & fFlags);
+        return SkToBool(kReadsLocalCoords_Flag & fFlags);
     }
 
     /** Does the pipeline allow the GrPrimitiveProcessor to combine color and coverage into one
         color output ? */
     bool canTweakAlphaForCoverage() const {
-        return SkToBool(kCanTweakAlphaForCoverage_GrPipelineOptimizationsFlag & fFlags);
+        return SkToBool(kCanTweakAlphaForCoverage_Flag & fFlags);
     }
 
     /** Does the pipeline require the GrPrimitiveProcessor to specify a specific color (and if
         so get the color)? */
     bool getOverrideColorIfSet(GrColor* overrideColor) const {
-        if (SkToBool(kUseOverrideColor_GrPipelineOptimizationsFlag & fFlags)) {
-            SkASSERT(SkToBool(kReadsColor_GrPipelineOptimizationsFlag & fFlags));
+        if (SkToBool(kUseOverrideColor_Flag & fFlags)) {
+            SkASSERT(SkToBool(kReadsColor_Flag & fFlags));
             if (overrideColor) {
                 *overrideColor = fOverrideColor;
             }
             return true;
         }
         return false;
     }
 
 private:
     enum {
         // If this is not set the primitive processor need not produce a color output
-        kReadsColor_GrPipelineOptimizationsFlag                  = 0x1,
+        kReadsColor_Flag                = 0x1,
 
         // If this is not set the primitive processor need not produce a coverage output
-        kReadsCoverage_GrPipelineOptimizationsFlag               = 0x2,
+        kReadsCoverage_Flag             = 0x2,
 
         // If this is not set the primitive processor need not produce local coordinates
-        kReadsLocalCoords_GrPipelineOptimizationsFlag            = 0x4,
+        kReadsLocalCoords_Flag          = 0x4,
 
         // If this flag is set then the primitive processor may produce color*coverage as
         // its color output (and not output a separate coverage).
-        kCanTweakAlphaForCoverage_GrPipelineOptimizationsFlag    = 0x8,
+        kCanTweakAlphaForCoverage_Flag  = 0x8,
 
         // If this flag is set the GrPrimitiveProcessor must produce fOverrideColor as its
         // output color. If not set fOverrideColor is to be ignored.
-        kUseOverrideColor_GrPipelineOptimizationsFlag            = 0x10,
+        kUseOverrideColor_Flag          = 0x10,
     };
 
     uint32_t    fFlags;
     GrColor     fOverrideColor;
 
     friend class GrPipeline; // To initialize this
 };
 
 /*
  * This enum is shared by GrPrimitiveProcessors and GrGLPrimitiveProcessors to coordinate shaders
@@ skipping 100 matching lines @@
 
 private:
     virtual bool hasExplicitLocalCoords() const = 0;
 
     bool fIsPathRendering;
 
     typedef GrProcessor INHERITED;
 };
 
 #endif