aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/ir/SkSLProgram.h
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2018-07-31 09:44:36 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-31 15:18:03 +0000
commit0054311bf3b4f619a631e95d8aa1ea2d4bfd01c6 (patch)
treea3a48bece53f8a381c2a2e431db08f5055282e4f /src/sksl/ir/SkSLProgram.h
parentce3c7bbd0de68fda69903107461738b6afc8a3f4 (diff)
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 <bsalomon@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLProgram.h')
-rw-r--r--src/sksl/ir/SkSLProgram.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/sksl/ir/SkSLProgram.h b/src/sksl/ir/SkSLProgram.h
index 9f140877b7..59c91229f8 100644
--- a/src/sksl/ir/SkSLProgram.h
+++ b/src/sksl/ir/SkSLProgram.h
@@ -39,6 +39,10 @@ struct Program {
: fKind(kInt_Kind)
, fValue(i) {}
+ Value(unsigned int i)
+ : fKind(kInt_Kind)
+ , fValue(i) {}
+
std::unique_ptr<Expression> literal(const Context& context, int offset) const {
switch (fKind) {
case Program::Settings::Value::kBool_Kind:
@@ -192,7 +196,7 @@ struct Program {
kVertex_Kind,
kGeometry_Kind,
kFragmentProcessor_Kind,
- kCPU_Kind
+ kPipelineStage_Kind
};
Program(Kind kind,
@@ -252,10 +256,13 @@ struct Program {
// because destroying elements can modify reference counts in symbols
std::shared_ptr<SymbolTable> fSymbols;
Inputs fInputs;
+ bool fIsOptimized = false;
private:
std::vector<std::unique_ptr<ProgramElement>>* fInheritedElements;
std::vector<std::unique_ptr<ProgramElement>> fElements;
+
+ friend class Compiler;
};
} // namespace