aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/ir/SkSLIntLiteral.h
diff options
context:
space:
mode:
authorGravatar Kevin Lubick <kjlubick@google.com>2018-06-19 12:04:18 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-19 12:23:21 +0000
commitf2030783094e502fb74221077a5ee7cb41287fe4 (patch)
tree7716875c2aaf120f213bb916300bf9482d260d0c /src/sksl/ir/SkSLIntLiteral.h
parentfb3beb0591aed9fd6bf349eb5d08e0e485bcff08 (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/SkSLIntLiteral.h')
-rw-r--r--src/sksl/ir/SkSLIntLiteral.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/sksl/ir/SkSLIntLiteral.h b/src/sksl/ir/SkSLIntLiteral.h
index 116796c16d..50337bfe6f 100644
--- a/src/sksl/ir/SkSLIntLiteral.h
+++ b/src/sksl/ir/SkSLIntLiteral.h
@@ -19,12 +19,8 @@ namespace SkSL {
struct IntLiteral : public Expression {
// FIXME: we will need to revisit this if/when we add full support for both signed and unsigned
// 64-bit integers, but for right now an int64_t will hold every value we care about
- IntLiteral(const Context& context, int offset, int64_t value)
- : INHERITED(offset, kIntLiteral_Kind, *context.fInt_Type)
- , fValue(value) {}
-
- IntLiteral(int offset, int64_t value, const Type* type = nullptr)
- : INHERITED(offset, kIntLiteral_Kind, *type)
+ IntLiteral(const Context& context, int offset, int64_t value, const Type* type = nullptr)
+ : INHERITED(offset, kIntLiteral_Kind, type ? *type : *context.fInt_Type)
, fValue(value) {}
String description() const override {
@@ -55,10 +51,6 @@ struct IntLiteral : public Expression {
return fValue;
}
- std::unique_ptr<Expression> clone() const override {
- return std::unique_ptr<Expression>(new IntLiteral(fOffset, fValue, &fType));
- }
-
const int64_t fValue;
typedef Expression INHERITED;