diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-08-24 17:58:41 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-08-24 17:58:41 +0400 |
| commit | c89287e057092e4f479d3db920e61b295fe355ef (patch) | |
| tree | 5d24b04d8fc9ff35d039dc03e3ba79e490ddbc75 /intern | |
| parent | 8ed818e0a1b4e6355413607bda3a01970294f91d (diff) | |
Cycles: Avoid call to volume_stack_sampling_method() on GPU, Decoupled is required for Equi-Angular/MIS.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 25c285e3def..dfca312914d 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -89,9 +89,9 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, Ray ray, volume_ray.t = (hit)? isect.t: FLT_MAX; bool heterogeneous = volume_stack_is_heterogeneous(kg, state.volume_stack); - int sampling_method = volume_stack_sampling_method(kg, state.volume_stack); #ifdef __VOLUME_DECOUPLED__ + int sampling_method = volume_stack_sampling_method(kg, state.volume_stack); bool decoupled = kernel_volume_use_decoupled(kg, heterogeneous, false, sampling_method); if(decoupled) { @@ -476,9 +476,9 @@ ccl_device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, volume_ray.t = (hit)? isect.t: FLT_MAX; bool heterogeneous = volume_stack_is_heterogeneous(kg, state.volume_stack); - int sampling_method = volume_stack_sampling_method(kg, state.volume_stack); #ifdef __VOLUME_DECOUPLED__ + int sampling_method = volume_stack_sampling_method(kg, state.volume_stack); bool decoupled = kernel_volume_use_decoupled(kg, heterogeneous, true, sampling_method); if(decoupled) { |