From 0054311bf3b4f619a631e95d8aa1ea2d4bfd01c6 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Tue, 31 Jul 2018 09:44:36 -0400 Subject: Re-re-land "added GrSkSLFP and converted DitherEffect to use it" This reverts commit 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc. Bug: skia: Change-Id: I7ee78990fc30eec545d1856e59eb6e0573089426 Reviewed-on: https://skia-review.googlesource.com/144348 Reviewed-by: Brian Salomon Commit-Queue: Ethan Nicholas --- src/sksl/ir/SkSLVarDeclarations.h | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'src/sksl/ir/SkSLVarDeclarations.h') diff --git a/src/sksl/ir/SkSLVarDeclarations.h b/src/sksl/ir/SkSLVarDeclarations.h index 707715f6dc..b98e959ff0 100644 --- a/src/sksl/ir/SkSLVarDeclarations.h +++ b/src/sksl/ir/SkSLVarDeclarations.h @@ -29,7 +29,20 @@ struct VarDeclaration : public Statement { , fSizes(std::move(sizes)) , fValue(std::move(value)) {} - String description() const { + std::unique_ptr clone() const override { + std::vector> sizesClone; + for (const auto& s : fSizes) { + if (s) { + sizesClone.push_back(s->clone()); + } else { + sizesClone.push_back(nullptr); + } + } + return std::unique_ptr(new VarDeclaration(fVar, std::move(sizesClone), + fValue ? fValue->clone() : nullptr)); + } + + String description() const override { String result = fVar->fName; for (const auto& size : fSizes) { if (size) { @@ -64,6 +77,16 @@ struct VarDeclarations : public ProgramElement { } } + std::unique_ptr clone() const override { + std::vector> cloned; + for (const auto& v : fVars) { + cloned.push_back(std::unique_ptr( + (VarDeclaration*) v->clone().release())); + } + return std::unique_ptr(new VarDeclarations(fOffset, &fBaseType, + std::move(cloned))); + } + String description() const override { if (!fVars.size()) { return String(); -- cgit v1.2.3