diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2016-10-18 13:00:03 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-18 13:21:25 +0000 |
commit | 37269ff2592dfb3abff987a3507b18e8073e96d8 (patch) | |
tree | 39c2edc888bc6a5aa6ff7c1d591419656002cdf8 /src/sksl/ir | |
parent | a2196536782903d22011ed7145b8640c66fc72ff (diff) |
Revert "skslc now automatically turns on derivatives support"
This reverts commit 311742bd0eac6fad150bf8f0a4e2809679464e47.
Reason for revert: Android try failure
Change-Id: I6e92b49df1c8f692da947b277067b9003a9367d0
Reviewed-on: https://skia-review.googlesource.com/3600
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ir')
-rw-r--r-- | src/sksl/ir/SkSLFunctionDeclaration.h | 2 | ||||
-rw-r--r-- | src/sksl/ir/SkSLSymbolTable.cpp | 18 | ||||
-rw-r--r-- | src/sksl/ir/SkSLSymbolTable.h | 2 |
3 files changed, 0 insertions, 22 deletions
diff --git a/src/sksl/ir/SkSLFunctionDeclaration.h b/src/sksl/ir/SkSLFunctionDeclaration.h index ffde0c66c1..16a184a6d7 100644 --- a/src/sksl/ir/SkSLFunctionDeclaration.h +++ b/src/sksl/ir/SkSLFunctionDeclaration.h @@ -24,7 +24,6 @@ struct FunctionDeclaration : public Symbol { std::vector<const Variable*> parameters, const Type& returnType) : INHERITED(position, kFunctionDeclaration_Kind, std::move(name)) , fDefined(false) - , fBuiltin(false) , fParameters(std::move(parameters)) , fReturnType(returnType) {} @@ -56,7 +55,6 @@ struct FunctionDeclaration : public Symbol { } mutable bool fDefined; - bool fBuiltin; const std::vector<const Variable*> fParameters; const Type& fReturnType; diff --git a/src/sksl/ir/SkSLSymbolTable.cpp b/src/sksl/ir/SkSLSymbolTable.cpp index 6d8e9a7ea6..9d8c0063c5 100644 --- a/src/sksl/ir/SkSLSymbolTable.cpp +++ b/src/sksl/ir/SkSLSymbolTable.cpp @@ -97,22 +97,4 @@ void SymbolTable::addWithoutOwnership(const std::string& name, const Symbol* sym } } - -void SymbolTable::markAllFunctionsBuiltin() { - for (const auto& pair : fSymbols) { - switch (pair.second->fKind) { - case Symbol::kFunctionDeclaration_Kind: - ((FunctionDeclaration&) *pair.second).fBuiltin = true; - break; - case Symbol::kUnresolvedFunction_Kind: - for (auto& f : ((UnresolvedFunction&) *pair.second).fFunctions) { - ((FunctionDeclaration*) f)->fBuiltin = true; - } - break; - default: - break; - } - } -} - } // namespace diff --git a/src/sksl/ir/SkSLSymbolTable.h b/src/sksl/ir/SkSLSymbolTable.h index be2b49c48d..d732023ff0 100644 --- a/src/sksl/ir/SkSLSymbolTable.h +++ b/src/sksl/ir/SkSLSymbolTable.h @@ -39,8 +39,6 @@ public: Symbol* takeOwnership(Symbol* s); - void markAllFunctionsBuiltin(); - const std::shared_ptr<SymbolTable> fParent; private: |