diff options
| author |  egdaniel <egdaniel@google.com> | 2016-11-16 07:29:51 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-11-16 07:29:52 -0800 |
| commit | 988283c89458442f65d961f2746a9f271a39c31e (patch) | |
| tree | 5b62299020e1a566d62b154b7f0fc229fd74b858 /src/sksl/ir/SkSLLayout.h | |
| parent | cb115bdeed5898ded3fdbe572a14616cff809b7c (diff) | |
Revert of added support for push_constant layout (patchset #7 id:140001 of https://codereview.chromium.org/2187433003/ )
Reason for revert:
hitting assert in vulkan
Original issue's description:
> added support for push_constant layout
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2187433003
>
> Committed: https://skia.googlesource.com/skia/+/fa5f65ac61fd525029aa9dab161ffe4896c10f6d
TBR=ethannicholas@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2509673002
Diffstat (limited to 'src/sksl/ir/SkSLLayout.h')
| -rw-r--r-- | src/sksl/ir/SkSLLayout.h | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h index dfa396758b..24087d0612 100644 --- a/src/sksl/ir/SkSLLayout.h +++ b/src/sksl/ir/SkSLLayout.h @@ -24,11 +24,10 @@ struct Layout { , fBuiltin(layout.fBuiltin) , fOriginUpperLeft(layout.fOriginUpperLeft) , fOverrideCoverage(layout.fOverrideCoverage) - , fBlendSupportAllEquations(layout.fBlendSupportAllEquations) - , fPushConstant(layout.fPushConstant) {} + , fBlendSupportAllEquations(layout.fBlendSupportAllEquations) {} Layout(int location, int binding, int index, int set, int builtin, bool originUpperLeft, - bool overrideCoverage, bool blendSupportAllEquations, bool pushconstant) + bool overrideCoverage, bool blendSupportAllEquations) : fLocation(location) , fBinding(binding) , fIndex(index) @@ -36,19 +35,7 @@ struct Layout { , fBuiltin(builtin) , fOriginUpperLeft(originUpperLeft) , fOverrideCoverage(overrideCoverage) - , fBlendSupportAllEquations(blendSupportAllEquations) - , fPushConstant(pushconstant) {} - - Layout() - : fLocation(-1) - , fBinding(-1) - , fIndex(-1) - , fSet(-1) - , fBuiltin(-1) - , fOriginUpperLeft(false) - , fOverrideCoverage(false) - , fBlendSupportAllEquations(false) - , fPushConstant(false) {} + , fBlendSupportAllEquations(blendSupportAllEquations) {} std::string description() const { std::string result; @@ -85,10 +72,6 @@ struct Layout { result += separator + "blend_support_all_equations"; separator = ", "; } - if (fPushConstant) { - result += separator + "push_constant"; - separator = ", "; - } if (result.length() > 0) { result = "layout (" + result + ")"; } @@ -110,16 +93,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 |