commit 5b9c7ba3135f86be2ecf42ce400c9d936a465be7
author Brian Salomon <bsalomon@google.com> Tue Dec 17 15:49:00 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 17 21:23:48 2019 +0000
tree ccb753f90f7ac881a041a563007e818b318ada6b
parent 8ae1b56d77c00c43008e7e3b5c924fabfc09d557

Revert "Revert "Remove most of GrConfig.h""

This reverts commit b0047b57b7fad4b39501db735fb625a9171ad24a.

Change-Id: I0c6df9e9d5c3984987398d2b7f675005828ab3de
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260697
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrSwizzle.cpp

diff --git a/src/gpu/GrSwizzle.cpp b/src/gpu/GrSwizzle.cpp
index b52d207..3bef983 100644
--- a/src/gpu/GrSwizzle.cpp
+++ b/src/gpu/GrSwizzle.cpp
@@ -24,7 +24,7 @@
             pipeline->append(SkRasterPipeline::force_opaque);
             return;
         default: {
-            GR_STATIC_ASSERT(sizeof(uintptr_t) >= 4 * sizeof(char));
+            static_assert(sizeof(uintptr_t) >= 4 * sizeof(char));
             // Rather than allocate the 4 control bytes on the heap somewhere, just jam them right
             // into a uintptr_t context.
             uintptr_t ctx;