diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-30 13:45:54 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-30 18:28:47 +0000 |
| commit | 7833466da45bfa1e078427c4a6db94d41c5c1535 (patch) | |
| tree | d3bb49ba327f0bc3cb5cafe52d992702828031b2 /src/sksl/ir/SkSLLayout.h | |
| parent | cdc651d29d88e87ef84d5a586879db2c16ff4579 (diff) | |
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>
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 = ", "; |