From bcf35f86d50b784b165de703b404998dd4299f6a Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 30 Mar 2017 18:42:48 +0000 Subject: 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 > Reviewed-by: Ben Wagner > 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 Commit-Queue: Ethan Nicholas --- fuzz/fuzz.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fuzz/fuzz.cpp') diff --git a/fuzz/fuzz.cpp b/fuzz/fuzz.cpp index 8374f9518b..d156680718 100644 --- a/fuzz/fuzz.cpp +++ b/fuzz/fuzz.cpp @@ -558,7 +558,7 @@ static void fuzz_filter_fuzz(sk_sp bytes) { #if SK_SUPPORT_GPU static void fuzz_sksl2glsl(sk_sp bytes) { SkSL::Compiler compiler; - SkSL::String output; + SkString output; SkSL::Program::Settings settings; sk_sp caps = SkSL::ShaderCapsFactory::Default(); settings.fCaps = caps.get(); -- cgit v1.2.3