diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 09:33:41 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 15:25:32 +0000 |
| commit | f3333c89bf05fc602d9bf8e1e24547668c660383 (patch) | |
| tree | 3c0855ef8829201299ce757ecaf28bfda50a2683 /src/gpu | |
| parent | 66b09abdb184d843ece45a1d343fbe632075b323 (diff) | |
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>
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/gl/builders/GrGLShaderStringBuilder.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkUtil.cpp | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/src/gpu/vk/GrVkUtil.cpp b/src/gpu/vk/GrVkUtil.cpp index 1a73f9a2c0..1fdf69cdd8 100644 --- a/src/gpu/vk/GrVkUtil.cpp +++ b/src/gpu/vk/GrVkUtil.cpp @@ -283,7 +283,7 @@ bool GrCompileVkShaderModule(const GrVkGpu* gpu, SkASSERT(false); } *outInputs = program->fInputs; - SkString code; + SkSL::String code; if (!gpu->shaderCompiler()->toSPIRV(*program, &code)) { SkDebugf("%s\n", gpu->shaderCompiler()->errorText().c_str()); return false; |