commit 0df21136e3dc5434149695f09b79aff271430365
author Ethan Nicholas <ethannicholas@google.com> Tue Jul 10 09:37:51 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 13 17:27:44 2018 +0000
tree f55f26ffa74e3fddb057488ba5d162603c56d069
parent ed1205ae20b213c07305d604b2b515ab27cba085

fixed SPIR-V matrix operations

Bug: skia:
Change-Id: I23be824cdd7d00ffd0c54516a168c07e77bb4f49
Reviewed-on: https://skia-review.googlesource.com/140182
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLSPIRVCodeGenerator.h

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.h b/src/sksl/SkSLSPIRVCodeGenerator.h
index fee54ad..16f5beb 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.h
+++ b/src/sksl/SkSLSPIRVCodeGenerator.h
@@ -211,7 +211,12 @@
     SpvId foldToBool(SpvId id, const Type& operandType, SpvOp op, OutputStream& out);
 
     SpvId writeMatrixComparison(const Type& operandType, SpvId lhs, SpvId rhs, SpvOp_ floatOperator,
-                                SpvOp_ intOperator, OutputStream& out);
+                                SpvOp_ intOperator, SpvOp_ vectorMergeOperator,
+                                SpvOp_ mergeOperator, OutputStream& out);
+
+    SpvId writeComponentwiseMatrixBinary(const Type& operandType, SpvId lhs, SpvId rhs,
+                                         SpvOp_ floatOperator, SpvOp_ intOperator,
+                                         OutputStream& out);
 
     SpvId writeBinaryOperation(const Type& resultType, const Type& operandType, SpvId lhs,
                                SpvId rhs, SpvOp_ ifFloat, SpvOp_ ifInt, SpvOp_ ifUInt,