Chromium Code Reviews| Index: src/sksl/ir/SkSLLayout.h |
| diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h |
| index 24087d06121a817c45923235ade277b8649d7c54..c61ac674d6391b263513885353a58bdb56a3609f 100644 |
| --- a/src/sksl/ir/SkSLLayout.h |
| +++ b/src/sksl/ir/SkSLLayout.h |
| @@ -24,10 +24,11 @@ struct Layout { |
| , fBuiltin(layout.fBuiltin) |
| , fOriginUpperLeft(layout.fOriginUpperLeft) |
| , fOverrideCoverage(layout.fOverrideCoverage) |
| - , fBlendSupportAllEquations(layout.fBlendSupportAllEquations) {} |
| + , fBlendSupportAllEquations(layout.fBlendSupportAllEquations) |
| + , fPushConstant(layout.fPushConstant) {} |
| Layout(int location, int binding, int index, int set, int builtin, bool originUpperLeft, |
| - bool overrideCoverage, bool blendSupportAllEquations) |
| + bool overrideCoverage, bool blendSupportAllEquations, bool pushconstant) |
| : fLocation(location) |
| , fBinding(binding) |
| , fIndex(index) |
| @@ -35,7 +36,8 @@ struct Layout { |
| , fBuiltin(builtin) |
| , fOriginUpperLeft(originUpperLeft) |
| , fOverrideCoverage(overrideCoverage) |
| - , fBlendSupportAllEquations(blendSupportAllEquations) {} |
| + , fBlendSupportAllEquations(blendSupportAllEquations) |
| + , fPushConstant(pushconstant) {} |
| std::string description() const { |
| std::string result; |
| @@ -72,6 +74,14 @@ struct Layout { |
| result += separator + "blend_support_all_equations"; |
| separator = ", "; |
| } |
| + if (fBlendSupportAllEquations) { |
|
egdaniel
2016/11/14 18:48:35
dupe of the line above?
|
| + result += separator + "blend_support_all_equations"; |
| + separator = ", "; |
| + } |
| + if (fPushConstant) { |
| + result += separator + "push_constant"; |
| + separator = ", "; |
| + } |
| if (result.length() > 0) { |
| result = "layout (" + result + ")"; |
| } |
| @@ -93,16 +103,16 @@ struct Layout { |
| return !(*this == other); |
| } |
| - // everything but builtin is in the GLSL spec; builtin comes from SPIR-V and identifies which |
| - // particular builtin value this object represents. |
| int fLocation; |
| int fBinding; |
| int fIndex; |
| int fSet; |
| int fBuiltin; |
| + int fOffset; |
| bool fOriginUpperLeft; |
| bool fOverrideCoverage; |
| bool fBlendSupportAllEquations; |
| + bool fPushConstant; |
| }; |
| } // namespace |