From 358515491a0d6891e6a709688a30ad087df1beb1 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Mon, 11 Sep 2017 16:33:48 +0000 Subject: Revert "Switch to the new SkSL lexer." This reverts commit c576e93d174f3106e072a2f506bca3990b541265. Reason for revert: ASAN failures Original change's description: > Switch to the new SkSL lexer. > > This completely replaces flex with a new in-house lexical analyzer generator, > which we have done for performance and memory usage reasons. Flex requires us > to copy strings every time we need the text of a token, whereas this new lexer > allows us to handle strings as a (non-null-terminated) pointer and length > everywhere, eliminating most string copies. > > Bug: skia: > Change-Id: I2add26efc9e20cb699520e82abcf713af3968aca > Reviewed-on: https://skia-review.googlesource.com/39780 > Reviewed-by: Brian Salomon > Commit-Queue: Ethan Nicholas TBR=bsalomon@google.com,ethannicholas@google.com Change-Id: If27b750a5f696d06a6bcffed12fe9f0598e084a6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/44881 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- gn/sksl.gni | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gn/sksl.gni') diff --git a/gn/sksl.gni b/gn/sksl.gni index 65913e3417..c1b6abaf02 100644 --- a/gn/sksl.gni +++ b/gn/sksl.gni @@ -9,16 +9,15 @@ _src = get_path_info("../src", "abspath") skia_sksl_sources = [ "$_src/sksl/SkSLCFGGenerator.cpp", "$_src/sksl/SkSLCompiler.cpp", - "$_src/sksl/SkSLCPPCodeGenerator.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/SkSLCPPCodeGenerator.cpp", + "$_src/sksl/SkSLHCodeGenerator.cpp", + "$_src/sksl/SkSLGLSLCodeGenerator.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", -- cgit v1.2.3