commit 72efd80ab21e46f7e5ee7086cbdfbe320b9228c1
author Michael Ludwig <michaelludwig@google.com> Fri Aug 31 13:26:19 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Aug 31 18:21:13 2018 +0000
tree b7b633618c6640ba5abe3d021d7ea965dcbb07a6
parent 0b7645f6d99d3bebb4771698acf54f6bce84f631

Fixes for primitive handling for uniforms

Updates header mapping to include bool as a primitive, restoring the
GrYUVtoRGBEffect header to its state pre-improved uniforms.

Also fixes the NaN constants specified in the uniform ctype mapping to
actually reference valid constants for SK_FloatNaN.

Bug: skia:
Change-Id: I27848d61c411f2674f66a1532876c7cf22d71be3
Reviewed-on: https://skia-review.googlesource.com/150906
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>

src/sksl/SkSLHCodeGenerator.cpp

diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp
index 90d96f7..17bcfa0 100644
--- a/src/sksl/SkSLHCodeGenerator.cpp
+++ b/src/sksl/SkSLHCodeGenerator.cpp
@@ -76,7 +76,7 @@
 
 String HCodeGenerator::AccessType(const Context& context, const Type& type,
                                   const Layout& layout) {
-    static const std::set<String> primitiveTypes = { "int32_t", "float", "SkPMColor" };
+    static const std::set<String> primitiveTypes = { "int32_t", "float", "bool", "SkPMColor" };
 
     String fieldType = FieldType(context, type, layout);
     bool isPrimitive = primitiveTypes.find(fieldType) != primitiveTypes.end();