griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: EEVEE-Next: Subsurface Scattering regression

Browse Source 
Regression caused by 17db856686
Subsurface Scattering uses an additive pass over the radiance output,
so it's always needed even if the deferred pass is not the last one.

Pull Request: https://projects.blender.org/blender/blender/pulls/111534
This commit is contained in:
Miguel Pozo
2023-08-29 15:55:02 +02:00
parent aa83fb0337
commit 639a74d236
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/draw/engines/eevee_next/shaders/eevee_deferred_light_frag.glsl
View File

@@ -102,15 +102,7 @@ void main()
imageStore(rp_value_img, ivec3(texel, rp_buf.shadow_id), vec4(shadow));
}
if (is_last_eval_pass) {
diffuse_light *= diffuse_data.color;
reflection_light *= reflection_data.color;
refraction_light *= refraction_data.color;
/* Add radiance to combined pass. */
out_radiance = vec4(diffuse_light + reflection_light + refraction_light, 0.0);
out_transmittance = vec4(1.0);
}
else {
if (!is_last_eval_pass) {
/* Store lighting for next deferred pass. */
vec4 diffuse_radiance;
diffuse_radiance.xyz = diffuse_light;
@@ -119,4 +111,11 @@ void main()
imageStore(out_diffuse_light_img, texel, diffuse_radiance);
imageStore(out_specular_light_img, texel, vec4(reflection_light + reflection_light, 0.0));
}
diffuse_light *= diffuse_data.color;
reflection_light *= reflection_data.color;
refraction_light *= refraction_data.color;
/* Add radiance to combined pass. */
out_radiance = vec4(diffuse_light + reflection_light + refraction_light, 0.0);
out_transmittance = vec4(1.0);
}