diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 09:33:41 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 15:25:32 +0000 |
| commit | f3333c89bf05fc602d9bf8e1e24547668c660383 (patch) | |
| tree | 3c0855ef8829201299ce757ecaf28bfda50a2683 /src/sksl/ir/SkSLType.cpp | |
| parent | 66b09abdb184d843ece45a1d343fbe632075b323 (diff) | |
skslc can now be compiled with no Skia dependencies, in preparation for its eventual
role in Skia's build process.
This reverts commit bcf35f86d50b784b165de703b404998dd4299f6a.
BUG=skia:
Change-Id: Id0a12dfc4d804d69a3c6bf60fed37e89ee130f02
Reviewed-on: https://skia-review.googlesource.com/10802
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLType.cpp')
| -rw-r--r-- | src/sksl/ir/SkSLType.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sksl/ir/SkSLType.cpp b/src/sksl/ir/SkSLType.cpp index d28c4f0666..c919cbc8ae 100644 --- a/src/sksl/ir/SkSLType.cpp +++ b/src/sksl/ir/SkSLType.cpp @@ -4,7 +4,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - + #include "SkSLType.h" #include "SkSLContext.h" @@ -22,7 +22,7 @@ bool Type::determineCoercionCost(const Type& other, int* outCost) const { return false; } if (this->kind() == kMatrix_Kind) { - if (this->columns() == other.columns() && + if (this->columns() == other.columns() && this->rows() == other.rows()) { return this->componentType().determineCoercionCost(other.componentType(), outCost); } |