bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Move Cycles volume stack update for subsurface into kernel_volume.h.

Browse Source
This commit is contained in:
Thomas Dinges 2015-04-28 11:11:39 +02:00
parent d920b8e075
commit 5e423775da
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
intern/cycles/kernel/kernel_path.h
View File

@ -364,31 +364,6 @@ ccl_device void kernel_branched_path_ao(KernelGlobals *kg, ShaderData *sd, PathR
#ifdef __SUBSURFACE__
#ifdef __VOLUME__
ccl_device void kernel_path_subsurface_update_volume_stack(KernelGlobals *kg,
Ray *ray,
VolumeStack *stack)
{
kernel_assert(kernel_data.integrator.use_volumes);
Ray volume_ray = *ray;
Intersection isect;
int step = 0;
while(step < VOLUME_STACK_SIZE &&
scene_intersect_volume(kg, &volume_ray, &isect))
{
ShaderData sd;
shader_setup_from_ray(kg, &sd, &isect, &volume_ray, 0, 0);
kernel_volume_stack_enter_exit(kg, &sd, stack);
/* Move ray forward. */
volume_ray.P = ray_offset(sd.P, -sd.Ng);
volume_ray.t -= sd.ray_length;
++step;
}
}
#endif
ccl_device bool kernel_path_subsurface_scatter(KernelGlobals *kg, ShaderData *sd, PathRadiance *L, PathState *state, RNG *rng, Ray *ray, float3 *throughput)
{
float bssrdf_probability;
@ -433,7 +408,7 @@ ccl_device bool kernel_path_subsurface_scatter(KernelGlobals *kg, ShaderData *sd
volume_ray.D = normalize_len(hit_ray.P - volume_ray.P,
&volume_ray.t);
kernel_path_subsurface_update_volume_stack(
kernel_volume_stack_update_for_subsurface(
kg,
&volume_ray,
hit_state.volume_stack);
@ -832,7 +807,7 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg,
volume_ray.D = normalize_len(P - volume_ray.P,
&volume_ray.t);
kernel_path_subsurface_update_volume_stack(
kernel_volume_stack_update_for_subsurface(
kg,
&volume_ray,
hit_state.volume_stack);

25
intern/cycles/kernel/kernel_volume.h
View File

@ -1097,4 +1097,29 @@ ccl_device void kernel_volume_stack_enter_exit(KernelGlobals *kg, ShaderData *sd
}
}
#ifdef __SUBSURFACE__
ccl_device void kernel_volume_stack_update_for_subsurface(KernelGlobals *kg,
Ray *ray,
VolumeStack *stack)
{
kernel_assert(kernel_data.integrator.use_volumes);
Ray volume_ray = *ray;
Intersection isect;
int step = 0;
while(step < VOLUME_STACK_SIZE &&
scene_intersect_volume(kg, &volume_ray, &isect))
{
ShaderData sd;
shader_setup_from_ray(kg, &sd, &isect, &volume_ray, 0, 0);
kernel_volume_stack_enter_exit(kg, &sd, stack);
/* Move ray forward. */
volume_ray.P = ray_offset(sd.P, -sd.Ng);
volume_ray.t -= sd.ray_length;
++step;
}
}
#endif
CCL_NAMESPACE_END