diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-10-08 19:29:28 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-10-08 19:29:28 +0400 |
| commit | b5a5773fa98b5ddf18dc68bc77df15cc79211ef5 (patch) | |
| tree | 8fef2a5fb5e6e89ce7d6d966b0e6acd74b3d9f06 /intern/cycles/kernel/CMakeLists.txt | |
| parent | dfe16105041292a1fc7ee29d825c25135a4f6a3c (diff) | |
Cycles / CUDA:
* Remove support for CUDA Toolkit 4.x, only Toolkit 5.0 and above are supported now.
* Remove support for sm_1x cards (< Fermi) for good. We didn't officially support those cards for a few releases already, now remove some special code that was still there.
Diffstat (limited to 'intern/cycles/kernel/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index eaa4e304ebb..56ba0e08743 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -151,36 +151,16 @@ if(WITH_CYCLES_CUDA_BINARIES) set(cuda_version_flags "-D__KERNEL_CUDA_VERSION__=${CUDA_VERSION}") - # build flags depending on CUDA version and arch - if(CUDA_VERSION LESS 50) - # CUDA 4.x - if(${arch} MATCHES "sm_1[0-9]") - # sm_1x - set(cuda_arch_flags "--maxrregcount=24 --opencc-options -OPT:Olimit=0") - elseif(${arch} MATCHES "sm_2[0-9]") - # sm_2x - set(cuda_arch_flags "--maxrregcount=24") - else() - # sm_3x - set(cuda_arch_flags "--maxrregcount=32") - endif() - - set(cuda_math_flags "") - else() - # CUDA 5.x - if(${arch} MATCHES "sm_1[0-9]") - # sm_1x - set(cuda_arch_flags "--maxrregcount=24 --opencc-options -OPT:Olimit=0") - elseif(${arch} MATCHES "sm_2[0-9]") - # sm_2x - set(cuda_arch_flags "--maxrregcount=32") - else() - # sm_3x - set(cuda_arch_flags "--maxrregcount=32") - endif() - - set(cuda_math_flags "--use_fast_math") + # CUDA 5.x build flags for different archs + if(${arch} MATCHES "sm_2[0-9]") + # sm_2x + set(cuda_arch_flags "--maxrregcount=32") + elseif(${arch} MATCHES "sm_3[0-9]") + # sm_3x + set(cuda_arch_flags "--maxrregcount=32") endif() + + set(cuda_math_flags "--use_fast_math") if(CUDA_VERSION LESS 50 AND ${arch} MATCHES "sm_35") message(WARNING "Can't build kernel for CUDA sm_35 architecture, skipping") |