aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/SkSLGLSLCodeGenerator.h
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2017-07-14 10:12:15 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-14 14:41:04 +0000
commit6e1cbc012b10e99d9caed19eef43939778d1d8ff (patch)
tree94a884a96e8412ab0e852f6489321fd83de4b2a6 /src/sksl/SkSLGLSLCodeGenerator.h
parent9a03642ad2fce5805642783f68078a0a6bf03554 (diff)
fixed sksl static ifs to work for CircleEffect
static ifs (and switches) in .fp files are a bit tricky, because they aren't necessarily static when the CPP file is being produced. They become static when the CPP file produces the final SkSL; at this point the final values of the 'in' variables are known. This change permits 'deferred' static ifs and switches. The initial compilation (.fp -> .cpp) passes the @if / @switch through, and then the final compilation (.cpp's generated SkSL -> GLSL or whatever) enforces the static test. Bug: skia: Change-Id: I0087dfe1725c8fd350507ac77f64db1d82659cdf Reviewed-on: https://skia-review.googlesource.com/23403 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLGLSLCodeGenerator.h')
-rw-r--r--src/sksl/SkSLGLSLCodeGenerator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sksl/SkSLGLSLCodeGenerator.h b/src/sksl/SkSLGLSLCodeGenerator.h
index 5716bde70d..6fe25d3a69 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.h
+++ b/src/sksl/SkSLGLSLCodeGenerator.h
@@ -162,7 +162,7 @@ protected:
void writeBlock(const Block& b);
- void writeIfStatement(const IfStatement& stmt);
+ virtual void writeIfStatement(const IfStatement& stmt);
void writeForStatement(const ForStatement& f);
@@ -170,7 +170,7 @@ protected:
void writeDoStatement(const DoStatement& d);
- void writeSwitchStatement(const SwitchStatement& s);
+ virtual void writeSwitchStatement(const SwitchStatement& s);
void writeReturnStatement(const ReturnStatement& r);