Reland "Reland "Revert "Initial land of SkSL DSL."""

This reverts commit 52e5850.

Reason for revert: Failing on Build-Debian9-Clang-arm-Release-Flutter_Android_Docker: https://logs.chromium.org/logs/skia/5066a8ed31374c11/+/steps/Run_build_script_in_Docker/0/stdout

Original change's description:
> Revert "Reland "Revert "Initial land of SkSL DSL."""
>
> This reverts commit 53f69f1.
>
> Change-Id: I374b016c8a08d83c99cbab800f30b882244b87f1
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/342919
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: John Stiles <johnstiles@google.com>

TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com

# Not skipping CQ checks because this is a reland.

Change-Id: Ia04ee404478314b3ae034e0a7740ef667364b2f8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/343100
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

Author: Ethan Nicholas

gn/sksl.gni

@@ -54,13 +54,6 @@ skia_sksl_sources = [
   "$_src/sksl/SkSLStringStream.h",
   "$_src/sksl/SkSLUtil.cpp",
   "$_src/sksl/SkSLUtil.h",
-  "$_src/sksl/dsl/DSLBlock.cpp",
-  "$_src/sksl/dsl/DSLExpression.cpp",
-  "$_src/sksl/dsl/DSLStatement.cpp",
-  "$_src/sksl/dsl/DSLType.cpp",
-  "$_src/sksl/dsl/DSLVar.cpp",
-  "$_src/sksl/dsl/DSL_core.cpp",
-  "$_src/sksl/dsl/priv/DSLWriter.cpp",
   "$_src/sksl/ir/SkSLBinaryExpression.h",
   "$_src/sksl/ir/SkSLBlock.h",
   "$_src/sksl/ir/SkSLBoolLiteral.h",

gn/tests.gni

@@ -264,7 +264,6 @@ tests_sources = [
   "$_tests/SkResourceCacheTest.cpp",
   "$_tests/SkRuntimeEffectTest.cpp",
   "$_tests/SkSLCross.cpp",
-  "$_tests/SkSLDSLTest.cpp",
   "$_tests/SkSLFPTestbed.cpp",
   "$_tests/SkSLGLSLTestbed.cpp",
   "$_tests/SkSLInterpreterTest.cpp",

src/gpu/glsl/GrGLSLShaderBuilder.cpp

@@ -13,8 +13,6 @@
 #include "src/gpu/glsl/GrGLSLBlend.h"
 #include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"
-#include "src/sksl/dsl/DSL.h"
-#include "src/sksl/dsl/priv/DSLWriter.h"
 
 GrGLSLShaderBuilder::GrGLSLShaderBuilder(GrGLSLProgramBuilder* program)
     : fProgramBuilder(program)
@@ -24,7 +22,6 @@ GrGLSLShaderBuilder::GrGLSLShaderBuilder(GrGLSLProgramBuilder* program)
     , fCodeIndex(kCode)
     , fFinalized(false)
     , fTmpVariableCounter(0) {
-    SkSL::dsl::DSLWriter::Reset();
     // We push back some dummy pointers which will later become our header
     for (int i = 0; i <= kCode; i++) {
         fShaderStrings.push_back();
@@ -84,13 +81,6 @@ void GrGLSLShaderBuilder::emitFunctionPrototype(GrSLType returnType,
     this->functions().append(";\n");
 }
 
-void GrGLSLShaderBuilder::codeAppend(SkSL::dsl::Statement stmt) {
-    std::unique_ptr<SkSL::Statement> skslStmt = stmt.release();
-    if (skslStmt) {
-        this->codeAppend(skslStmt->description().c_str());
-    }
-}
-
 static inline void append_texture_swizzle(SkString* out, GrSwizzle swizzle) {
     if (swizzle != GrSwizzle::RGBA()) {
         out->appendf(".%s", swizzle.asString().c_str());

src/gpu/glsl/GrGLSLShaderBuilder.h

@@ -17,14 +17,6 @@
 
 #include <stdarg.h>
 
-namespace SkSL {
-
-namespace dsl {
-    class DSLStatement;
-} // namespace dsl
-
-} // namespace SkSL
-
 class GrGLSLColorSpaceXformHelper;
 
 /**
@@ -117,8 +109,6 @@ class GrGLSLShaderBuilder {
 
     void codeAppend(const char* str, size_t length) { this->code().append(str, length); }
 
-    void codeAppend(SkSL::dsl::DSLStatement stmt);
-
     void codePrependf(const char format[], ...) SK_PRINTF_LIKE(2, 3) {
        va_list args;
        va_start(args, format);

src/sksl/SkSLCFGGenerator.cpp

@@ -367,9 +367,6 @@ void CFGGenerator::addExpression(CFG& cfg, std::unique_ptr<Expression>* e, bool
             }
             break;
         }
-        case Expression::Kind::kCodeString:
-            SkDEBUGFAIL("shouldn't be able to receive kCodeString here");
-            break;
         case Expression::Kind::kConstructor: {
             Constructor& c = e->get()->as<Constructor>();
             for (auto& arg : c.arguments()) {

src/sksl/SkSLCompiler.cpp

@@ -1813,7 +1813,6 @@ std::unique_ptr<Program> Compiler::convertProgram(
 
 bool Compiler::optimize(LoadedModule& module) {
     SkASSERT(!fErrorCount);
-    const Program::Settings* oldSettings = fIRGenerator->fSettings;
     Program::Settings settings;
     fIRGenerator->fKind = module.fKind;
     fIRGenerator->fSettings = &settings;
@@ -1838,7 +1837,6 @@ bool Compiler::optimize(LoadedModule& module) {
             break;
         }
     }
-    fIRGenerator->fSettings = oldSettings;
     return fErrorCount == 0;
 }
 
@@ -2161,13 +2159,10 @@ void Compiler::error(int offset, String msg) {
     fErrorText += "error: " + (pos.fLine >= 1 ? to_string(pos.fLine) + ": " : "") + msg + "\n";
 }
 
-String Compiler::errorText(bool showCount) {
-    if (showCount) {
-        this->writeErrorCount();
-    }
+String Compiler::errorText() {
+    this->writeErrorCount();
     fErrorCount = 0;
     String result = fErrorText;
-    fErrorText = "";
     return result;
 }
 

src/sksl/SkSLCompiler.h

@@ -46,11 +46,6 @@ class SkSLCompileBench;
 
 namespace SkSL {
 
-namespace dsl {
-    class DSL;
-    class DSLWriter;
-} // namespace dsl
-
 class ByteCode;
 class ExternalValue;
 class IRGenerator;
@@ -184,7 +179,7 @@ class SK_API Compiler : public ErrorReporter {
 
     void error(int offset, String msg) override;
 
-    String errorText(bool showCount = true);
+    String errorText();
 
     void writeErrorCount();
 
@@ -311,8 +306,6 @@ class SK_API Compiler : public ErrorReporter {
 
     friend class AutoSource;
     friend class ::SkSLCompileBench;
-    friend class dsl::DSL;
-    friend class dsl::DSLWriter;
 };
 
 #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU

src/sksl/SkSLDehydrator.cpp

@@ -280,9 +280,6 @@ void Dehydrator::write(const Expression* e) {
                 this->writeU8(b.value());
                 break;
             }
-            case Expression::Kind::kCodeString:
-                SkDEBUGFAIL("shouldn't be able to receive kCodeString here");
-                break;
             case Expression::Kind::kConstructor: {
                 const Constructor& c = e->as<Constructor>();
                 this->writeCommand(Rehydrator::kConstructor_Command);