| commit | b0047b57b7fad4b39501db735fb625a9171ad24a | [log] [tgz] |
|---|---|---|
| author | Brian Salomon <bsalomon@google.com> | Thu Dec 05 19:52:25 2019 +0000 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Thu Dec 05 19:52:48 2019 +0000 |
| tree | 44bfada223c8db2f9abc5b0ffe230172ddc77df9 | |
| parent | 76c5192db7fdcc49886fae5fcc6e890bae24c95e [diff] [blame] |
Revert "Remove most of GrConfig.h" This reverts commit 80e334dad832d1f29dfa361f1fbc113378466634. Reason for revert: Chrome is including our private headers which means this breaks the Chrome roll: https://chromium-review.googlesource.com/c/chromium/src/+/1953757 Original change's description: > Remove most of GrConfig.h > > Change-Id: I0f693bed0778151f93d07cd42c6b597566695ab1 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/257999 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: Ie206db9865a7f9a7e334eb248de8cff38dd31d15 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/258356 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrDistanceFieldGenFromVector.cpp b/src/gpu/GrDistanceFieldGenFromVector.cpp index 003e203..11e375c 100644 --- a/src/gpu/GrDistanceFieldGenFromVector.cpp +++ b/src/gpu/GrDistanceFieldGenFromVector.cpp
@@ -230,12 +230,12 @@ void init(); int countPoints() { - static_assert(0 == kLine && 1 == kQuad); + GR_STATIC_ASSERT(0 == kLine && 1 == kQuad); return fType + 2; } const SkPoint& endPt() const { - static_assert(0 == kLine && 1 == kQuad); + GR_STATIC_ASSERT(0 == kLine && 1 == kQuad); return fPts[fType + 1]; } };