diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2018-01-23 16:39:42 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-23 22:23:30 +0000 |
commit | 29b3434e48ca41672266ac40f5b9e8f8a0405cb5 (patch) | |
tree | 2524748fc90c30ae887e6a086e6bb76ffaa05e81 /src/sksl/SkSLIRGenerator.h | |
parent | 8524c30a971cd22fe1e3e0fd3db5988fe23272b6 (diff) |
Revert "converted vertex shaders to device coords"
This reverts commit e7e81c15c144b8133f696d0744ed9f7e8d06e936.
Reason for revert: Chrome perf regressions
Bug: skia:
Change-Id: I17fadc97c4b8e80bfdccbf123554614a00c58473
Reviewed-on: https://skia-review.googlesource.com/99040
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 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/sksl/SkSLIRGenerator.h b/src/sksl/SkSLIRGenerator.h index 327fe6fc7a..1df9b65bd0 100644 --- a/src/sksl/SkSLIRGenerator.h +++ b/src/sksl/SkSLIRGenerator.h @@ -62,8 +62,7 @@ public: IRGenerator(const Context* context, std::shared_ptr<SymbolTable> root, ErrorReporter& errorReporter); - void convertProgram(Program::Kind kind, - const char* text, + void convertProgram(const char* text, size_t length, SymbolTable& types, std::vector<std::unique_ptr<ProgramElement>>* result); @@ -157,15 +156,12 @@ private: std::unique_ptr<Statement> convertWhile(const ASTWhileStatement& w); void convertEnum(const ASTEnum& e); std::unique_ptr<Block> applyInvocationIDWorkaround(std::unique_ptr<Block> main); - // returns a statement which converts sk_Position from device to normalized coordinates - std::unique_ptr<Statement> getNormalizeSkPositionCode(); void fixRectSampling(std::vector<std::unique_ptr<Expression>>& arguments); void checkValid(const Expression& expr); void markWrittenTo(const Expression& expr, bool readWrite); void getConstantInt(const Expression& value, int64_t* out); - Program::Kind fKind; const FunctionDeclaration* fCurrentFunction; std::unordered_map<String, Program::Settings::Value> fCapsMap; std::shared_ptr<SymbolTable> fRootSymbolTable; @@ -179,10 +175,6 @@ private: ErrorReporter& fErrors; int fInvocations; std::vector<std::unique_ptr<ProgramElement>>* fProgramElements; - Variable* fSkPerVertex; - Variable* fRTAdjust; - Variable* fRTAdjustInterfaceBlock; - int fRTAdjustFieldIndex; friend class AutoSymbolTable; friend class AutoLoopLevel; |