diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-02-09 17:04:23 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-09 17:04:41 +0000 |
commit | 49a36ba6234168ef3b591f55810c22bf0fe1c2e4 (patch) | |
tree | 60b2b43588f9b100adc9574bbb3c56e633dc61b7 /src/sksl/SkSLSPIRVCodeGenerator.h | |
parent | 90e3cd78991ef337dbd0023efb30ece864694308 (diff) |
Revert "skslc type constructor cleanups"
This reverts commit 6f223283661c1ddc4a5334d2464804c6b6ba3ffa.
Reason for revert: bot breakage
Original change's description:
> skslc type constructor cleanups
>
> BUG=skia:
>
> Change-Id: I87108b5e107419d99c996ef032eda512a68451ab
> Reviewed-on: https://skia-review.googlesource.com/8117
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
>
TBR=egdaniel@google.com,ethannicholas@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I1c9a8c4c62c7dd0f724f22000507112641d25e3b
Reviewed-on: https://skia-review.googlesource.com/8259
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLSPIRVCodeGenerator.h')
-rw-r--r-- | src/sksl/SkSLSPIRVCodeGenerator.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.h b/src/sksl/SkSLSPIRVCodeGenerator.h index fad7e31d80..562bf279e9 100644 --- a/src/sksl/SkSLSPIRVCodeGenerator.h +++ b/src/sksl/SkSLSPIRVCodeGenerator.h @@ -147,21 +147,7 @@ private: SpvId writeFloatConstructor(const Constructor& c, SkWStream& out); SpvId writeIntConstructor(const Constructor& c, SkWStream& out); - - /** - * Writes a matrix with the diagonal entries all equal to the provided expression, and all other - * entries equal to zero. - */ - void writeUniformScaleMatrix(SpvId id, SpvId diagonal, const Type& type, SkWStream& out); - - /** - * Writes a potentially-different-sized copy of a matrix. Entries which do not exist in the - * source matrix are filled with zero; entries which do not exist in the destination matrix are - * ignored. - */ - void writeMatrixCopy(SpvId id, SpvId src, const Type& srcType, const Type& dstType, - SkWStream& out); - + SpvId writeMatrixConstructor(const Constructor& c, SkWStream& out); SpvId writeVectorConstructor(const Constructor& c, SkWStream& out); |