aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/SkSLCompiler.h
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2018-07-19 20:10:37 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-19 20:10:46 +0000
commit6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc (patch)
tree57e5d832d16aa9a0447e5102fe9811e39f8403d9 /src/sksl/SkSLCompiler.h
parent736db1081b378ac8c167dfbc0322470d28c1cb3e (diff)
Reland "Revert "added GrSkSLFP and converted DitherEffect to use it""
This reverts commit 97ae0c89025dfd791047f5701e57d58da37c125c. Reason for revert: Breaking ANGLE. Original change's description: > Revert "Revert "added GrSkSLFP and converted DitherEffect to use it"" > > This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4. > > Bug: skia: > Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e > Reviewed-on: https://skia-review.googlesource.com/137391 > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com,robertphillips@google.com,ethannicholas@google.com Change-Id: I65d6d2707fceab0a99121c528d1b848d23e34bfa No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/142588 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLCompiler.h')
-rw-r--r--src/sksl/SkSLCompiler.h29
1 files changed, 7 insertions, 22 deletions
diff --git a/src/sksl/SkSLCompiler.h b/src/sksl/SkSLCompiler.h
index b054eed4d5..2c8c78687a 100644
--- a/src/sksl/SkSLCompiler.h
+++ b/src/sksl/SkSLCompiler.h
@@ -26,8 +26,6 @@
#define SK_TEXTURESAMPLERS_BUILTIN 10006
#define SK_OUT_BUILTIN 10007
#define SK_LASTFRAGCOLOR_BUILTIN 10008
-#define SK_MAIN_X_BUILTIN 10009
-#define SK_MAIN_Y_BUILTIN 10010
#define SK_FRAGCOORD_BUILTIN 15
#define SK_VERTEXID_BUILTIN 42
#define SK_INSTANCEID_BUILTIN 43
@@ -60,11 +58,6 @@ public:
kPermitInvalidStaticTests_Flag = 1,
};
- enum class FormatArg {
- kInput,
- kOutput
- };
-
Compiler(Flags flags = kNone_Flags);
~Compiler() override;
@@ -72,27 +65,19 @@ public:
std::unique_ptr<Program> convertProgram(Program::Kind kind, String text,
const Program::Settings& settings);
- bool optimize(Program& program);
-
- std::unique_ptr<Program> specialize(Program& program,
- const std::unordered_map<SkSL::String, SkSL::Program::Settings::Value>& inputs);
-
- bool toSPIRV(Program& program, OutputStream& out);
-
- bool toSPIRV(Program& program, String* out);
+ bool toSPIRV(const Program& program, OutputStream& out);
- bool toGLSL(Program& program, OutputStream& out);
+ bool toSPIRV(const Program& program, String* out);
- bool toGLSL(Program& program, String* out);
+ bool toGLSL(const Program& program, OutputStream& out);
- bool toMetal(Program& program, OutputStream& out);
+ bool toGLSL(const Program& program, String* out);
- bool toCPP(Program& program, String name, OutputStream& out);
+ bool toMetal(const Program& program, OutputStream& out);
- bool toH(Program& program, String name, OutputStream& out);
+ bool toCPP(const Program& program, String name, OutputStream& out);
- bool toPipelineStage(const Program& program, String* out,
- std::vector<FormatArg>* outFormatArgs);
+ bool toH(const Program& program, String name, OutputStream& out);
void error(int offset, String msg) override;