diff options
author | 2016-11-20 14:53:35 +0000 | |
---|---|---|
committer | 2016-11-20 14:53:48 +0000 | |
commit | 792d0f13d6cb58ddf27b45e6835ba54c1d8ade77 (patch) | |
tree | 929ba3d4638561e480bb070da4d01eec2cce21ab /src/sksl/SkSLGLSLCodeGenerator.h | |
parent | 7a5b48a75b6f5819c196d158eefa70677783554f (diff) |
Revert "switched skslc from std::string to SkString"
This reverts commit d8df21a1e08b5b3380261f4b90acfbdc538ef93c.
Reason for revert: Breaking Roll
Original change's description:
> switched skslc from std::string to SkString
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4977
>
> Change-Id: I15e24963b09b719a2c07da67745114f5ac66cee8
> Reviewed-on: https://skia-review.googlesource.com/4977
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
>
TBR=bsalomon@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I84d5311beb9d5e607b7a4a3c138332f0c8f19648
Reviewed-on: https://skia-review.googlesource.com/5077
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@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 b8cb34e84f..16d6192a71 100644 --- a/src/sksl/SkSLGLSLCodeGenerator.h +++ b/src/sksl/SkSLGLSLCodeGenerator.h @@ -12,7 +12,6 @@ #include <tuple> #include <unordered_map> -#include "SkStream.h" #include "glsl/GrGLSLCaps.h" #include "SkSLCodeGenerator.h" #include "ir/SkSLBinaryExpression.h" @@ -76,7 +75,7 @@ public: : fContext(*context) , fCaps(*caps) {} - void generateCode(const Program& program, SkWStream& out) override; + void generateCode(const Program& program, std::ostream& out) override; private: void write(const char* s); @@ -85,9 +84,9 @@ private: void writeLine(const char* s); - void write(const SkString& s); + void write(const std::string& s); - void writeLine(const SkString& s); + void writeLine(const std::string& s); void writeType(const Type& type); @@ -157,9 +156,9 @@ private: const Context& fContext; const GrGLSLCaps& fCaps; - SkWStream* fOut = nullptr; - SkDynamicMemoryWStream fHeader; - SkString fFunctionHeader; + std::ostream* fOut = nullptr; + std::stringstream fHeader; + std::string fFunctionHeader; Program::Kind fProgramKind; int fVarCount = 0; int fIndentation = 0; |