diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-30 13:45:54 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-30 18:28:47 +0000 |
| commit | 7833466da45bfa1e078427c4a6db94d41c5c1535 (patch) | |
| tree | d3bb49ba327f0bc3cb5cafe52d992702828031b2 /src/gpu/gl/builders | |
| parent | cdc651d29d88e87ef84d5a586879db2c16ff4579 (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 'src/gpu/gl/builders')
| -rw-r--r-- | src/gpu/gl/builders/GrGLShaderStringBuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp index 46530f2e30..e3d2defdef 100644 --- a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp +++ b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp @@ -48,7 +48,7 @@ GrGLuint GrGLCompileAndAttachShader(const GrGLContext& glCtx, } #endif - SkString glsl; + SkSL::String glsl; if (type == GR_GL_VERTEX_SHADER || type == GR_GL_FRAGMENT_SHADER) { SkSL::Compiler& compiler = *glCtx.compiler(); std::unique_ptr<SkSL::Program> program; |