commit 5ee90ff98259861282e20dbfc03a5c64013e4f67
author Brian Osman <brianosman@google.com> Wed Jun 10 16:08:54 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jun 15 19:18:14 2020 +0000
tree 3e87e510db5ec3427acaae80024af8d6c31c3e4a
parent e3a39f7053bdaf4f0d5146141173c5308f32e292

Moved SampleMatrix computation out of SectionAndParameterHelper

This will let us share this code with the pipeline stage code generator,
which doesn't use the helper.

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

src/sksl/SkSLHCodeGenerator.cpp

diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp
index c4a7748..f53b572 100644
--- a/src/sksl/SkSLHCodeGenerator.cpp
+++ b/src/sksl/SkSLHCodeGenerator.cpp
@@ -8,6 +8,7 @@
 #include "src/sksl/SkSLHCodeGenerator.h"
 
 #include "src/sksl/SkSLParser.h"
+#include "src/sksl/SkSLSampleMatrix.h"
 #include "src/sksl/SkSLUtil.h"
 #include "src/sksl/ir/SkSLEnum.h"
 #include "src/sksl/ir/SkSLFunctionDeclaration.h"
@@ -285,7 +286,7 @@
                 this->writef("            %s->setSampledWithExplicitCoords();",
                              String(param->fName).c_str());
             }
-            SampleMatrix matrix = fSectionAndParameterHelper.getMatrix(*param);
+            SampleMatrix matrix = SampleMatrix::Make(fProgram, *param);
             switch (matrix.fKind) {
                 case SampleMatrix::Kind::kVariable:
                     this->writef("            %s->setSampleMatrix(SkSL::SampleMatrix("