diff options
Diffstat (limited to 'src/sksl/ir/SkSLLayout.h')
-rw-r--r-- | src/sksl/ir/SkSLLayout.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h index 3a8416ac4e..5e7ec4486b 100644 --- a/src/sksl/ir/SkSLLayout.h +++ b/src/sksl/ir/SkSLLayout.h @@ -8,6 +8,7 @@ #ifndef SKSL_LAYOUT #define SKSL_LAYOUT +#include "SkString.h" #include "SkSLUtil.h" namespace SkSL { @@ -54,11 +55,11 @@ struct Layout { case Format::kRGBA8I: return "rgba8i"; case Format::kR8I: return "r8i"; } - ABORT("Unexpected format"); + SkFAIL("Unexpected format"); return ""; } - static bool ReadFormat(String str, Format* format) { + static bool ReadFormat(SkString str, Format* format) { if (str == "rgba32f") { *format = Format::kRGBA32F; return true; @@ -124,9 +125,9 @@ struct Layout { , fMaxVertices(-1) , fInvocations(-1) {} - String description() const { - String result; - String separator; + SkString description() const { + SkString result; + SkString separator; if (fLocation >= 0) { result += separator + "location = " + to_string(fLocation); separator = ", "; |