diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-16 18:06:36 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-17 03:58:39 +0300 |
| commit | e17f7af0ce7e045e287b517f775a282a7d7cc8c1 (patch) | |
| tree | 5121b3a34def4df833ccc0830b644cb0225cb8f5 /intern/cycles/kernel/kernel_types.h | |
| parent | 52a7636c2921c8a165a783c00821692b0c84fd46 (diff) | |
Cleanup: remove Cycles advanced shading features toggle.
It's effectively always enabled, only not on some unsupported OpenCL devices.
For testing those it's not useful to disable these features. This is replaced
by the more fine grained feature toggles that we have now.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 281d9a25047..e0bf9b054ac 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -90,7 +90,6 @@ CCL_NAMESPACE_BEGIN # define __QBVH__ # endif # define __KERNEL_SHADING__ -# define __KERNEL_ADV_SHADING__ # define __BRANCHED_PATH__ # ifdef WITH_OSL # define __OSL__ @@ -107,7 +106,6 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_CUDA__ # define __KERNEL_SHADING__ -# define __KERNEL_ADV_SHADING__ # define __VOLUME__ # define __VOLUME_SCATTER__ # define __SUBSURFACE__ @@ -132,50 +130,26 @@ CCL_NAMESPACE_BEGIN # define __HAIR__ # else -/* keep __KERNEL_ADV_SHADING__ in sync with opencl_kernel_use_advanced_shading! */ +# define __KERNEL_SHADING__ +# define __PRINCIPLED__ +# define __CMJ__ # ifdef __KERNEL_OPENCL_NVIDIA__ -# define __KERNEL_SHADING__ -# define __KERNEL_ADV_SHADING__ # define __SUBSURFACE__ -# define __PRINCIPLED__ # define __VOLUME__ # define __VOLUME_SCATTER__ # define __SHADOW_RECORD_ALL__ -# define __CMJ__ # define __BRANCHED_PATH__ # endif /* __KERNEL_OPENCL_NVIDIA__ */ -# ifdef __KERNEL_OPENCL_APPLE__ -# define __KERNEL_SHADING__ -# define __KERNEL_ADV_SHADING__ -# define __PRINCIPLED__ -# define __CMJ__ -/* TODO(sergey): Currently experimental section is ignored here, - * this is because megakernel in device_opencl does not support - * custom cflags depending on the scene features. - */ -# endif /* __KERNEL_OPENCL_APPLE__ */ - # ifdef __KERNEL_OPENCL_AMD__ -# define __KERNEL_SHADING__ -# define __KERNEL_ADV_SHADING__ # define __SUBSURFACE__ -# define __PRINCIPLED__ # define __VOLUME__ # define __VOLUME_SCATTER__ # define __SHADOW_RECORD_ALL__ -# define __CMJ__ # define __BRANCHED_PATH__ # endif /* __KERNEL_OPENCL_AMD__ */ -# ifdef __KERNEL_OPENCL_INTEL_CPU__ -# define __KERNEL_SHADING__ -# define __KERNEL_ADV_SHADING__ -# define __PRINCIPLED__ -# define __CMJ__ -# endif /* __KERNEL_OPENCL_INTEL_CPU__ */ - # endif /* KERNEL_OPENCL_PREVIEW__ */ #endif /* __KERNEL_OPENCL__ */ @@ -202,9 +176,6 @@ CCL_NAMESPACE_BEGIN # define __TEXTURES__ # define __EXTRA_NODES__ # define __HOLDOUT__ -#endif - -#ifdef __KERNEL_ADV_SHADING__ # define __MULTI_CLOSURE__ # define __TRANSPARENT_SHADOWS__ # define __PASSES__ |