Index: src/sksl/ir/SkSLLayout.h |
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h |
index d8dc98096fa776778db6ca59bcead192054156a5..24087d06121a817c45923235ade277b8649d7c54 100644 |
--- a/src/sksl/ir/SkSLLayout.h |
+++ b/src/sksl/ir/SkSLLayout.h |
@@ -22,15 +22,20 @@ struct Layout { |
, 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 @@ struct Layout { |
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 @@ struct Layout { |
} |
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 @@ struct Layout { |
int fSet; |
int fBuiltin; |
bool fOriginUpperLeft; |
+ bool fOverrideCoverage; |
+ bool fBlendSupportAllEquations; |
}; |
} // namespace |