[Bf-blender-cvs] [58a15b2bfe7] master: Cycles: Fixed compilation of CUDA kernels. Follow-up fix for my last commit.

[Stefan Werner]

Commit: 58a15b2bfe7193b90c333f069f1fb0c3a811e4fe
Author: Stefan Werner
Date:   Tue Nov 21 10:43:40 2017 +0100
Branches: master
https://developer.blender.org/rB58a15b2bfe7193b90c333f069f1fb0c3a811e4fe

Cycles: Fixed compilation of CUDA kernels. Follow-up fix for my last commit.

===================================================================

M	intern/cycles/kernel/kernels/cuda/kernel_config.h

===================================================================

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