commit 2e3b3e369d79e78f7635d4c20e83a47ab571bdf2
author joshualitt <joshualitt@chromium.org> Tue Dec 09 13:31:14 2014 -0800
committer Commit bot <commit-bot@chromium.org> Tue Dec 09 13:31:15 2014 -0800
tree 95378f3e35a21192f0db62e60bc6e408803050b7
parent f3c78ccf5694d22d2e4a7061a80399a7e69b59db

This cl moves color and coverage off of drawstate.  In an effort to keep this CL manageable, I have left the compute invariant input / output in a bit of a strange state(fixing this will be complicated).

In addition, NVPR makes this very complicated, and I haven't quite figured out a good way to handle it, so for now color and coverage DO live on optstate, but I will figure out some way to refactor that in future CLs.

BUG=skia:

Review URL: https://codereview.chromium.org/783763002

src/gpu/GrOptDrawState.cpp

diff --git a/src/gpu/GrOptDrawState.cpp b/src/gpu/GrOptDrawState.cpp
index d317201..409305c 100644
--- a/src/gpu/GrOptDrawState.cpp
+++ b/src/gpu/GrOptDrawState.cpp
@@ -14,18 +14,21 @@
 #include "GrXferProcessor.h"
 
 GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
+                               GrColor color,
+                               uint8_t coverage,
                                const GrDrawTargetCaps& caps,
                                const ScissorState& scissorState,
                                const GrDeviceCoordTexture* dstCopy,
                                GrGpu::DrawType drawType)
     : fFinalized(false) {
+    GrColor coverageColor = GrColorPackRGBA(coverage, coverage, coverage, coverage);
     fDrawType = drawType;
 
-    const GrProcOptInfo& colorPOI = drawState.colorProcInfo();
-    const GrProcOptInfo& coveragePOI = drawState.coverageProcInfo();
+    const GrProcOptInfo& colorPOI = drawState.colorProcInfo(color);
+    const GrProcOptInfo& coveragePOI = drawState.coverageProcInfo(coverageColor);
     
     fColor = colorPOI.inputColorToEffectiveStage();
-    fCoverage = drawState.getCoverage();
+    fCoverage = coverage;
 
     // Create XferProcessor from DS's XPFactory
     SkAutoTUnref<GrXferProcessor> xferProcessor(
@@ -144,10 +147,11 @@
         fGeometryProcessor->initBatchTracker(&fBatchTracker, init);
     }
 
-    this->setOutputStateInfo(drawState, optFlags, caps);
+    this->setOutputStateInfo(drawState, coverageColor, optFlags, caps);
 }
 
 void GrOptDrawState::setOutputStateInfo(const GrDrawState& ds,
+                                        GrColor coverage,
                                         GrXferProcessor::OptFlags optFlags,
                                         const GrDrawTargetCaps& caps) {
     // Set this default and then possibly change our mind if there is coverage.
@@ -157,7 +161,7 @@
     // Determine whether we should use dual source blending or shader code to keep coverage
     // separate from color.
     bool keepCoverageSeparate = !(optFlags & GrXferProcessor::kSetCoverageDrawing_OptFlag);
-    if (keepCoverageSeparate && !ds.hasSolidCoverage()) {
+    if (keepCoverageSeparate && !ds.hasSolidCoverage(coverage)) {
         if (caps.dualSourceBlendingSupport()) {
             if (kZero_GrBlendCoeff == fDstBlend) {
                 // write the coverage value to second color