diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-10-25 21:04:34 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-25 21:05:05 +0000 |
commit | 2d3cac58fcc8f2d398a421b0341c36479a6ba324 (patch) | |
tree | 9994cea43500dc53bf48601e0145c50046ab7bf6 /src/sksl/ir/SkSLLayout.h | |
parent | d52c6c27b748ca32453261179e621665e2864a6a (diff) |
Revert "converted OverdrawColorFilter to SkSL"
This reverts commit 8aa4dc9052a64d84cfd0a4330910057bd37b6bf7.
Reason for revert: strncmp getting mad
Original change's description:
> converted OverdrawColorFilter to SkSL
>
> Bug: skia:
> Change-Id: Idcc0502758df1e60ed131a168b5c9a65a4d834a1
> Reviewed-on: https://skia-review.googlesource.com/63840
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,ethannicholas@google.com
Change-Id: Ib78d7c878c4597918d059bddb4d61f6a7f59a511
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/63561
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLLayout.h')
-rw-r--r-- | src/sksl/ir/SkSLLayout.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h index 9c4fcb1889..dc676280d6 100644 --- a/src/sksl/ir/SkSLLayout.h +++ b/src/sksl/ir/SkSLLayout.h @@ -100,7 +100,7 @@ struct Layout { Layout(int location, int offset, int binding, int index, int set, int builtin, int inputAttachmentIndex, bool originUpperLeft, bool overrideCoverage, bool blendSupportAllEquations, Format format, bool pushconstant, Primitive primitive, - int maxVertices, int invocations, String when, Key key, StringFragment ctype) + int maxVertices, int invocations, String when, Key key) : fLocation(location) , fOffset(offset) , fBinding(binding) @@ -117,8 +117,7 @@ struct Layout { , fMaxVertices(maxVertices) , fInvocations(invocations) , fWhen(when) - , fKey(key) - , fCType(ctype) {} + , fKey(key) {} Layout() : fLocation(-1) @@ -281,7 +280,6 @@ struct Layout { int fInvocations; String fWhen; Key fKey; - StringFragment fCType; }; } // namespace |