diff options
| author |  Brian Osman <brianosman@google.com> | 2017-08-14 14:48:10 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-14 21:24:55 +0000 |
| commit | 93ba0a4fc85f04bc1be9429983df1e57473b49a7 (patch) | |
| tree | 29b75949fdb9d449b28c000ff5f1e18eec19c42f /src/gpu/gl/builders | |
| parent | ba8275148ab8b10393b053e2586b852796c4afc2 (diff) | |
Switch SkSL to std::string
On desktop, this saves just over 5% of the time in the SkSL compiler.
As written, the code will now build either way, so it's much easier to
switch back (or even have some platforms use SkString, if that's ever
required).
Bug: skia:
Change-Id: I634f26a4f6fcb404e59bda6a5c6a21a9c6d73c0b
Reviewed-on: https://skia-review.googlesource.com/34381
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/gl/builders')
| -rw-r--r-- | src/gpu/gl/builders/GrGLShaderStringBuilder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp index 3273218b5f..f7eae42ca0 100644 --- a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp +++ b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp @@ -37,10 +37,10 @@ static void print_shaders_line_by_line(const char** skslStrings, int* lengths, std::function<void(const char*)> println = [](const char* ln) { SkDebugf("%s\n", ln); }) { - SkString sksl = GrSKSLPrettyPrint::PrettyPrint(skslStrings, lengths, count, false); + SkSL::String sksl = GrSKSLPrettyPrint::PrettyPrint(skslStrings, lengths, count, false); println("SKSL:"); print_source_lines_with_numbers(sksl.c_str(), println); - if (!glsl.isEmpty()) { + if (0 != glsl.size()) { println("GLSL:"); print_source_lines_with_numbers(glsl.c_str(), println); } @@ -50,7 +50,7 @@ std::unique_ptr<SkSL::Program> translate_to_glsl(const GrGLContext& context, GrG const char** skslStrings, int* lengths, int count, const SkSL::Program::Settings& settings, SkSL::String* glsl) { - SkString sksl; + SkSL::String sksl; #ifdef SK_DEBUG sksl = GrSKSLPrettyPrint::PrettyPrint(skslStrings, lengths, count, false); #else |