diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-04-21 06:14:34 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-04-26 17:48:15 +0300 |
| commit | fe81a32f6916f1d8307c66965a4aea256005702b (patch) | |
| tree | df8f8fa14d2479cf3865e751fbf5e5131123f8d3 /intern | |
| parent | c13acebd61393204747ce11fe641b84d90fa2bb0 (diff) | |
Cycles: Enable Correlated Multi Jitter for OpenCL and split kernel
Testing showed no issues so there's no reason to not have this.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 3 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 15 |
2 files changed, 6 insertions, 12 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 2b50d272be8..19ab9053e9a 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -204,8 +204,7 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): col.prop(cscene, "sample_all_lights_direct") col.prop(cscene, "sample_all_lights_indirect") - if not (use_opencl(context) and cscene.feature_set != 'EXPERIMENTAL'): - layout.row().prop(cscene, "sampling_pattern", text="Pattern") + layout.row().prop(cscene, "sampling_pattern", text="Pattern") for rl in scene.render.layers: if rl.samples > 0: diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index a744c1d8277..b1269cdb6b4 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -97,9 +97,9 @@ CCL_NAMESPACE_BEGIN # define __SUBSURFACE__ # define __PRINCIPLED__ # define __SHADOW_RECORD_ALL__ +# define __CMJ__ # ifndef __SPLIT_KERNEL__ # define __BRANCHED_PATH__ -# define __CMJ__ # endif #endif /* __KERNEL_CUDA__ */ @@ -115,21 +115,17 @@ CCL_NAMESPACE_BEGIN # define __VOLUME__ # define __VOLUME_SCATTER__ # define __SHADOW_RECORD_ALL__ -# ifdef __KERNEL_EXPERIMENTAL__ -# define __CMJ__ -# endif +# define __CMJ__ # endif /* __KERNEL_OPENCL_NVIDIA__ */ # ifdef __KERNEL_OPENCL_APPLE__ # define __KERNEL_SHADING__ # define __KERNEL_ADV_SHADING__ +# 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. */ -# ifdef __KERNEL_EXPERIMENTAL__ -# define __CMJ__ -# endif # endif /* __KERNEL_OPENCL_NVIDIA__ */ # ifdef __KERNEL_OPENCL_AMD__ @@ -141,15 +137,14 @@ CCL_NAMESPACE_BEGIN # define __VOLUME__ # define __VOLUME_SCATTER__ # define __SHADOW_RECORD_ALL__ +# define __CMJ__ # endif /* __KERNEL_OPENCL_AMD__ */ # ifdef __KERNEL_OPENCL_INTEL_CPU__ # define __CL_USE_NATIVE__ # define __KERNEL_SHADING__ # define __KERNEL_ADV_SHADING__ -# ifdef __KERNEL_EXPERIMENTAL__ -# define __CMJ__ -# endif +# define __CMJ__ # endif /* __KERNEL_OPENCL_INTEL_CPU__ */ #endif /* __KERNEL_OPENCL__ */ |