diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2016-11-21 10:39:35 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-21 17:14:43 +0000 |
| commit | 9e1138d56665d13641f8805cd72ae81adc255f79 (patch) | |
| tree | 1c94ded7cff10f5f62233d1de83c3d30ad0a2893 /bench/GLBench.cpp | |
| parent | e54d4cefb7864a575c01894b2e5e0df16978c6e6 (diff) | |
re-land of switched skslc from std::string to SkString
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5084
Change-Id: Ib21c30afc0d8483392b417e660b7fecfcc30e617
Reviewed-on: https://skia-review.googlesource.com/5084
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'bench/GLBench.cpp')
| -rw-r--r-- | bench/GLBench.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bench/GLBench.cpp b/bench/GLBench.cpp index df9ee9bb0d..a39edeee7f 100644 --- a/bench/GLBench.cpp +++ b/bench/GLBench.cpp @@ -14,7 +14,6 @@ #include "gl/builders/GrGLShaderStringBuilder.h" #include "SkSLCompiler.h" #include <stdio.h> -#include <string> const GrGLContext* GLBench::getGLContext(SkCanvas* canvas) { // This bench exclusively tests GL calls directly @@ -66,11 +65,11 @@ void GLBench::onDraw(int loops, SkCanvas* canvas) { GrGLuint GLBench::CompileShader(const GrGLContext* context, const char* sksl, GrGLenum type) { const GrGLInterface* gl = context->interface(); - std::string glsl; + SkString glsl; bool result = context->compiler()->toGLSL(type == GR_GL_VERTEX_SHADER ? SkSL::Program::kVertex_Kind : SkSL::Program::kFragment_Kind, - std::string(sksl), + SkString(sksl), *context->caps()->glslCaps(), &glsl); if (!result) { |