Revert "Revert "added GrSkSLFP and converted DitherEffect to use it""

This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4.

Bug: skia:
Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e
Reviewed-on: https://skia-review.googlesource.com/137391
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/sksl/ir/SkSLIntLiteral.h b/src/sksl/ir/SkSLIntLiteral.h
index 50337bfe6f..116796c16d 100644
--- a/src/sksl/ir/SkSLIntLiteral.h
+++ b/src/sksl/ir/SkSLIntLiteral.h
@@ -19,8 +19,12 @@ 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, const Type* type = nullptr)
-    : INHERITED(offset, kIntLiteral_Kind, type ? *type : *context.fInt_Type)
+    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)
     , fValue(value) {}
 
     String description() const override {
@@ -51,6 +55,10 @@ 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;