commit 811b944a89602d4466ea273b565642639d2a95c0
author Ethan Nicholas <ethannicholas@google.com> Fri May 11 13:16:03 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri May 11 17:56:47 2018 +0000
tree 99c8dcd8a63455bc015ece1c7e76dba89d553449
parent 79bf7ac3f439b3fa8d6b807ebb5d44f9969fa60c

fixed incorrect index in SPIR-V matrix construction

Bug: skia:7908
Change-Id: I990e5f6e84afdc81d340f433d93a9061b9dd67ef
Reviewed-on: https://skia-review.googlesource.com/127397
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLSPIRVCodeGenerator.cpp

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 1cbe4c0..0e20b93 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -1252,7 +1252,7 @@
                     currentColumn.push_back(arguments[i]);
                 } else {
                     SpvId componentType = this->getType(c.fArguments[i]->fType.componentType());
-                    for (int j = 0; j < c.fArguments[j]->fType.columns(); ++j) {
+                    for (int j = 0; j < c.fArguments[i]->fType.columns(); ++j) {
                         SpvId swizzle = this->nextId();
                         this->writeInstruction(SpvOpCompositeExtract, componentType, swizzle,
                                                arguments[i], j, out);