Commit: f31f7e3ef0bd0a079182328eef5458fcef38f7b0 Author: Thomas Dinges Date: Fri Jan 20 17:36:48 2023 +0100 Branches: master https://developer.blender.org/rBf31f7e3ef0bd0a079182328eef5458fcef38f7b0
Cleanup: Remove unused light_sample_is_light() function. This also fixes compile warnings on MSVC. =================================================================== M intern/cycles/kernel/integrator/shade_surface.h M intern/cycles/kernel/integrator/shade_volume.h M intern/cycles/kernel/light/sample.h =================================================================== diff --git a/intern/cycles/kernel/integrator/shade_surface.h b/intern/cycles/kernel/integrator/shade_surface.h index 09433caa063..dbeb5f91ce7 100644 --- a/intern/cycles/kernel/integrator/shade_surface.h +++ b/intern/cycles/kernel/integrator/shade_surface.h @@ -235,8 +235,6 @@ ccl_device_forceinline void integrate_surface_direct_light(KernelGlobals kg, light_sample_to_surface_shadow_ray(kg, sd, &ls, &ray); } - const bool is_light = light_sample_is_light(&ls); - /* Branch off shadow kernel. */ IntegratorShadowState shadow_state = integrator_shadow_path_init( kg, state, DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW, false); diff --git a/intern/cycles/kernel/integrator/shade_volume.h b/intern/cycles/kernel/integrator/shade_volume.h index 98dc5603a78..5b460a2fe7a 100644 --- a/intern/cycles/kernel/integrator/shade_volume.h +++ b/intern/cycles/kernel/integrator/shade_volume.h @@ -821,7 +821,6 @@ ccl_device_forceinline void integrate_volume_direct_light( /* Create shadow ray. */ Ray ray ccl_optional_struct_init; light_sample_to_volume_shadow_ray(kg, sd, &ls, P, &ray); - const bool is_light = light_sample_is_light(&ls); /* Branch off shadow kernel. */ IntegratorShadowState shadow_state = integrator_shadow_path_init( diff --git a/intern/cycles/kernel/light/sample.h b/intern/cycles/kernel/light/sample.h index 423024c6b3d..f56ca19e968 100644 --- a/intern/cycles/kernel/light/sample.h +++ b/intern/cycles/kernel/light/sample.h @@ -88,13 +88,6 @@ light_sample_shader_eval(KernelGlobals kg, return eval; } -/* Test if light sample is from a light or emission from geometry. */ -ccl_device_inline bool light_sample_is_light(ccl_private const LightSample *ccl_restrict ls) -{ - /* return if it's a lamp for shadow pass */ - return (ls->prim == PRIM_NONE && ls->type != LIGHT_BACKGROUND); -} - /* Early path termination of shadow rays. */ ccl_device_inline bool light_sample_terminate(KernelGlobals kg, ccl_private const LightSample *ccl_restrict ls, _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs