commit b26b4e73401d1855b3d0c40f01b2bd9fd0e0361d
author Mike Reed <reed@google.com> Wed Jan 22 14:31:21 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 22 20:19:16 2020 +0000
tree a30a1e3050a740854c1fb41ea21c304aceed153c
parent cbf31d0a0e1ad934ad687e4d33f74e20ad7f7e48

Revert "Revert "use SkM44 internally""

This reverts commit f79aacba2b61eadf4fe7103dd2681aa2f05be0ef.

Fix: had transposed when converting from colormatrix to m44

Change-Id: I6bc81d0c50bb1bf8d771e4dfa0c25c39de265b1e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/265765
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/sksl/SkSLHCodeGenerator.cpp

diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp
index fab988e..c284315 100644
--- a/src/sksl/SkSLHCodeGenerator.cpp
+++ b/src/sksl/SkSLHCodeGenerator.cpp
@@ -64,7 +64,7 @@
     } else if (type == *context.fFloat3x3_Type || type == *context.fHalf3x3_Type) {
         return Layout::CType::kSkMatrix;
     } else if (type == *context.fFloat4x4_Type || type == *context.fHalf4x4_Type) {
-        return Layout::CType::kSkMatrix44;
+        return Layout::CType::kSkM44;
     } else if (type.kind() == Type::kSampler_Kind) {
         return Layout::CType::kGrSurfaceProxy;
     } else if (type == *context.fFragmentProcessor_Type) {
@@ -347,7 +347,7 @@
                  fFullName.c_str(),
                  fFullName.c_str());
     this->writef("#include \"include/core/SkTypes.h\"\n");
-    this->writef("#include \"include/core/SkMatrix44.h\"\n");
+    this->writef("#include \"include/private/SkM44.h\"\n");
     this->writeSection(HEADER_SECTION);
     this->writef("\n"
                  "#include \"src/gpu/GrCoordTransform.h\"\n"