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/glsl/GrGLSLFragmentShaderBuilder.cpp

diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
index 5976330..0d9e467 100644
--- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
@@ -38,32 +38,32 @@
     };
     return kLayoutQualifierNames[equation - kFirstAdvancedGrBlendEquation];
 
-    GR_STATIC_ASSERT(0 == kScreen_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(1 == kOverlay_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(2 == kDarken_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(3 == kLighten_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(4 == kColorDodge_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(5 == kColorBurn_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(6 == kHardLight_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(7 == kSoftLight_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(8 == kDifference_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(9 == kExclusion_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(10 == kMultiply_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(11 == kHSLHue_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(12 == kHSLSaturation_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(13 == kHSLColor_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    GR_STATIC_ASSERT(14 == kHSLLuminosity_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(0 == kScreen_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(1 == kOverlay_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(2 == kDarken_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(3 == kLighten_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(4 == kColorDodge_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(5 == kColorBurn_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(6 == kHardLight_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(7 == kSoftLight_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(8 == kDifference_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(9 == kExclusion_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(10 == kMultiply_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(11 == kHSLHue_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(12 == kHSLSaturation_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(13 == kHSLColor_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    static_assert(14 == kHSLLuminosity_GrBlendEquation - kFirstAdvancedGrBlendEquation);
     // There's an illegal GrBlendEquation at the end there, hence the -1.
-    GR_STATIC_ASSERT(SK_ARRAY_COUNT(kLayoutQualifierNames) ==
-                     kGrBlendEquationCnt - kFirstAdvancedGrBlendEquation - 1);
+    static_assert(SK_ARRAY_COUNT(kLayoutQualifierNames) ==
+                  kGrBlendEquationCnt - kFirstAdvancedGrBlendEquation - 1);
 }
 
 uint8_t GrGLSLFragmentShaderBuilder::KeyForSurfaceOrigin(GrSurfaceOrigin origin) {
     SkASSERT(kTopLeft_GrSurfaceOrigin == origin || kBottomLeft_GrSurfaceOrigin == origin);
     return origin + 1;
 
-    GR_STATIC_ASSERT(0 == kTopLeft_GrSurfaceOrigin);
-    GR_STATIC_ASSERT(1 == kBottomLeft_GrSurfaceOrigin);
+    static_assert(0 == kTopLeft_GrSurfaceOrigin);
+    static_assert(1 == kBottomLeft_GrSurfaceOrigin);
 }
 
 GrGLSLFragmentShaderBuilder::GrGLSLFragmentShaderBuilder(GrGLSLProgramBuilder* program)