diff options
author | Ruiqi Mao <ruiqimao@google.com> | 2018-07-17 10:19:38 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-17 15:08:40 +0000 |
commit | b609e6dc6a02336aed04caaddcdd5ccfbe7ba9ec (patch) | |
tree | 052d6e5c5c7835481f5a0e0bead6ec575679b76f /src/sksl/SkSLContext.h | |
parent | 6dd4b209091b876832218e8adf1909669960bf98 (diff) |
added byte and ubyte types to SKSL
created new GMs for skinning
Bug: skia:
Change-Id: I15fb2bd02fba8beb6dd2dd3f3716da016ea92192
Reviewed-on: https://skia-review.googlesource.com/140241
Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLContext.h')
-rw-r--r-- | src/sksl/SkSLContext.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h index 61dd8042e4..ef2aef089e 100644 --- a/src/sksl/SkSLContext.h +++ b/src/sksl/SkSLContext.h @@ -49,6 +49,14 @@ public: , fShort2_Type(new Type("short2", *fShort_Type, 2)) , fShort3_Type(new Type("short3", *fShort_Type, 3)) , fShort4_Type(new Type("short4", *fShort_Type, 4)) + , fUByte_Type(new Type("ubyte", Type::kUnsigned_NumberKind, 0)) + , fUByte2_Type(new Type("ubyte2", *fUByte_Type, 2)) + , fUByte3_Type(new Type("ubyte3", *fUByte_Type, 3)) + , fUByte4_Type(new Type("ubyte4", *fUByte_Type, 4)) + , fByte_Type(new Type("byte", Type::kSigned_NumberKind, 0)) + , fByte2_Type(new Type("byte2", *fByte_Type, 2)) + , fByte3_Type(new Type("byte3", *fByte_Type, 3)) + , fByte4_Type(new Type("byte4", *fByte_Type, 4)) , fBool_Type(new Type("bool", Type::kNonnumeric_NumberKind, -1)) , fBool2_Type(new Type("bool2", *fBool_Type, 2)) , fBool3_Type(new Type("bool3", *fBool_Type, 3)) @@ -180,6 +188,10 @@ public: fShort3_Type.get(), fShort4_Type.get() })) , fUSVec_Type(new Type("$usvec", { fInvalid_Type.get(), fUShort2_Type.get(), fUShort3_Type.get(), fUShort4_Type.get() })) + , fByteVec_Type(new Type("$bytevec", { fInvalid_Type.get(), fByte2_Type.get(), + fByte3_Type.get(), fByte4_Type.get() })) + , fUByteVec_Type(new Type("$ubytevec", { fInvalid_Type.get(), fUByte2_Type.get(), + fUByte3_Type.get(), fUByte4_Type.get() })) , fBVec_Type(new Type("$bvec", { fInvalid_Type.get(), fBool2_Type.get(), fBool3_Type.get(), fBool4_Type.get() })) , fSkCaps_Type(new Type("$sk_Caps")) @@ -230,6 +242,16 @@ public: const std::unique_ptr<Type> fShort3_Type; const std::unique_ptr<Type> fShort4_Type; + const std::unique_ptr<Type> fUByte_Type; + const std::unique_ptr<Type> fUByte2_Type; + const std::unique_ptr<Type> fUByte3_Type; + const std::unique_ptr<Type> fUByte4_Type; + + const std::unique_ptr<Type> fByte_Type; + const std::unique_ptr<Type> fByte2_Type; + const std::unique_ptr<Type> fByte3_Type; + const std::unique_ptr<Type> fByte4_Type; + const std::unique_ptr<Type> fBool_Type; const std::unique_ptr<Type> fBool2_Type; const std::unique_ptr<Type> fBool3_Type; @@ -328,6 +350,8 @@ public: const std::unique_ptr<Type> fUVec_Type; const std::unique_ptr<Type> fSVec_Type; const std::unique_ptr<Type> fUSVec_Type; + const std::unique_ptr<Type> fByteVec_Type; + const std::unique_ptr<Type> fUByteVec_Type; const std::unique_ptr<Type> fBVec_Type; |