commit 07a255310aca9f3e83bf741dc663a58818ad681c
author joshualitt <joshualitt@chromium.org> Tue Oct 07 08:05:21 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 07 08:05:21 2014 -0700
tree 63b6c874f3021950c48f468f79818dedf194a35e
parent f19657f1d48fc69867809b7a602b9d0660069e99

gl programs rewrite

BUG=skia:

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

src/gpu/GrDrawState.cpp

diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index f967a6f..07243fc 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -404,7 +404,7 @@
     if (this->hasCoverageVertexAttribute()) {
         inout.fValidFlags = 0;
     } else {
-        inout.fColor = fCoverage;
+        inout.fColor = this->getCoverageColor();
         inout.fValidFlags = kRGBA_GrColorComponentFlags;
     }
 
@@ -413,6 +413,7 @@
         const GrGeometryProcessor* gp = fGeometryProcessor->getGeometryProcessor();
         gp->computeInvariantOutput(&inout);
     }
+
     for (int s = 0; s < this->numCoverageStages(); ++s) {
         const GrProcessor* processor = this->getCoverageStage(s).getProcessor();
         processor->computeInvariantOutput(&inout);
@@ -640,8 +641,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 GrDrawState::BlendOptFlags GrDrawState::getBlendOpts(bool forceCoverage,
-                                                         GrBlendCoeff* srcCoeff,
-                                                         GrBlendCoeff* dstCoeff) const {
+                                                     GrBlendCoeff* srcCoeff,
+                                                     GrBlendCoeff* dstCoeff) const {
     GrBlendCoeff bogusSrcCoeff, bogusDstCoeff;
     if (NULL == srcCoeff) {
         srcCoeff = &bogusSrcCoeff;