diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-03-30 18:42:48 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-30 18:42:59 +0000 |
commit | bcf35f86d50b784b165de703b404998dd4299f6a (patch) | |
tree | 9fcd85326b1a5dbda864da9431a878bb62f65191 /src/sksl/SkSLIRGenerator.h | |
parent | 7833466da45bfa1e078427c4a6db94d41c5c1535 (diff) |
Revert "skslc can now be compiled with no Skia dependencies, in preparation for"
This reverts commit 7833466da45bfa1e078427c4a6db94d41c5c1535.
Reason for revert: Vulkan assertion failure
Original change's description:
> skslc can now be compiled with no Skia dependencies, in preparation for
> its eventual role in Skia's build process.
>
> Bug: skia:
> Change-Id: Iaa9933f4fc4a64bec60aa897c509a3513f457a78
> Reviewed-on: https://skia-review.googlesource.com/10282
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
>
TBR=egdaniel@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ic64cac2395abb406116885ddd725f74a434c8c49
Reviewed-on: https://skia-review.googlesource.com/10758
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLIRGenerator.h')
-rw-r--r-- | src/sksl/SkSLIRGenerator.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sksl/SkSLIRGenerator.h b/src/sksl/SkSLIRGenerator.h index b0a449acea..fb79cda9b5 100644 --- a/src/sksl/SkSLIRGenerator.h +++ b/src/sksl/SkSLIRGenerator.h @@ -154,12 +154,12 @@ private: Modifiers convertModifiers(const Modifiers& m); std::unique_ptr<Expression> convertPrefixExpression(const ASTPrefixExpression& expression); std::unique_ptr<Statement> convertReturn(const ASTReturnStatement& r); - std::unique_ptr<Expression> getCap(Position position, String name); + std::unique_ptr<Expression> getCap(Position position, SkString name); std::unique_ptr<Expression> convertSuffixExpression(const ASTSuffixExpression& expression); std::unique_ptr<Expression> convertField(std::unique_ptr<Expression> base, - const String& field); + const SkString& field); std::unique_ptr<Expression> convertSwizzle(std::unique_ptr<Expression> base, - const String& fields); + const SkString& fields); std::unique_ptr<Expression> convertTernaryExpression(const ASTTernaryExpression& expression); std::unique_ptr<Statement> convertVarDeclarationStatement(const ASTVarDeclarationStatement& s); std::unique_ptr<Statement> convertWhile(const ASTWhileStatement& w); @@ -169,7 +169,7 @@ private: const FunctionDeclaration* fCurrentFunction; const Program::Settings* fSettings; - std::unordered_map<String, CapValue> fCapsMap; + std::unordered_map<SkString, CapValue> fCapsMap; std::shared_ptr<SymbolTable> fSymbolTable; int fLoopLevel; int fSwitchLevel; |