diff options
author | Thomas Dinges <blender@dingto.org> | 2013-09-04 20:11:21 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-09-04 20:11:21 +0400 |
commit | 65f21d9b43c8f330e7c05f0e391e4062ab4f0a32 (patch) | |
tree | 65b7577510e2154b5cfb4f096f61c72ec2af7c2a /intern/cycles | |
parent | 37e91d8965586eaacc35770732d804d4ed7fb479 (diff) |
Code cleanup / Cycles:
* Avoid special code, when Subsurface is enabled.
Ideally we should only use the function, and get rid of the extra duplicate, but this is slower on CUDA.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/kernel/kernel_path.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 36aaba2aac5..1f0d9973bed 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -808,15 +808,9 @@ __device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, R } } #endif - -#ifdef __SUBSURFACE__ - - if(!kernel_path_integrate_lighting(kg, rng, sample, num_samples, &sd, - &throughput, &min_ray_pdf, &ray_pdf, &state, rng_offset, &L, &ray, &ray_t)) - break; - -#else - + + /* The following code is the same as in kernel_path_integrate_lighting(), + but for CUDA the function call is slower. */ #ifdef __EMISSION__ if(kernel_data.integrator.use_direct_light) { /* sample illumination from lights to find path contribution */ @@ -898,8 +892,6 @@ __device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, R ray.dP = sd.dP; ray.dD = bsdf_domega_in; #endif - -#endif } float3 L_sum = path_radiance_sum(kg, &L); |