Removes tracking of whether color is ignored by XP.

Removes the feedback to GrDrawOp via GrPipelineOptimizations.

Change-Id: I3cb17cad41779af292a92385fcd5ac23ae5a1ffd
Reviewed-on: https://skia-review.googlesource.com/6561
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 4 insertions, 11 deletions

diff --git a/src/gpu/GrPrimitiveProcessor.h b/src/gpu/GrPrimitiveProcessor.h
index 8d6a70284e..f1af14de4e 100644
--- a/src/gpu/GrPrimitiveProcessor.h
+++ b/src/gpu/GrPrimitiveProcessor.h
@@ -56,9 +56,6 @@ enum GrPixelLocalStorageState {
  */
 class GrPipelineOptimizations {
 public:
-    /** Does the pipeline require the GrPrimitiveProcessor's color? */
-    bool readsColor() const { return SkToBool(kReadsColor_Flag & fFlags); }
-
     /** Does the pipeline require access to (implicit or explicit) local coordinates? */
     bool readsLocalCoords() const {
         return SkToBool(kReadsLocalCoords_Flag & fFlags);
@@ -74,7 +71,6 @@ public:
         so get the color)? */
     bool getOverrideColorIfSet(GrColor* overrideColor) const {
         if (SkToBool(kUseOverrideColor_Flag & fFlags)) {
-            SkASSERT(SkToBool(kReadsColor_Flag & fFlags));
             if (overrideColor) {
                 *overrideColor = fOverrideColor;
             }
@@ -98,21 +94,18 @@ public:
 
 private:
     enum {
-        // If this is not set the primitive processor need not produce a color output
-        kReadsColor_Flag = 0x1,
-
         // If this is not set the primitive processor need not produce local coordinates
-        kReadsLocalCoords_Flag = 0x2,
+        kReadsLocalCoords_Flag = 0x1,
 
         // If this flag is set then the primitive processor may produce color*coverage as
         // its color output (and not output a separate coverage).
-        kCanTweakAlphaForCoverage_Flag = 0x4,
+        kCanTweakAlphaForCoverage_Flag = 0x2,
 
         // If this flag is set the GrPrimitiveProcessor must produce fOverrideColor as its
         // output color. If not set fOverrideColor is to be ignored.
-        kUseOverrideColor_Flag = 0x8,
+        kUseOverrideColor_Flag = 0x4,
 
-        kWillColorBlendWithDst_Flag = 0x10,
+        kWillColorBlendWithDst_Flag = 0x8,
     };
 
     uint32_t    fFlags;