diff options
author | Mike Klein <mtklein@google.com> | 2017-06-27 22:52:03 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 22:52:10 +0000 |
commit | 5ce397205528f82084fc650c2ce27d246c01da33 (patch) | |
tree | 3e359ae172fed10fce8204163d6d372b0c3f6207 /src/sksl/ir/SkSLSetting.h | |
parent | 3fe44544c93759e7791ee0df3e5d172cb0f268b6 (diff) |
Revert "Re-land sksl fragment processor support"
This reverts commit c070939fd1a954b7a492bc30f0cf64a664b90181.
Reason for revert:
This has some knock-on effects in the generation of Android.bp from our GN files. See gn/gn_to_bp.py? We're seeing things like "tmp/tmpsBVycx/gen/" end up in the include search path in Android.bp, which obviously don't exist there...
Original change's description:
> Re-land sksl fragment processor support
>
> This reverts commit ed50200682e0de72c3abecaa4d5324ebcd1ed9f9.
>
> Bug: skia:
> Change-Id: I9caa7454b391450620d6989dc472abb3cf7a2cab
> Reviewed-on: https://skia-review.googlesource.com/20965
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
TBR=benjaminwagner@google.com,ethannicholas@google.com
Change-Id: I502486b5405923b322429219f4cc396a45a14cea
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20990
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLSetting.h')
-rw-r--r-- | src/sksl/ir/SkSLSetting.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/src/sksl/ir/SkSLSetting.h b/src/sksl/ir/SkSLSetting.h deleted file mode 100644 index 995fcf55bf..0000000000 --- a/src/sksl/ir/SkSLSetting.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2016 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SKSL_SETTING -#define SKSL_SETTING - -#include "SkSLContext.h" -#include "SkSLExpression.h" - -namespace SkSL { - -/** - * Represents a compile-time constant setting, such as sk_Caps.fbFetchSupport. These are generally - * collapsed down to their constant representations during the compilation process. - */ -struct Setting : public Expression { - Setting(Position position, String name, std::unique_ptr<Expression> value) - : INHERITED(position, kSetting_Kind, value->fType) - , fName(std::move(name)) - , fValue(std::move(value)) { - ASSERT(fValue->isConstant()); - } - - std::unique_ptr<Expression> constantPropagate(const IRGenerator& irGenerator, - const DefinitionMap& definitions) override; - - String description() const override { - return fName; - } - - bool hasSideEffects() const override { - return false; - } - - bool isConstant() const override { - return true; - } - - const String fName; - std::unique_ptr<Expression> fValue; - - typedef Expression INHERITED; -}; - -} // namespace - -#endif |