diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2017-11-21 12:43:40 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2017-11-21 12:43:40 +0300 |
| commit | 58a15b2bfe7193b90c333f069f1fb0c3a811e4fe (patch) | |
| tree | d8933eecc5d5f2dc90e77c0e0ec72e14ffc11e85 | |
| parent | d8f80fbe726dd4d389817a22eea98cbd442f8f38 (diff) | |
Cycles: Fixed compilation of CUDA kernels. Follow-up fix for my last commit.
| -rw-r--r-- | intern/cycles/kernel/kernels/cuda/kernel_config.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernels/cuda/kernel_config.h b/intern/cycles/kernel/kernels/cuda/kernel_config.h index d0e536f1b87..94f59ff38d9 100644 --- a/intern/cycles/kernel/kernels/cuda/kernel_config.h +++ b/intern/cycles/kernel/kernels/cuda/kernel_config.h @@ -73,13 +73,14 @@ /* tunable parameters */ # define CUDA_THREADS_BLOCK_WIDTH 16 -# define CUDA_KERNEL_MAX_REGISTERS 48 -# define CUDA_KERNEL_BRANCHED_MAX_REGISTERS 63 - /* CUDA 9.0 seems to cause slowdowns on high-end Pascal cards unless we increase the number of registers */ # if __CUDACC_VER_MAJOR__ == 9 && __CUDA_ARCH__ >= 600 -# #define CUDA_KERNEL_MAX_REGISTERS 64 +# define CUDA_KERNEL_MAX_REGISTERS 64 +# else +# define CUDA_KERNEL_MAX_REGISTERS 48 # endif +# define CUDA_KERNEL_BRANCHED_MAX_REGISTERS 63 + /* unknown architecture */ #else |