From 0df1b04db87c3d86ee0b0bd6aa2cb5b6be32cac2 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Fri, 31 Mar 2017 13:56:23 -0400 Subject: skslc can now be compiled with no Skia dependencies, in preparation for its eventual This reverts commit 9bd301d640ff63c280b202c7dd00bc00a3315ff4. Bug: skia: Change-Id: I5ad3f77ef33aa5ce2fd27fe383c9339c571663a1 Reviewed-on: https://skia-review.googlesource.com/10964 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- src/gpu/gl/builders/GrGLShaderStringBuilder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/gl/builders') 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 program; -- cgit v1.2.3