commit dcfe6dba4a335e50e86ff68e3252065d4197432c
author ethannicholas <ethannicholas@google.com> Mon Oct 10 10:09:00 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Oct 10 10:09:00 2016 -0700
tree 6953805849e283220d56f4feac3358b5efea3cc9
parent 95304e395c46bdd40decbb7ccd46939886cc1244

Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed: https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed: https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed: https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Review-Url: https://codereview.chromium.org/2288033003

src/sksl/ir/SkSLLayout.h

diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h
index d8dc980..24087d0 100644
--- a/src/sksl/ir/SkSLLayout.h
+++ b/src/sksl/ir/SkSLLayout.h
@@ -22,15 +22,20 @@
     , fIndex(layout.fIndex)
     , fSet(layout.fSet)
     , fBuiltin(layout.fBuiltin)
-    , fOriginUpperLeft(layout.fOriginUpperLeft) {}
+    , fOriginUpperLeft(layout.fOriginUpperLeft)
+    , fOverrideCoverage(layout.fOverrideCoverage)
+    , fBlendSupportAllEquations(layout.fBlendSupportAllEquations) {}
 
-    Layout(int location, int binding, int index, int set, int builtin, bool originUpperLeft)
+    Layout(int location, int binding, int index, int set, int builtin, bool originUpperLeft,
+           bool overrideCoverage, bool blendSupportAllEquations)
     : fLocation(location)
     , fBinding(binding)
     , fIndex(index)
     , fSet(set)
     , fBuiltin(builtin)
-    , fOriginUpperLeft(originUpperLeft) {}
+    , fOriginUpperLeft(originUpperLeft)
+    , fOverrideCoverage(overrideCoverage)
+    , fBlendSupportAllEquations(blendSupportAllEquations) {}
 
     std::string description() const {
         std::string result;
@@ -59,6 +64,14 @@
             result += separator + "origin_upper_left";
             separator = ", ";
         }
+        if (fOverrideCoverage) {
+            result += separator + "override_coverage";
+            separator = ", ";
+        }
+        if (fBlendSupportAllEquations) {
+            result += separator + "blend_support_all_equations";
+            separator = ", ";
+        }
         if (result.length() > 0) {
             result = "layout (" + result + ")";
         }
@@ -66,11 +79,14 @@
     }
 
     bool operator==(const Layout& other) const {
-        return fLocation == other.fLocation &&
-               fBinding  == other.fBinding &&
-               fIndex    == other.fIndex &&
-               fSet      == other.fSet &&
-               fBuiltin  == other.fBuiltin;
+        return fLocation                 == other.fLocation &&
+               fBinding                  == other.fBinding &&
+               fIndex                    == other.fIndex &&
+               fSet                      == other.fSet &&
+               fBuiltin                  == other.fBuiltin &&
+               fOriginUpperLeft          == other.fOriginUpperLeft &&
+               fOverrideCoverage         == other.fOverrideCoverage &&
+               fBlendSupportAllEquations == other.fBlendSupportAllEquations;
     }
 
     bool operator!=(const Layout& other) const {
@@ -85,6 +101,8 @@
     int fSet;
     int fBuiltin;
     bool fOriginUpperLeft;
+    bool fOverrideCoverage;
+    bool fBlendSupportAllEquations;
 };
 
 } // namespace