commit 22f939e849013b7fc51374c289b5bf37e63dfdb1
author ethannicholas <ethannicholas@google.com> Thu Oct 13 13:25:34 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Oct 13 13:25:34 2016 -0700
tree c646354ad93a50329daa694bd7a54a1d2662c9f0
parent 9e3dbdff53f2d9957626a17a279730cda70f17ba

added basic dataflow analysis to skslc

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2405383003

Review-Url: https://codereview.chromium.org/2405383003

src/gpu/effects/GrBitmapTextGeoProc.cpp

diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index 7f53663..197ac73 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -63,13 +63,15 @@
                              args.fFPCoordTransformHandler);
 
         if (cte.maskFormat() == kARGB_GrMaskFormat) {
-            fragBuilder->codeAppendf("%s = ", args.fOutputColor);
-            fragBuilder->appendTextureLookupAndModulate(args.fOutputColor,
-                                                        args.fTexSamplers[0],
-                                                        v.fsIn(),
-                                                        kVec2f_GrSLType);
-            fragBuilder->codeAppend(";");
-            fragBuilder->codeAppendf("%s = vec4(1);", args.fOutputCoverage);
+            if (!cte.colorIgnored()) {
+                fragBuilder->codeAppendf("%s = ", args.fOutputColor);
+                fragBuilder->appendTextureLookupAndModulate(args.fOutputColor,
+                                                            args.fTexSamplers[0],
+                                                            v.fsIn(),
+                                                            kVec2f_GrSLType);
+                fragBuilder->codeAppend(";");
+                fragBuilder->codeAppendf("%s = vec4(1);", args.fOutputCoverage);
+            }
         } else {
             fragBuilder->codeAppendf("%s = ", args.fOutputCoverage);
             fragBuilder->appendTextureLookup(args.fTexSamplers[0], v.fsIn(), kVec2f_GrSLType);

src/gpu/effects/GrXfermodeFragmentProcessor.cpp

diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
index 051061f..fba4050 100644
--- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
+++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
@@ -98,10 +98,10 @@
     }
 
     // declare outputColor and emit the code for each of the two children
-    SkString srcColor("src");
+    SkString srcColor("xfer_src");
     this->emitChild(0, inputColor, &srcColor, args);
 
-    SkString dstColor("dst");
+    SkString dstColor("xfer_dst");
     this->emitChild(1, inputColor, &dstColor, args);
 
     // emit blend code