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/SkSLFloatLiteral.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/SkSLFloatLiteral.h')
-rw-r--r-- | src/sksl/ir/SkSLFloatLiteral.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/sksl/ir/SkSLFloatLiteral.h b/src/sksl/ir/SkSLFloatLiteral.h index e995e4c6e1..82c15c032b 100644 --- a/src/sksl/ir/SkSLFloatLiteral.h +++ b/src/sksl/ir/SkSLFloatLiteral.h @@ -17,12 +17,9 @@ namespace SkSL { * A literal floating point number. */ struct FloatLiteral : public Expression { - FloatLiteral(const Context& context, int offset, double value) - : INHERITED(offset, kFloatLiteral_Kind, *context.fFloat_Type) - , fValue(value) {} - - FloatLiteral(int offset, double value, const Type* type) - : INHERITED(offset, kFloatLiteral_Kind, *type) + FloatLiteral(const Context& context, int offset, double value, + const Type* type = nullptr) + : INHERITED(offset, kFloatLiteral_Kind, type ? *type : *context.fFloat_Type) , fValue(value) {} String description() const override { @@ -46,10 +43,6 @@ struct FloatLiteral : public Expression { return fValue; } - std::unique_ptr<Expression> clone() const override { - return std::unique_ptr<Expression>(new FloatLiteral(fOffset, fValue, &fType)); - } - const double fValue; typedef Expression INHERITED; |