diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 13:56:23 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 18:49:51 +0000 |
commit | 0df1b04db87c3d86ee0b0bd6aa2cb5b6be32cac2 (patch) | |
tree | 12e72247e1d2f4a66d2045cc6a6a62a3505d82ab /src/sksl/SkSLGLSLCodeGenerator.h | |
parent | f809fef8280e3d6ad9d95697cd234560b49962ab (diff) |
skslc can now be compiled with no Skia dependencies, in preparation for its eventual
This reverts commit 9bd301d640ff63c280b202c7dd00bc00a3315ff4.
Bug: skia:
Change-Id: I5ad3f77ef33aa5ce2fd27fe383c9339c571663a1
Reviewed-on: https://skia-review.googlesource.com/10964
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLGLSLCodeGenerator.h')
-rw-r--r-- | src/sksl/SkSLGLSLCodeGenerator.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/sksl/SkSLGLSLCodeGenerator.h b/src/sksl/SkSLGLSLCodeGenerator.h index 907c3053c6..ab88d50881 100644 --- a/src/sksl/SkSLGLSLCodeGenerator.h +++ b/src/sksl/SkSLGLSLCodeGenerator.h @@ -12,7 +12,6 @@ #include <tuple> #include <unordered_map> -#include "SkStream.h" #include "SkSLCodeGenerator.h" #include "ir/SkSLBinaryExpression.h" #include "ir/SkSLBoolLiteral.h" @@ -73,7 +72,7 @@ public: }; GLSLCodeGenerator(const Context* context, const Program* program, ErrorReporter* errors, - SkWStream* out) + OutputStream* out) : INHERITED(program, errors, out) , fContext(*context) {} @@ -86,9 +85,9 @@ private: void writeLine(const char* s); - void write(const SkString& s); + void write(const String& s); - void writeLine(const SkString& s); + void writeLine(const String& s); void writeType(const Type& type); @@ -97,7 +96,7 @@ private: void writeInterfaceBlock(const InterfaceBlock& intf); void writeFunctionStart(const FunctionDeclaration& f); - + void writeFunctionDeclaration(const FunctionDeclaration& f); void writeFunction(const FunctionDefinition& f); @@ -161,8 +160,8 @@ private: void writeReturnStatement(const ReturnStatement& r); const Context& fContext; - SkDynamicMemoryWStream fHeader; - SkString fFunctionHeader; + StringStream fHeader; + String fFunctionHeader; Program::Kind fProgramKind; int fVarCount = 0; int fIndentation = 0; |