diff options
| -rw-r--r-- | SConstruct | 3 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 2 | ||||
| -rw-r--r-- | intern/cycles/SConscript | 9 | ||||
| -rw-r--r-- | intern/cycles/device/CMakeLists.txt | 4 |
4 files changed, 3 insertions, 15 deletions
diff --git a/SConstruct b/SConstruct index c4bffab661e..d0af4245a56 100644 --- a/SConstruct +++ b/SConstruct @@ -430,9 +430,6 @@ if env['OURPLATFORM']=='darwin': else: env['WITH_BF_OPENMP'] = 0 print B.bc.OKGREEN + "Disabled OpenMP, not supported by compiler" - - if env['WITH_BF_CYCLES'] and env['WITH_CYCLES_OPTIMIZED_KERNEL_SSE41']: - print B.bc.OKGREEN + 'Using Cycles SSE 4.1 option' if env['WITH_BF_CYCLES_OSL'] == 1: OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 47434e68d0d..9ab5fce0dbd 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -161,7 +161,6 @@ def validate_arguments(args, bc): 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC', 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES', 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE', 'BF_CYCLES_CUDA_ENV', - 'WITH_CYCLES_OPTIMIZED_KERNEL_SSE41', 'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH', 'WITH_BF_OCIO', 'WITH_BF_STATICOCIO', 'BF_OCIO', 'BF_OCIO_INC', 'BF_OCIO_LIB', 'BF_OCIO_LIB_STATIC', 'BF_OCIO_LIBPATH', 'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_INTERNATIONAL', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH', @@ -573,7 +572,6 @@ def read_opts(env, cfg, args): ('BF_CYCLES_CUDA_NVCC', 'CUDA nvcc compiler path', ''), ('BF_CYCLES_CUDA_ENV', 'preset environement nvcc will execute in', ''), ('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []), - (BoolVariable('WITH_CYCLES_OPTIMIZED_KERNEL_SSE41', 'Enable building of an extra SSE4.1 kernel', False)), (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)), (BoolVariable('WITH_BF_STATICOIIO', 'Statically link to OpenImageIO', False)), diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index e31fb5bed96..b1dfeee1560 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -93,14 +93,11 @@ else: sse3_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse'.split()) sse41_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mfpmath=sse'.split()) -defs.append('WITH_OPTIMIZED_KERNEL') optim_defs = defs[:] -if env['WITH_CYCLES_OPTIMIZED_KERNEL_SSE41']: - cycles_sse41 = cycles.Clone() - sse41_sources = [path.join('kernel', 'kernel_sse41.cpp')] - cycles_sse41.BlenderLib('bf_intern_cycles_sse41', sse41_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=sse41_cxxflags) - defs.append('WITH_CYCLES_OPTIMIZED_KERNEL_SSE41') +cycles_sse41 = cycles.Clone() +sse41_sources = [path.join('kernel', 'kernel_sse41.cpp')] +cycles_sse41.BlenderLib('bf_intern_cycles_sse41', sse41_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=sse41_cxxflags) cycles_sse3 = cycles.Clone() sse3_sources = [path.join('kernel', 'kernel_sse3.cpp')] diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 825e82209aa..ae3309df3d9 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -13,10 +13,6 @@ set(INC_SYS ${GLEW_INCLUDE_PATH} ) -if(WITH_CYCLES_OPTIMIZED_KERNEL_SSE41) - add_definitions(-DWITH_CYCLES_OPTIMIZED_KERNEL_SSE41=1) -endif() - set(SRC device.cpp device_cpu.cpp |