diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-07-10 09:37:51 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-13 17:27:44 +0000 |
| commit | 0df21136e3dc5434149695f09b79aff271430365 (patch) | |
| tree | f55f26ffa74e3fddb057488ba5d162603c56d069 /src/sksl/SkSLSPIRVCodeGenerator.h | |
| parent | ed1205ae20b213c07305d604b2b515ab27cba085 (diff) | |
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>
Diffstat (limited to 'src/sksl/SkSLSPIRVCodeGenerator.h')
| -rw-r--r-- | src/sksl/SkSLSPIRVCodeGenerator.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.h b/src/sksl/SkSLSPIRVCodeGenerator.h index fee54ad65c..16f5beb68f 100644 --- a/src/sksl/SkSLSPIRVCodeGenerator.h +++ b/src/sksl/SkSLSPIRVCodeGenerator.h @@ -211,7 +211,12 @@ private: 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, |