aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2017-03-30 13:45:54 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-30 18:28:47 +0000
commit7833466da45bfa1e078427c4a6db94d41c5c1535 (patch)
treed3bb49ba327f0bc3cb5cafe52d992702828031b2 /bench
parentcdc651d29d88e87ef84d5a586879db2c16ff4579 (diff)
skslc can now be compiled with no Skia dependencies, in preparation for
its eventual role in Skia's build process. Bug: skia: Change-Id: Iaa9933f4fc4a64bec60aa897c509a3513f457a78 Reviewed-on: https://skia-review.googlesource.com/10282 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'bench')
-rw-r--r--bench/GLBench.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/bench/GLBench.cpp b/bench/GLBench.cpp
index 0fcd56f2a9..f043c952f6 100644
--- a/bench/GLBench.cpp
+++ b/bench/GLBench.cpp
@@ -67,7 +67,7 @@ void GLBench::onDraw(int loops, SkCanvas* canvas) {
GrGLuint GLBench::CompileShader(const GrGLContext* context, const char* sksl, GrGLenum type) {
const GrGLInterface* gl = context->interface();
- SkString glsl;
+ SkSL::String glsl;
SkSL::Program::Settings settings;
settings.fCaps = context->caps()->shaderCaps();
std::unique_ptr<SkSL::Program> program = context->compiler()->convertProgram(