| commit | 4dea72a987611181265ce1350ff690c141c51b99 | [log] [tgz] |
|---|---|---|
| author | Brian Salomon <bsalomon@google.com> | Wed Dec 18 10:43:10 2019 -0500 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Wed Dec 18 17:14:45 2019 +0000 |
| tree | fc11749d797b1f17add61242ee7f2e108ff7487c | |
| parent | ee94693c7ab124bf40bb72a8c28873c566b3b881 [diff] [blame] |
Reland x3 "Remove most of GrConfig.h" This change makes this safe for Chrome: https://skia-review.googlesource.com/c/skia/+/260779 This reverts commit 3f1a98b779ace0df57ff31edc0a4a28ddfd4a477. Change-Id: Ic6886ceabbf626040fc527ea10fe06cbe74a3854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260783 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrProgramDesc.h b/src/gpu/GrProgramDesc.h index c0cfaa8..07b0110 100644 --- a/src/gpu/GrProgramDesc.h +++ b/src/gpu/GrProgramDesc.h
@@ -113,7 +113,7 @@ // portions added by the platform-specific backends. uint32_t fInitialKeyLength : 27; }; - GR_STATIC_ASSERT(sizeof(KeyHeader) == 8); + static_assert(sizeof(KeyHeader) == 8); const KeyHeader& header() const { return *this->atOffset<KeyHeader, kHeaderOffset>(); }