commit e318355a6796550691d113cde4b95cc7df20e15a
author John Stiles <johnstiles@google.com> Wed Jan 13 19:34:17 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 14 15:53:03 2021 +0000
tree cbfe68c341f14e80b1f886458c9e6aedce53d446
parent 6c7910e680b99840a66284f02c4e20d771d6d900

Add unit test for scalar conversion constructors.

This revealed a gap in our SPIR-V scalar constructor support;
typecasting a number to bool would lead to an ABORT.

Change-Id: Idac6d7ba34adfd214ed3cad8139e22d7170456f0
Bug: skia:11172
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/353628
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

src/sksl/SkSLSPIRVCodeGenerator.cpp

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 20f2c43..08e82ca 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -1661,15 +1661,11 @@
         this->getActualType(type) == this->getActualType(c.arguments()[0]->type())) {
         return this->writeExpression(*c.arguments()[0], out);
     }
-    if (type == *fContext.fTypes.fFloat || type == *fContext.fTypes.fHalf) {
+    if (type.isFloat()) {
         return this->writeFloatConstructor(c, out);
-    } else if (type == *fContext.fTypes.fInt ||
-               type == *fContext.fTypes.fShort ||
-               type == *fContext.fTypes.fByte) {
+    } else if (type.isSigned()) {
         return this->writeIntConstructor(c, out);
-    } else if (type == *fContext.fTypes.fUInt ||
-               type == *fContext.fTypes.fUShort ||
-               type == *fContext.fTypes.fUByte) {
+    } else if (type.isUnsigned()) {
         return this->writeUIntConstructor(c, out);
     }
     switch (type.typeKind()) {
@@ -1680,9 +1676,7 @@
         case Type::TypeKind::kArray:
             return this->writeArrayConstructor(c, out);
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported constructor: %s", c.description().c_str());
-#endif
+            fErrors.error(c.fOffset, "unsupported constructor: " + c.description());
             return -1;
     }
 }