commit 3f1a98b779ace0df57ff31edc0a4a28ddfd4a477
author Greg Daniel <egdaniel@google.com> Tue Dec 17 23:16:42 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 17 23:16:58 2019 +0000
tree 84277582f7d4d5fc3fb94418dd29bc273fb07be1
parent 85a2ec672bad8874c56c83f86b7011bc5afaddf7

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

This reverts commit 5b9c7ba3135f86be2ecf42ce400c9d936a465be7.

Reason for revert: Looks to still be breaking chrome

Original change's description:
> 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>

TBR=bsalomon@google.com

Change-Id: Ia9860b39c562368f8a2f84283c52f55593333075
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260642
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/ccpr/GrVSCoverageProcessor.cpp

diff --git a/src/gpu/ccpr/GrVSCoverageProcessor.cpp b/src/gpu/ccpr/GrVSCoverageProcessor.cpp
index 849f8ba..05819f3 100644
--- a/src/gpu/ccpr/GrVSCoverageProcessor.cpp
+++ b/src/gpu/ccpr/GrVSCoverageProcessor.cpp
@@ -504,16 +504,16 @@
     GrVertexAttribType xyAttribType;
     GrSLType xySLType;
     if (4 == this->numInputPoints() || this->hasInputWeight()) {
-        static_assert(offsetof(QuadPointInstance, fX) == 0);
-        static_assert(sizeof(QuadPointInstance::fX) ==
-                      GrVertexAttribTypeSize(kFloat4_GrVertexAttribType));
-        static_assert(sizeof(QuadPointInstance::fY) ==
-                      GrVertexAttribTypeSize(kFloat4_GrVertexAttribType));
+        GR_STATIC_ASSERT(offsetof(QuadPointInstance, fX) == 0);
+        GR_STATIC_ASSERT(sizeof(QuadPointInstance::fX) ==
+                         GrVertexAttribTypeSize(kFloat4_GrVertexAttribType));
+        GR_STATIC_ASSERT(sizeof(QuadPointInstance::fY) ==
+                         GrVertexAttribTypeSize(kFloat4_GrVertexAttribType));
         xyAttribType = kFloat4_GrVertexAttribType;
         xySLType = kFloat4_GrSLType;
     } else {
-        static_assert(sizeof(TriPointInstance) ==
-                      2 * GrVertexAttribTypeSize(kFloat3_GrVertexAttribType));
+        GR_STATIC_ASSERT(sizeof(TriPointInstance) ==
+                         2 * GrVertexAttribTypeSize(kFloat3_GrVertexAttribType));
         xyAttribType = kFloat3_GrVertexAttribType;
         xySLType = kFloat3_GrSLType;
     }