diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 13:56:23 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 18:49:51 +0000 |
commit | 0df1b04db87c3d86ee0b0bd6aa2cb5b6be32cac2 (patch) | |
tree | 12e72247e1d2f4a66d2045cc6a6a62a3505d82ab /src/sksl/ir/SkSLLayout.h | |
parent | f809fef8280e3d6ad9d95697cd234560b49962ab (diff) |
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 <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLLayout.h')
-rw-r--r-- | src/sksl/ir/SkSLLayout.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h index 5e7ec4486b..3a8416ac4e 100644 --- a/src/sksl/ir/SkSLLayout.h +++ b/src/sksl/ir/SkSLLayout.h @@ -8,7 +8,6 @@ #ifndef SKSL_LAYOUT #define SKSL_LAYOUT -#include "SkString.h" #include "SkSLUtil.h" namespace SkSL { @@ -55,11 +54,11 @@ struct Layout { case Format::kRGBA8I: return "rgba8i"; case Format::kR8I: return "r8i"; } - SkFAIL("Unexpected format"); + ABORT("Unexpected format"); return ""; } - static bool ReadFormat(SkString str, Format* format) { + static bool ReadFormat(String str, Format* format) { if (str == "rgba32f") { *format = Format::kRGBA32F; return true; @@ -125,9 +124,9 @@ struct Layout { , fMaxVertices(-1) , fInvocations(-1) {} - SkString description() const { - SkString result; - SkString separator; + String description() const { + String result; + String separator; if (fLocation >= 0) { result += separator + "location = " + to_string(fLocation); separator = ", "; |