Commit: c89287e057092e4f479d3db920e61b295fe355ef
Author: Thomas Dinges
Date: Sun Aug 24 15:58:41 2014 +0200
Branches: master
https://developer.blender.org/rBc89287e057092e4f479d3db920e61b295fe355ef
Cycles: Avoid call to volume_stack_sampling_method() on GPU, Decoupled is
required for Equi-Angular/MIS.
===================================================================
M intern/cycles/kernel/kernel_path.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_path.h
b/intern/cycles/kernel/kernel_path.h
index 25c285e..dfca312 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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
