diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-09-11 13:50:14 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-11 21:45:20 +0000 |
| commit | 5b5f096a038259b8d9084834f877588a0db80250 (patch) | |
| tree | 1b78aa591c578a09012b1f8f8533c3fc3d9c1372 /gn/sksl.gni | |
| parent | 9194706e8cf1ed72f07b2ed9207d81120f2135ad (diff) | |
Revert "Revert "Switch to the new SkSL lexer.""
This reverts commit 358515491a0d6891e6a709688a30ad087df1beb1.
Bug: skia:
Change-Id: I013fac0ed83774d8ae7c6ee6819045cab37f5e97
Reviewed-on: https://skia-review.googlesource.com/45180
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'gn/sksl.gni')
| -rw-r--r-- | gn/sksl.gni | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gn/sksl.gni b/gn/sksl.gni index c1b6abaf02..65913e3417 100644 --- a/gn/sksl.gni +++ b/gn/sksl.gni @@ -9,15 +9,16 @@ _src = get_path_info("../src", "abspath") skia_sksl_sources = [ "$_src/sksl/SkSLCFGGenerator.cpp", "$_src/sksl/SkSLCompiler.cpp", - "$_src/sksl/SkSLIRGenerator.cpp", - "$_src/sksl/SkSLParser.cpp", "$_src/sksl/SkSLCPPCodeGenerator.cpp", - "$_src/sksl/SkSLHCodeGenerator.cpp", "$_src/sksl/SkSLGLSLCodeGenerator.cpp", + "$_src/sksl/SkSLHCodeGenerator.cpp", + "$_src/sksl/SkSLIRGenerator.cpp", + "$_src/sksl/SkSLLexer.cpp", + "$_src/sksl/SkSLLayoutLexer.cpp", + "$_src/sksl/SkSLParser.cpp", "$_src/sksl/SkSLSPIRVCodeGenerator.cpp", "$_src/sksl/SkSLString.cpp", "$_src/sksl/SkSLUtil.cpp", - "$_src/sksl/lex.layout.cpp", "$_src/sksl/ir/SkSLSymbolTable.cpp", "$_src/sksl/ir/SkSLSetting.cpp", "$_src/sksl/ir/SkSLType.cpp", |