forked from bartvdbraak/blender
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.
This commit is contained in:
parent
37e91d8965
commit
65f21d9b43
@ -809,14 +809,8 @@ __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 */
|
||||
@ -897,8 +891,6 @@ __device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, R
|
||||
#ifdef __RAY_DIFFERENTIALS__
|
||||
ray.dP = sd.dP;
|
||||
ray.dD = bsdf_domega_in;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user