diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 13:56:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 15:41:42 +0300 |
| commit | 9781139590dbbeb6d246d4fbafa8ab1a4696c7fb (patch) | |
| tree | 9275a763d008ecbe1d11249371897c6ec99a46d7 /intern/cycles/kernel/kernel_types.h | |
| parent | b6da2a6a86fb948f11f9147c5ed722a064673e6d (diff) | |
Cycles: Solve speed regression of classroom scene after principled commit
This way we can skip it from compiling into OpenCL kernels by making
this shader compile-time feature.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 9d5cad3f3e1..a744c1d8277 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -78,6 +78,7 @@ CCL_NAMESPACE_BEGIN # define __OSL__ # endif # define __SUBSURFACE__ +# define __PRINCIPLED__ # define __CMJ__ # define __VOLUME__ # define __VOLUME_SCATTER__ @@ -94,6 +95,7 @@ CCL_NAMESPACE_BEGIN # define __VOLUME__ # define __VOLUME_SCATTER__ # define __SUBSURFACE__ +# define __PRINCIPLED__ # define __SHADOW_RECORD_ALL__ # ifndef __SPLIT_KERNEL__ # define __BRANCHED_PATH__ @@ -109,6 +111,7 @@ CCL_NAMESPACE_BEGIN # define __KERNEL_SHADING__ # define __KERNEL_ADV_SHADING__ # define __SUBSURFACE__ +# define __PRINCIPLED__ # define __VOLUME__ # define __VOLUME_SCATTER__ # define __SHADOW_RECORD_ALL__ @@ -134,6 +137,7 @@ CCL_NAMESPACE_BEGIN # define __KERNEL_SHADING__ # define __KERNEL_ADV_SHADING__ # define __SUBSURFACE__ +# define __PRINCIPLED__ # define __VOLUME__ # define __VOLUME_SCATTER__ # define __SHADOW_RECORD_ALL__ @@ -222,6 +226,9 @@ CCL_NAMESPACE_BEGIN #ifdef __NO_SHADOW_TRICKS__ # undef __SHADOW_TRICKS__ #endif +#ifdef __NO_PRINCIPLED__ +# undef __PRINCIPLED__ +#endif /* Random Numbers */ |