AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 16b1eab9ba.

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>
This commit is contained in:
Brian Salomon 2018-06-08 12:22:10 -04:00 committed by Skia Commit-Bot
parent 9149954e3a
commit fff19667cc
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gpu/ops/GrTextureOp.cpp
View File

@ -793,14 +793,9 @@ __attribute__((no_sanitize("float-cast-overflow")))
ih[t] = 1.f / texture->height(); 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 = using TessFn =
decltype(&TextureOp::tess<SkPoint, MultiTexture::kNo, Domain::kNo, GrAA::kNo>); 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::kNo>,
&TextureOp::tess<SkPoint, MultiTexture::kNo, Domain::kNo, GrAA::kYes>, &TextureOp::tess<SkPoint, MultiTexture::kNo, Domain::kNo, GrAA::kYes>,
&TextureOp::tess<SkPoint, MultiTexture::kNo, Domain::kYes, GrAA::kNo>, &TextureOp::tess<SkPoint, MultiTexture::kNo, Domain::kYes, GrAA::kNo>,
@ -818,7 +813,6 @@ __attribute__((no_sanitize("float-cast-overflow")))
&TextureOp::tess<SkPoint3, MultiTexture::kYes, Domain::kYes, GrAA::kNo>, &TextureOp::tess<SkPoint3, MultiTexture::kYes, Domain::kYes, GrAA::kNo>,
&TextureOp::tess<SkPoint3, MultiTexture::kYes, Domain::kYes, GrAA::kYes>, &TextureOp::tess<SkPoint3, MultiTexture::kYes, Domain::kYes, GrAA::kYes>,
}; };
#undef MAYBE_CONSTEXPR
int tessFnIdx = 0; int tessFnIdx = 0;
tessFnIdx |= coverageAA ? 0x1 : 0x0; tessFnIdx |= coverageAA ? 0x1 : 0x0;
tessFnIdx |= fDomain ? 0x2 : 0x0; tessFnIdx |= fDomain ? 0x2 : 0x0;