[Bf-blender-cvs] [0f40855a09d] blender-v3.1-release: Fix T93851: Cycles wrong glossy indirect pass with volumes
Brecht Van Lommel
noreply at git.blender.org
Fri Feb 4 18:01:16 CET 2022
Commit: 0f40855a09d8696b91f4da06f1b5b1d5c720f303
Author: Brecht Van Lommel
Date: Fri Feb 4 16:36:26 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rB0f40855a09d8696b91f4da06f1b5b1d5c720f303
Fix T93851: Cycles wrong glossy indirect pass with volumes
===================================================================
M intern/cycles/kernel/integrator/shade_surface.h
M intern/cycles/kernel/integrator/shade_volume.h
===================================================================
diff --git a/intern/cycles/kernel/integrator/shade_surface.h b/intern/cycles/kernel/integrator/shade_surface.h
index 329380fc464..10d3cbf7f57 100644
--- a/intern/cycles/kernel/integrator/shade_surface.h
+++ b/intern/cycles/kernel/integrator/shade_surface.h
@@ -193,17 +193,24 @@ ccl_device_forceinline void integrate_surface_direct_light(KernelGlobals kg,
const uint16_t transparent_bounce = INTEGRATOR_STATE(state, path, transparent_bounce);
uint32_t shadow_flag = INTEGRATOR_STATE(state, path, flag);
shadow_flag |= (is_light) ? PATH_RAY_SHADOW_FOR_LIGHT : 0;
- shadow_flag |= (shadow_flag & PATH_RAY_ANY_PASS) ? 0 : PATH_RAY_SURFACE_PASS;
const float3 throughput = INTEGRATOR_STATE(state, path, throughput) * bsdf_eval_sum(&bsdf_eval);
if (kernel_data.kernel_features & KERNEL_FEATURE_LIGHT_PASSES) {
- const packed_float3 pass_diffuse_weight =
- (bounce == 0) ? packed_float3(bsdf_eval_pass_diffuse_weight(&bsdf_eval)) :
- INTEGRATOR_STATE(state, path, pass_diffuse_weight);
- const packed_float3 pass_glossy_weight = (bounce == 0) ?
- packed_float3(
- bsdf_eval_pass_glossy_weight(&bsdf_eval)) :
- INTEGRATOR_STATE(state, path, pass_glossy_weight);
+ packed_float3 pass_diffuse_weight;
+ packed_float3 pass_glossy_weight;
+
+ if (shadow_flag & PATH_RAY_ANY_PASS) {
+ /* Indirect bounce, use weights from earlier surface or volume bounce. */
+ pass_diffuse_weight = INTEGRATOR_STATE(state, path, pass_diffuse_weight);
+ pass_glossy_weight = INTEGRATOR_STATE(state, path, pass_glossy_weight);
+ }
+ else {
+ /* Direct light, use BSDFs at this bounce. */
+ shadow_flag |= PATH_RAY_SURFACE_PASS;
+ pass_diffuse_weight = packed_float3(bsdf_eval_pass_diffuse_weight(&bsdf_eval));
+ pass_glossy_weight = packed_float3(bsdf_eval_pass_glossy_weight(&bsdf_eval));
+ }
+
INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, pass_diffuse_weight) = pass_diffuse_weight;
INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, pass_glossy_weight) = pass_glossy_weight;
}
diff --git a/intern/cycles/kernel/integrator/shade_volume.h b/intern/cycles/kernel/integrator/shade_volume.h
index e8d7bfa1374..c59234553a7 100644
--- a/intern/cycles/kernel/integrator/shade_volume.h
+++ b/intern/cycles/kernel/integrator/shade_volume.h
@@ -801,16 +801,26 @@ ccl_device_forceinline void integrate_volume_direct_light(
const uint16_t transparent_bounce = INTEGRATOR_STATE(state, path, transparent_bounce);
uint32_t shadow_flag = INTEGRATOR_STATE(state, path, flag);
shadow_flag |= (is_light) ? PATH_RAY_SHADOW_FOR_LIGHT : 0;
- shadow_flag |= (shadow_flag & PATH_RAY_ANY_PASS) ? 0 : PATH_RAY_VOLUME_PASS;
const float3 throughput_phase = throughput * bsdf_eval_sum(&phase_eval);
if (kernel_data.kernel_features & KERNEL_FEATURE_LIGHT_PASSES) {
- const packed_float3 pass_diffuse_weight = (bounce == 0) ?
- packed_float3(one_float3()) :
- INTEGRATOR_STATE(
- state, path, pass_diffuse_weight);
+ packed_float3 pass_diffuse_weight;
+ packed_float3 pass_glossy_weight;
+
+ if (shadow_flag & PATH_RAY_ANY_PASS) {
+ /* Indirect bounce, use weights from earlier surface or volume bounce. */
+ pass_diffuse_weight = INTEGRATOR_STATE(state, path, pass_diffuse_weight);
+ pass_glossy_weight = INTEGRATOR_STATE(state, path, pass_glossy_weight);
+ }
+ else {
+ /* Direct light, no diffuse/glossy distinction needed for volumes. */
+ shadow_flag |= PATH_RAY_VOLUME_PASS;
+ pass_diffuse_weight = packed_float3(one_float3());
+ pass_glossy_weight = packed_float3(zero_float3());
+ }
+
INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, pass_diffuse_weight) = pass_diffuse_weight;
- INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, pass_glossy_weight) = zero_float3();
+ INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, pass_glossy_weight) = pass_glossy_weight;
}
INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, render_pixel_index) = INTEGRATOR_STATE(
More information about the Bf-blender-cvs
mailing list