diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-30 18:42:48 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-30 18:42:59 +0000 |
| commit | bcf35f86d50b784b165de703b404998dd4299f6a (patch) | |
| tree | 9fcd85326b1a5dbda864da9431a878bb62f65191 /src/gpu/vk/GrVkUtil.cpp | |
| parent | 7833466da45bfa1e078427c4a6db94d41c5c1535 (diff) | |
Revert "skslc can now be compiled with no Skia dependencies, in preparation for"
This reverts commit 7833466da45bfa1e078427c4a6db94d41c5c1535.
Reason for revert: Vulkan assertion failure
Original change's description:
> 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>
>
TBR=egdaniel@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ic64cac2395abb406116885ddd725f74a434c8c49
Reviewed-on: https://skia-review.googlesource.com/10758
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkUtil.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkUtil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/vk/GrVkUtil.cpp b/src/gpu/vk/GrVkUtil.cpp index 1fdf69cdd8..1a73f9a2c0 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; - SkSL::String code; + SkString code; if (!gpu->shaderCompiler()->toSPIRV(*program, &code)) { SkDebugf("%s\n", gpu->shaderCompiler()->errorText().c_str()); return false; |