commit fff19667cc5c0157335144bee69418d56a4fad4b
author Brian Salomon <bsalomon@google.com> Fri Jun 08 12:22:10 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 08 16:47:03 2018 +0000
tree 2aa40a4065eec24b9f17eb410a8a467ef5613a52
parent 9149954e3aa2942e589ba7f9328131382785aee9

Revert "Reland "Workaround constexpr bug in MSVC 2015 in GrTextureOp""

This reverts commit 16b1eab9bab992785a9c8dd780b42e6ed76a5dc0.

TBR=brianosman@google.com

Change-Id: Ide5128f2d518d9f588c71c3b83cdf051416e71c1
Reviewed-on: https://skia-review.googlesource.com/133420
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/ops/GrTextureOp.cpp

diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 950fe6e..e76f5bc 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -793,14 +793,9 @@
             ih[t] = 1.f / texture->height();
         }
 
-#if defined(_MSC_VER) && _MSC_VER <= 1910
-#   define MAYBE_CONSTEXPR const
-#else
-#   define MAYBE_CONSTEXPR constexpr
-#endif
         using TessFn =
                 decltype(&TextureOp::tess<SkPoint, MultiTexture::kNo, Domain::kNo, GrAA::kNo>);
-        static MAYBE_CONSTEXPR TessFn kTessFns[] = {
+        static constexpr TessFn kTessFns[] = {
                 &TextureOp::tess<SkPoint,  MultiTexture::kNo,  Domain::kNo,  GrAA::kNo>,
                 &TextureOp::tess<SkPoint,  MultiTexture::kNo,  Domain::kNo,  GrAA::kYes>,
                 &TextureOp::tess<SkPoint,  MultiTexture::kNo,  Domain::kYes, GrAA::kNo>,
@@ -818,7 +813,6 @@
                 &TextureOp::tess<SkPoint3, MultiTexture::kYes, Domain::kYes, GrAA::kNo>,
                 &TextureOp::tess<SkPoint3, MultiTexture::kYes, Domain::kYes, GrAA::kYes>,
         };
-#undef MAYBE_CONSTEXPR
         int tessFnIdx = 0;
         tessFnIdx |= coverageAA      ? 0x1 : 0x0;
         tessFnIdx |= fDomain         ? 0x2 : 0x0;