diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-08-07 15:51:05 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-08-07 15:52:15 +0400 |
| commit | e3ed13cbd47098ccc1815ed0c010e814a5e18bcc (patch) | |
| tree | abc0f622eb836cc0f00d5659ef7e7566f976da0a /intern | |
| parent | f82dda557ca062ac7f6641d8379ca9b699ce875c (diff) | |
Cleanup: Remove special code for Visual Studio 2008.
Goodbye VC2008, it has been a pleasure (more or less) :D SCons / CMake cleaenup will follow.
Differential Revision: https://developer.blender.org/D715
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_math.h | 11 | ||||
| -rw-r--r-- | intern/cycles/util/util_optimization.h | 7 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/tnt/tnt_math_utils.h | 4 |
4 files changed, 1 insertions, 23 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 5ea82c65a92..4ccb5f3e51c 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -76,17 +76,6 @@ CCL_NAMESPACE_BEGIN #ifdef _WIN32 -#ifndef __KERNEL_GPU__ - -#if defined(_MSC_VER) && (_MSC_VER < 1800) -# define copysignf(x, y) ((float)_copysign(x, y)) -# define hypotf(x, y) _hypotf(x, y) -# define isnan(x) _isnan(x) -# define isfinite(x) _finite(x) -#endif - -#endif - #ifndef __KERNEL_OPENCL__ ccl_device_inline float fmaxf(float a, float b) diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/util_optimization.h index 5d0fea34761..2feb3d6ab7e 100644 --- a/intern/cycles/util/util_optimization.h +++ b/intern/cycles/util/util_optimization.h @@ -69,13 +69,6 @@ #define WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 #endif -/* MSVC 2008, no SSE41 (broken blendv intrinsic) and no AVX support */ -#if defined(_MSC_VER) && (_MSC_VER < 1700) -#undef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 -#undef WITH_CYCLES_OPTIMIZED_KERNEL_AVX -#undef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 -#endif - #endif /* SSE Experiment diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index a9fa7fe747c..8e7e824186c 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -183,7 +183,7 @@ GHOST_WindowWin32::GHOST_WindowWin32( MONITORINFO monitor; GHOST_TUns32 tw, th; -#if !defined(_MSC_VER) || _MSC_VER < 1700 +#ifndef _MSC_VER int cxsizeframe = GetSystemMetrics(SM_CXSIZEFRAME); int cysizeframe = GetSystemMetrics(SM_CYSIZEFRAME); #else diff --git a/intern/smoke/intern/tnt/tnt_math_utils.h b/intern/smoke/intern/tnt/tnt_math_utils.h index 9226bc4e753..9f6bd10e23f 100644 --- a/intern/smoke/intern/tnt/tnt_math_utils.h +++ b/intern/smoke/intern/tnt/tnt_math_utils.h @@ -7,10 +7,6 @@ /* needed for fabs, sqrt() below */ #include <cmath> -#if defined(_MSC_VER) && (_MSC_VER < 1800) -#define hypot _hypot -#endif - namespace TNT { /** |