Add 'isBoolean' method to SkSL::Type.

johnstiles-google · Skia Commit-Bot · commit 4dfa9774300c · 2020-11-24T15:57:46.000Z
We have built-in methods for determining whether a type is an int, float, signed, unsigned, matrix, vector, etc. For some reason, however, the lowly boolean never received similar treatment. Now, booleans are a first-class citizen and can be identified by calling `isBoolean` instead of doing a string compare or looking at the Context type pointers. (I did do a quick search to make sure that kNonnumeric wasn't used anywhere else to check for Boolean-ness.) Change-Id: I35c0e3c7530c13e2c4e307a70272d298ce6b44bc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338042 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/sksl/SkSLByteCodeGenerator.cpp b/src/sksl/SkSLByteCodeGenerator.cpp
@@ -17,23 +17,23 @@ static TypeCategory type_category(const Type& type) {
         case Type::TypeKind::kMatrix:
             return type_category(type.componentType());
         default:
-            const StringFragment& name = type.name();
-            if (name == "bool") {
+            if (type.isBoolean()) {
                 return TypeCategory::kBool;
-            } else if (name == "int" ||
-                       name == "short" ||
-                       name == "$intLiteral") {
+            }
+            const StringFragment& name = type.name();
+            if (name == "int" ||
+                name == "short" ||
+                name == "$intLiteral") {
                 return TypeCategory::kSigned;
-            } else if (name == "uint" ||
-                       name == "ushort") {
+            }
+            if (name == "uint" ||
+                name == "ushort") {
                 return TypeCategory::kUnsigned;
-            } else {
-                SkASSERT(name == "float" ||
-                         name == "half" ||
-                         name == "$floatLiteral");
-                return TypeCategory::kFloat;
             }
-            ABORT("unsupported type: %s\n", type.displayName().c_str());
+            SkASSERT(name == "float" ||
+                     name == "half" ||
+                     name == "$floatLiteral");
+            return TypeCategory::kFloat;
     }
 }
 
diff --git a/src/sksl/SkSLCPPCodeGenerator.cpp b/src/sksl/SkSLCPPCodeGenerator.cpp
@@ -116,7 +116,7 @@ void CPPCodeGenerator::writeBinaryExpression(const BinaryExpression& b,
 }
 
 static String default_value(const Type& type) {
-    if (type.name() == "bool") {
+    if (type.isBoolean()) {
         return "false";
     }
     switch (type.typeKind()) {
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h
@@ -58,7 +58,7 @@ class Context {
     , 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::NumberKind::kNonnumeric, -1))
+    , fBool_Type(new Type("bool", Type::NumberKind::kBoolean, -1))
     , fBool2_Type(new Type("bool2", *fBool_Type, 2))
     , fBool3_Type(new Type("bool3", *fBool_Type, 3))
     , fBool4_Type(new Type("bool4", *fBool_Type, 4))
diff --git a/src/sksl/SkSLMemoryLayout.h b/src/sksl/SkSLMemoryLayout.h
@@ -103,7 +103,7 @@ class MemoryLayout {
     size_t size(const Type& type) const {
         switch (type.typeKind()) {
             case Type::TypeKind::kScalar:
-                if (type.name() == "bool") {
+                if (type.isBoolean()) {
                     return 1;
                 }
                 // FIXME need to take precision into account, once we figure out how we want to
diff --git a/src/sksl/ir/SkSLType.h b/src/sksl/ir/SkSLType.h
@@ -91,6 +91,7 @@ class Type final : public Symbol {
         kFloat,
         kSigned,
         kUnsigned,
+        kBoolean,
         kNonnumeric
     };
 
@@ -260,11 +261,18 @@ class Type final : public Symbol {
         return fTypeKind;
     }
 
+    /**
+     * Returns true if this type is a bool.
+     */
+    bool isBoolean() const {
+        return fNumberKind == NumberKind::kBoolean;
+    }
+
     /**
      * Returns true if this is a numeric scalar type.
      */
     bool isNumber() const {
-        return fNumberKind != NumberKind::kNonnumeric;
+        return this->isFloat() || this->isInteger();
     }
 
     /**
@@ -292,7 +300,7 @@ class Type final : public Symbol {
      * Returns true if this is a signed or unsigned integer.
      */
     bool isInteger() const {
-        return isSigned() || isUnsigned();
+        return this->isSigned() || this->isUnsigned();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void CPPCodeGenerator::writeBinaryExpression(const BinaryExpression& b,`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`static String default_value(const Type& type) {`
`119`		`- if (type.name() == "bool") {`
	`119`	`+ if (type.isBoolean()) {`
`120`	`120`	`return "false";`
`121`	`121`	`}`
`122`	`122`	`switch (type.typeKind()) {`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ class MemoryLayout {`
`103`	`103`	`size_t size(const Type& type) const {`
`104`	`104`	`switch (type.typeKind()) {`
`105`	`105`	`case Type::TypeKind::kScalar:`
`106`		`- if (type.name() == "bool") {`
	`106`	`+ if (type.isBoolean()) {`
`107`	`107`	`return 1;`
`108`	`108`	`}`
`109`	`109`	`// FIXME need to take precision into account, once we figure out how we want to`