diff options
| author |  Stan Iliev <stani@google.com> | 2016-11-16 15:25:42 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-16 15:25:57 +0000 |
| commit | cb115bdeed5898ded3fdbe572a14616cff809b7c (patch) | |
| tree | 7402c43ca87f7ad7edf64f5ed0a02de28a242259 /src/sksl/ir/SkSLLayout.h | |
| parent | cfcf624c39683a8364fa7f22235b787a23675780 (diff) | |
Revert "Add support for image load to SkSL"
This reverts commit bd85a105ba7b3ee2008d20fb9281bfb47325ad0e.
Reason for revert: Needing to revert a dependent CL
Original change's description:
> Add support for image load to SkSL
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4865
>
> Change-Id: I4647e6b255946ced2b1b8cb05e62f0f5a8ad28b6
> Reviewed-on: https://skia-review.googlesource.com/4865
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
>
TBR=bsalomon@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I45932a53c606aadd645ee2b8264f08ad63429939
Reviewed-on: https://skia-review.googlesource.com/4892
Commit-Queue: Stan Iliev <stani@google.com>
Reviewed-by: Stan Iliev <stani@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLLayout.h')
| -rw-r--r-- | src/sksl/ir/SkSLLayout.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h index ef2f8c22b2..dfa396758b 100644 --- a/src/sksl/ir/SkSLLayout.h +++ b/src/sksl/ir/SkSLLayout.h @@ -25,12 +25,10 @@ struct Layout { , fOriginUpperLeft(layout.fOriginUpperLeft) , fOverrideCoverage(layout.fOverrideCoverage) , fBlendSupportAllEquations(layout.fBlendSupportAllEquations) - , fPushConstant(layout.fPushConstant) - , fFormat(layout.fFormat) {} + , fPushConstant(layout.fPushConstant) {} Layout(int location, int binding, int index, int set, int builtin, bool originUpperLeft, - bool overrideCoverage, bool blendSupportAllEquations, bool pushconstant, - ASTLayout::Format format) + bool overrideCoverage, bool blendSupportAllEquations, bool pushconstant) : fLocation(location) , fBinding(binding) , fIndex(index) @@ -39,8 +37,7 @@ struct Layout { , fOriginUpperLeft(originUpperLeft) , fOverrideCoverage(overrideCoverage) , fBlendSupportAllEquations(blendSupportAllEquations) - , fPushConstant(pushconstant) - , fFormat(format) {} + , fPushConstant(pushconstant) {} Layout() : fLocation(-1) @@ -51,8 +48,7 @@ struct Layout { , fOriginUpperLeft(false) , fOverrideCoverage(false) , fBlendSupportAllEquations(false) - , fPushConstant(false) - , fFormat(ASTLayout::Format::kUnspecified) {} + , fPushConstant(false) {} std::string description() const { std::string result; @@ -93,10 +89,6 @@ struct Layout { result += separator + "push_constant"; separator = ", "; } - if (ASTLayout::Format::kUnspecified != fFormat) { - result += separator + ASTLayout::FormatToStr(fFormat); - separator = ", "; - } if (result.length() > 0) { result = "layout (" + result + ")"; } @@ -111,8 +103,7 @@ struct Layout { fBuiltin == other.fBuiltin && fOriginUpperLeft == other.fOriginUpperLeft && fOverrideCoverage == other.fOverrideCoverage && - fBlendSupportAllEquations == other.fBlendSupportAllEquations && - fFormat == other.fFormat; + fBlendSupportAllEquations == other.fBlendSupportAllEquations; } bool operator!=(const Layout& other) const { @@ -129,7 +120,6 @@ struct Layout { bool fOverrideCoverage; bool fBlendSupportAllEquations; bool fPushConstant; - ASTLayout::Format fFormat; }; } // namespace |