diff options
| author |  Stephen White <senorblanco@chromium.org> | 2018-05-26 17:02:56 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-26 17:49:13 +0000 |
| commit | 024317f75bc359ff810b3a48fe9ffe98fb896018 (patch) | |
| tree | dd6ac6be38d7ccda6028c2f74b455683bc9c2373 | |
| parent | 6b6c47c063ab7e4085b931b17a885cf3ca6d37d3 (diff) | |
Revert "Workaround constexpr bug in MSVC 2015 in GrTextureOp"
This reverts commit 9eff78e2623d600282ca63c2e9988e0ffbba2949.
Reason for revert: Possibly blocking Chromium roll (layout tests)
Original change's description:
> Workaround constexpr bug in MSVC 2015 in GrTextureOp
>
> Change-Id: I441858aab5fcd63e5467625a23681c5bcd35f25b
> Reviewed-on: https://skia-review.googlesource.com/130122
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,brianosman@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I4cf8f2b86cc601cf649e23e3889150419a834cb1
Reviewed-on: https://skia-review.googlesource.com/130303
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Stephen White <senorblanco@chromium.org>
| -rw-r--r-- | src/gpu/ops/GrTextureOp.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp index 4d0c41d127..933a17393e 100644 --- a/src/gpu/ops/GrTextureOp.cpp +++ b/src/gpu/ops/GrTextureOp.cpp @@ -790,14 +790,9 @@ __attribute__((no_sanitize("float-cast-overflow"))) 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>, @@ -815,7 +810,6 @@ __attribute__((no_sanitize("float-cast-overflow"))) &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; |