blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Shadow linking: Initial work towards MIS support #107439

Merged
Sergey Sharybin merged 17 commits from Sergey/blender:cycles-light-linking-mis into cycles-light-linking 2023-05-05 21:44:14 +02:00
Conversation 8 Commits 17 Files Changed 33 +34 -30
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bdf4f318b6 - Show all commits

8
intern/cycles/kernel/integrator/intersect_dedicated_light.h
View File

@ -43,12 +43,8 @@ ccl_device bool shadow_linking_pick_light_intersection(KernelGlobals kg,
// TODO: What of the actual shadow ray hits the same light through a semi-transparent surface?
if (!lights_intersect(kg, ray, isect, last_prim, last_object, last_type, path_flag)) {
return false;
}
/* Only handle lights with shadow linking. */
if (!kernel_data_fetch(lights, isect->prim).shadow_set_membership) {
if (!lights_intersect_shadow_linked(
kg, ray, isect, last_prim, last_object, last_type, path_flag)) {
return false;
}

56
intern/cycles/kernel/light/light.h
View File

@ -244,15 +244,16 @@ ccl_device_noinline bool light_sample(KernelGlobals kg,
/* Intersect ray with individual light. */
ccl_device bool lights_intersect(KernelGlobals kg,
ccl_private const Ray *ccl_restrict ray,
ccl_private Intersection *ccl_restrict isect,
const int last_prim,
const int last_object,
const int last_type,
const uint32_t path_flag,
const uint8_t path_mnee,
const int receiver_forward)
template<bool is_main_path>
ccl_device bool lights_intersect_impl(KernelGlobals kg,
ccl_private const Ray *ccl_restrict ray,
ccl_private Intersection *ccl_restrict isect,
const int last_prim,
const int last_object,
const int last_type,
const uint32_t path_flag,
const uint8_t path_mnee,
const int receiver_forward)
{
for (int lamp = 0; lamp < kernel_data.integrator.num_lights; lamp++) {
const ccl_global KernelLight *klight = &kernel_data_fetch(lights, lamp);
@ -283,15 +284,22 @@ ccl_device bool lights_intersect(KernelGlobals kg,
}
#ifdef __SHADOW_LINKING__
/* Exclude lights with shadow linking from indirect rays.
* They are handled via dedicated light intersect and shade kernels. */
if ((kernel_data.kernel_features & KERNEL_FEATURE_SHADOW_LINKING) &&
!(path_flag & PATH_RAY_TRANSPARENT_BACKGROUND))
{
if (kernel_data_fetch(lights, lamp).shadow_set_membership) {
/* For the main path exclude shadow-linked lights if intersecting with an indirect light ray.
* Those lights are handled via dedicated light intersect and shade kernels.
* For the shadow path used for the dedicated light shading ignore all non-shadow-linked
* lights. */
if (kernel_data.kernel_features & KERNEL_FEATURE_SHADOW_LINKING) {
if (is_main_path) {
const bool is_indirect_ray = !(path_flag & PATH_RAY_TRANSPARENT_BACKGROUND);
if (is_indirect_ray && kernel_data_fetch(lights, lamp).shadow_set_membership) {
continue;
}
}
else if (!kernel_data_fetch(lights, lamp).shadow_set_membership) {
continue;
}
}
#endif
#ifdef __LIGHT_LINKING__
@ -350,19 +358,19 @@ ccl_device bool lights_intersect(KernelGlobals kg,
const uint8_t path_mnee = INTEGRATOR_STATE(state, path, mnee);
const int receiver_forward = light_link_receiver_forward(kg, state);
return lights_intersect(
return lights_intersect_impl<true>(
kg, ray, isect, last_prim, last_object, last_type, path_flag, path_mnee, receiver_forward);
}
ccl_device bool lights_intersect(KernelGlobals kg,
ccl_private const Ray *ccl_restrict ray,
ccl_private Intersection *ccl_restrict isect,
const int last_prim,
const int last_object,
const int last_type,
const uint32_t path_flag)
ccl_device bool lights_intersect_shadow_linked(KernelGlobals kg,
ccl_private const Ray *ccl_restrict ray,
ccl_private Intersection *ccl_restrict isect,
const int last_prim,
const int last_object,
const int last_type,
const uint32_t path_flag)
{
return lights_intersect(
return lights_intersect_impl<false>(
kg, ray, isect, last_prim, last_object, last_type, path_flag, PATH_MNEE_NONE, OBJECT_NONE);
}