diff options
author | 2017-09-15 11:42:17 -0400 | |
---|---|---|
committer | 2017-09-15 18:50:54 +0000 | |
commit | 05d5a13fea6246648de7e41358ed338d53c85ea2 (patch) | |
tree | 695fdbeae1116f8ce813288e47b31c2a99f28f1f /src/sksl/SkSLHCodeGenerator.cpp | |
parent | 49f1f34438d3431f6d7e32847accd2ba96948a73 (diff) |
Revert "Revert "Switched highp float to highfloat and mediump float to half.""
This reverts commit 1d816b92bb7cf2258007f3f74ffd143b89f25d01.
Bug: skia:
Change-Id: I388b5e5e9bf619db48297a80c9a80c039f26c9f1
Reviewed-on: https://skia-review.googlesource.com/46464
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLHCodeGenerator.cpp')
-rw-r--r-- | src/sksl/SkSLHCodeGenerator.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp index 482020af7f..8203990df2 100644 --- a/src/sksl/SkSLHCodeGenerator.cpp +++ b/src/sksl/SkSLHCodeGenerator.cpp @@ -23,13 +23,15 @@ HCodeGenerator::HCodeGenerator(const Program* program, ErrorReporter* errors, St , fSectionAndParameterHelper(*program, *errors) {} String HCodeGenerator::ParameterType(const Type& type) { - if (type.name() == "float2") { + if (type.name() == "highfloat" || type.name() == "half") { + return "float"; + } else if (type.name() == "highfloat2" || type.name() == "half2") { return "SkPoint"; - } else if (type.name() == "int4") { + } else if (type.name() == "int4" || type.name() == "short4") { return "SkIRect"; - } else if (type.name() == "float4") { + } else if (type.name() == "highfloat4" || type.name() == "half4") { return "SkRect"; - } else if (type.name() == "float4x4") { + } else if (type.name() == "highfloat4x4" || type.name() == "half4x4") { return "SkMatrix44"; } else if (type.kind() == Type::kSampler_Kind) { return "sk_sp<GrTextureProxy>"; |