commit beb2fbf0e66a71b8bff82983e322ee59e9a3f03b
author John Stiles <johnstiles@google.com> Thu Jul 08 18:54:39 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 09 13:32:36 2021 +0000
tree a53e2e1073fee6260dc94b757f55981224f50496
parent f5bd4e4b9f6bd1b508dd5eb67129bfca528ef39b

Simplify SPIR-V matrix construction logic.

This should generate the same output as before, except that SpvIds are
renumbered. We now use `writeComposite` instead of manually emitting
SpvOpCompositeConstruct instructions, and some logic for column-building
was simplified; columns counts are no longer tracked as a separate
value, since we can just call size() to inspect this.

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

src/sksl/codegen/SkSLSPIRVCodeGenerator.h

diff --git a/src/sksl/codegen/SkSLSPIRVCodeGenerator.h b/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
index 68e3d31..d284bd8 100644
--- a/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
+++ b/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
@@ -295,9 +295,8 @@
      */
     SpvId writeMatrixCopy(SpvId src, const Type& srcType, const Type& dstType, OutputStream& out);
 
-    void addColumnEntry(SpvId columnType, Precision precision, std::vector<SpvId>* currentColumn,
-                        std::vector<SpvId>* columnIds, int* currentCount, int rows, SpvId entry,
-                        OutputStream& out);
+    void addColumnEntry(const Type& columnType, std::vector<SpvId>* currentColumn,
+                        std::vector<SpvId>* columnIds, int rows, SpvId entry, OutputStream& out);
 
     SpvId writeConstructorCompound(const ConstructorCompound& c, OutputStream& out);