commit fb964a40f1181201a502b1d1fa669d542a219d92
author Brian Osman <brianosman@google.com> Wed Nov 18 10:45:52 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 18 16:27:25 2020 +0000
tree 9cd10a16dab1accb6119e196c97e93a09c0c1303
parent 0540efe78a34442a99ce0428728b21e27f88ae2e

SkSL: Preserve coerced types of literals during dehydration/rehydration

Fixes a bug with ternary expressions in the pre-includes.

Change-Id: Ib277ce7d9f6a50ab3ee02610746af2672208afde
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335820
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/sksl/SkSLDehydrator.cpp

diff --git a/src/sksl/SkSLDehydrator.cpp b/src/sksl/SkSLDehydrator.cpp
index 6b81f28..6e8ef4a 100644
--- a/src/sksl/SkSLDehydrator.cpp
+++ b/src/sksl/SkSLDehydrator.cpp
@@ -304,6 +304,7 @@
             case Expression::Kind::kFloatLiteral: {
                 const FloatLiteral& f = e->as<FloatLiteral>();
                 this->writeCommand(Rehydrator::kFloatLiteral_Command);
+                this->write(f.type());
                 FloatIntUnion u;
                 u.fFloat = f.value();
                 this->writeS32(u.fInt);
@@ -330,6 +331,7 @@
             case Expression::Kind::kIntLiteral: {
                 const IntLiteral& i = e->as<IntLiteral>();
                 this->writeCommand(Rehydrator::kIntLiteral_Command);
+                this->write(i.type());
                 this->writeS32(i.value());
                 break;
             }