diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 16:04:34 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 16:04:41 +0000 |
| commit | 9bd301d640ff63c280b202c7dd00bc00a3315ff4 (patch) | |
| tree | 176fcfe46fb17a8c50c145196705f4ef42a950fa /bench | |
| parent | 92d7ccafdf896cf19764e025873d13315a76842d (diff) | |
Revert "skslc can now be compiled with no Skia dependencies, in preparation for its eventual"
This reverts commit f3333c89bf05fc602d9bf8e1e24547668c660383.
Reason for revert: breaking the bots
Original change's description:
> skslc can now be compiled with no Skia dependencies, in preparation for its eventual
> role in Skia's build process.
>
> This reverts commit bcf35f86d50b784b165de703b404998dd4299f6a.
>
> BUG=skia:
>
> Change-Id: Id0a12dfc4d804d69a3c6bf60fed37e89ee130f02
> Reviewed-on: https://skia-review.googlesource.com/10802
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
>
TBR=benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ic7b50d391d25b3870acffa9764cbafc7f5c3be89
Reviewed-on: https://skia-review.googlesource.com/10962
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/GLBench.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bench/GLBench.cpp b/bench/GLBench.cpp index f043c952f6..0fcd56f2a9 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(); - SkSL::String glsl; + SkString glsl; SkSL::Program::Settings settings; settings.fCaps = context->caps()->shaderCaps(); std::unique_ptr<SkSL::Program> program = context->compiler()->convertProgram( |