diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2018-06-19 12:04:18 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-19 12:23:21 +0000 |
| commit | f2030783094e502fb74221077a5ee7cb41287fe4 (patch) | |
| tree | 7716875c2aaf120f213bb916300bf9482d260d0c /src/sksl/ir/SkSLTypeReference.h | |
| parent | fb3beb0591aed9fd6bf349eb5d08e0e485bcff08 (diff) | |
Revert "added GrSkSLFP and converted DitherEffect to use it"
This reverts commit dfbfc738a9edfff7a9804253175e380c230f3d21.
Reason for revert: Seems to be breaking DDL/ASAN bots
Original change's description:
> added GrSkSLFP and converted DitherEffect to use it
>
> Bug: skia:
> Change-Id: I84b71165eab1712355f3c7669cee2d33d259f3df
> Reviewed-on: https://skia-review.googlesource.com/124504
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,ethannicholas@google.com
Change-Id: Ic4c3978aaba0391f2f8bb1316a456e3821a3a2f2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/135700
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLTypeReference.h')
| -rw-r--r-- | src/sksl/ir/SkSLTypeReference.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/sksl/ir/SkSLTypeReference.h b/src/sksl/ir/SkSLTypeReference.h index df3dc15abd..f7065b7c3f 100644 --- a/src/sksl/ir/SkSLTypeReference.h +++ b/src/sksl/ir/SkSLTypeReference.h @@ -18,9 +18,9 @@ namespace SkSL { * always eventually replaced by Constructors in valid programs. */ struct TypeReference : public Expression { - TypeReference(const Context& context, int offset, const Type& value) + TypeReference(const Context& context, int offset, const Type& type) : INHERITED(offset, kTypeReference_Kind, *context.fInvalid_Type) - , fValue(value) {} + , fValue(type) {} bool hasSideEffects() const override { return false; @@ -30,18 +30,9 @@ struct TypeReference : public Expression { return String(fValue.fName); } - std::unique_ptr<Expression> clone() const override { - return std::unique_ptr<Expression>(new TypeReference(fOffset, fValue, &fType)); - } - const Type& fValue; typedef Expression INHERITED; - -private: - TypeReference(int offset, const Type& value, const Type* type) - : INHERITED(offset, kTypeReference_Kind, *type) - , fValue(value) {} }; } // namespace |