diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-08-02 10:52:54 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-02 18:47:00 +0000 |
| commit | dcba08e891f1766b047cf0dbe8bbd275d9f55d2b (patch) | |
| tree | c53822e53f595ea7c886f1efb22a2835da368b79 /src/sksl/SkSLCompiler.cpp | |
| parent | d9971c0c20d9937f6eabbf03b7638916d8dd57d7 (diff) | |
Revert "Revert "support for 'half' types in sksl, plus general numeric type improvements""
This reverts commit 0e9605542444a7653359f4fc610f7620df9f6313.
Bug: skia:
Change-Id: Id45d091c1950887316c901ed9c9281181f346bcf
Reviewed-on: https://skia-review.googlesource.com/29602
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLCompiler.cpp')
| -rw-r--r-- | src/sksl/SkSLCompiler.cpp | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp index d96515cd88..4ea956ce0f 100644 --- a/src/sksl/SkSLCompiler.cpp +++ b/src/sksl/SkSLCompiler.cpp @@ -68,6 +68,10 @@ Compiler::Compiler(Flags flags) ADD_TYPE(Float2); ADD_TYPE(Float3); ADD_TYPE(Float4); + ADD_TYPE(Half); + ADD_TYPE(Half2); + ADD_TYPE(Half3); + ADD_TYPE(Half4); ADD_TYPE(Double); ADD_TYPE(Double2); ADD_TYPE(Double3); @@ -80,6 +84,14 @@ Compiler::Compiler(Flags flags) ADD_TYPE(UInt2); ADD_TYPE(UInt3); ADD_TYPE(UInt4); + ADD_TYPE(Short); + ADD_TYPE(Short2); + ADD_TYPE(Short3); + ADD_TYPE(Short4); + ADD_TYPE(UShort); + ADD_TYPE(UShort2); + ADD_TYPE(UShort3); + ADD_TYPE(UShort4); ADD_TYPE(Bool); ADD_TYPE(Bool2); ADD_TYPE(Bool3); @@ -93,7 +105,26 @@ Compiler::Compiler(Flags flags) ADD_TYPE(Float4x2); ADD_TYPE(Float4x3); ADD_TYPE(Float4x4); + ADD_TYPE(Half2x2); + ADD_TYPE(Half2x3); + ADD_TYPE(Half2x4); + ADD_TYPE(Half3x2); + ADD_TYPE(Half3x3); + ADD_TYPE(Half3x4); + ADD_TYPE(Half4x2); + ADD_TYPE(Half4x3); + ADD_TYPE(Half4x4); + ADD_TYPE(Double2x2); + ADD_TYPE(Double2x3); + ADD_TYPE(Double2x4); + ADD_TYPE(Double3x2); + ADD_TYPE(Double3x3); + ADD_TYPE(Double3x4); + ADD_TYPE(Double4x2); + ADD_TYPE(Double4x3); + ADD_TYPE(Double4x4); ADD_TYPE(GenType); + ADD_TYPE(GenHType); ADD_TYPE(GenDType); ADD_TYPE(GenIType); ADD_TYPE(GenUType); @@ -104,9 +135,12 @@ Compiler::Compiler(Flags flags) ADD_TYPE(GVec2); ADD_TYPE(GVec3); ADD_TYPE(GVec4); + ADD_TYPE(HVec); ADD_TYPE(DVec); ADD_TYPE(IVec); ADD_TYPE(UVec); + ADD_TYPE(SVec); + ADD_TYPE(USVec); ADD_TYPE(BVec); ADD_TYPE(Sampler1D); |