Remove GP from drawstate, revision of invariant output for GP

include/gpu/GrInvariantOutput.h

Index: include/gpu/GrInvariantOutput.h
diff --git a/include/gpu/GrInvariantOutput.h b/include/gpu/GrInvariantOutput.h
index 1d3eda1b2cd7f437dcc0345b2a9533e658871465..77890a047d38643578f4924dae399363b2dd1787 100644
--- a/include/gpu/GrInvariantOutput.h
+++ b/include/gpu/GrInvariantOutput.h
@@ -10,6 +10,49 @@
 
 #include "GrColor.h"
 
+struct GrInitInvariantOutput {
+    GrInitInvariantOutput()
+        : fValidFlags(0)
+        , fColor(0)
+        , fIsSingleComponent(false)
+        , fIsLCDCoverage(false) {}
+
+    void setIsKnownFourComponents(GrColor color) {

[bsalomon, 2014/12/10 15:26:59]

Maybe it's just me, but I find the setIs language kinda weird. setKnown,
setToKnown, ...

+        fColor = color;
+        fValidFlags = kRGBA_GrColorComponentFlags;
+        fIsSingleComponent = false;
+    }
+
+    void setIsUnknownFourComponents() {
+        fValidFlags = 0;
+        fIsSingleComponent = false;
+    }
+
+    void setIsUnknownAndOpaqueFourComponents() {

[bsalomon, 2014/12/10 15:26:59]

UnknownOpaqueFourComponents?

+        fColor = 0xff << GrColor_SHIFT_A;
+        fValidFlags = kA_GrColorComponentFlag;
+        fIsSingleComponent = false;
+    }
+
+    void setIsKnownSingleComponent(uint8_t alpha) {
+        fColor = alpha << GrColor_SHIFT_A;

[bsalomon, 2014/12/10 15:26:59]

I think this should have alpha replicated across all four channels and all four
flags set, but could be wrong. Or maybe either is right? Greg?

I want to make sure this works out to a known four channel:

GP: setIsKnownSingleComponent(a);
FP: mulByKnownFourComponent(color)

should get all flags set, a*color.

Maybe we need some unit tests around this procInfo stuff?

[egdaniel, 2014/12/10 15:54:30]

Yes we need the alpha replicated across all channels if it is single component.
However this is really only to easily handle the mulByKnown4Comp case, which we
actually do not have currently (but might be able to add with some work on color
filter stuff for example).

+        fValidFlags = kA_GrColorComponentFlag;
+        fIsSingleComponent = true;
+    }
+
+    void setIsUnknownSingleComponent() {
+        fValidFlags = 0;
+        fIsSingleComponent = true;
+    }
+
+    void setUsingLCDCoverage() { fIsLCDCoverage = true; }
+
+    uint32_t fValidFlags;
+    GrColor fColor;
+    bool fIsSingleComponent;
+    bool fIsLCDCoverage; // Temorary data member until texture pixel configs are updated
+};
+
 class GrInvariantOutput {
 public:
     GrInvariantOutput(GrColor color, GrColorComponentFlags flags, bool isSingleComponent)
@@ -20,6 +63,14 @@ public:
         , fWillUseInputColor(true)
         , fIsLCDCoverage(false) {}
 
+    GrInvariantOutput(const GrInitInvariantOutput& io)
+        : fColor(io.fColor)
+        , fValidFlags(io.fValidFlags)
+        , fIsSingleComponent(io.fIsSingleComponent)
+        , fNonMulStageFound(false)
+        , fWillUseInputColor(false)
+        , fIsLCDCoverage(io.fIsLCDCoverage) {}
+
     virtual ~GrInvariantOutput() {}
 
     enum ReadInput {
@@ -34,7 +85,7 @@ public:
         } else {
             // Since the current state is not opaque we no longer care if the color being
             // multiplied is opaque.
-            this->mulByUnknownColor(); 
+            this->mulByUnknownColor();
         }
     }
 
@@ -122,6 +173,15 @@ private:
         fWillUseInputColor = true;
     }
 
+    void reset(const GrInitInvariantOutput& io) {
+        fColor = io.fColor;
+        fValidFlags = io.fValidFlags;
+        fIsSingleComponent = io.fIsSingleComponent;
+        fNonMulStageFound = false;
+        fWillUseInputColor = true;
+        fIsLCDCoverage = io.fIsLCDCoverage;
+    }
+
     void internalSetToTransparentBlack() {
         fValidFlags = kRGBA_GrColorComponentFlags;
         fColor = 0;