diff options
| author |  bungeman <bungeman@google.com> | 2016-03-10 11:14:40 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-10 11:14:40 -0800 |
| commit | d7dc76f7e99309cbd09a5420c22e55b951067deb (patch) | |
| tree | ca291b2cdfd909c38bdc9befe017e959ec0cef2b /src/effects | |
| parent | cf371bb41b4a0591347a076ce7d83336d4bbc6fb (diff) | |
Remove version checks for _MSC_VER < 1800 (msvs2013).
We already actively do not support older versions of the vc++
compiler and runtime, so don't check for them anymore.
TBR=reed
No API changes.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1777213003
Review URL: https://codereview.chromium.org/1777213003
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/gradients/SkGradientShaderPriv.h | 10 | ||||
| -rw-r--r-- | src/effects/gradients/SkLinearGradient.cpp | 10 |
2 files changed, 0 insertions, 20 deletions
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 5b1b09b9fc..1a6d391de3 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -51,21 +51,11 @@ static inline SkFixed repeat_tileproc(SkFixed x) { // Mirror -// Visual Studio 2010 (MSC_VER=1600) optimizes bit-shift code incorrectly. -// See http://code.google.com/p/skia/issues/detail?id=472 -#if defined(_MSC_VER) && (_MSC_VER >= 1600) -#pragma optimize("", off) -#endif - static inline SkFixed mirror_tileproc(SkFixed x) { int s = SkLeftShift(x, 15) >> 31; return (x ^ s) & 0xFFFF; } -#if defined(_MSC_VER) && (_MSC_VER >= 1600) -#pragma optimize("", on) -#endif - /////////////////////////////////////////////////////////////////////////////// typedef SkFixed (*TileProc)(SkFixed); diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 8ad120991d..0a2b1581d5 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -17,12 +17,6 @@ static inline int repeat_8bits(int x) { return x & 0xFF; } -// Visual Studio 2010 (MSC_VER=1600) optimizes bit-shift code incorrectly. -// See http://code.google.com/p/skia/issues/detail?id=472 -#if defined(_MSC_VER) && (_MSC_VER >= 1600) -#pragma optimize("", off) -#endif - static inline int mirror_8bits(int x) { if (x & 256) { x = ~x; @@ -30,10 +24,6 @@ static inline int mirror_8bits(int x) { return x & 255; } -#if defined(_MSC_VER) && (_MSC_VER >= 1600) -#pragma optimize("", on) -#endif - static SkMatrix pts_to_unit_matrix(const SkPoint pts[2]) { SkVector vec = pts[1] - pts[0]; SkScalar mag = vec.length(); |