blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T64158 Eevee: Mixed SSS shader becomes brighter and brighter 

This change the logic a bit, when 2 bsdfs using SSS are mixed, we use the
one with the biggest radius (on a per pixel basis).

This change from previous behavior which was to select input 1 if radius
was greater than 0.
This commit is contained in:
Clément Foucault 2019-05-09 00:10:15 +02:00
parent 558017d6a6
commit 1a99b6fc7e
Notes: blender-bot 2023-02-14 10:11:54 +01:00 
Referenced by issue #64158, Mixed EEVEE SSS shader becomes brighter and brighter.
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
View File

@ -836,18 +836,22 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac)
cl.radiance /= max(1e-8, cl.opacity);
# ifdef USE_SSS
cl.sss_data.rgb = mix(cl1.sss_data.rgb, cl2.sss_data.rgb, fac);
cl.sss_data.a = (cl1.sss_data.a > 0.0) ? cl1.sss_data.a : cl2.sss_data.a;
/* Apply Mix on input */
cl1.sss_data.rgb *= 1.0 - fac;
cl2.sss_data.rgb *= fac;
/* Select biggest radius. */
bool use_cl1 = (cl1.sss_data.a > cl2.sss_data.a);
cl.sss_data = (use_cl1) ? cl1.sss_data : cl2.sss_data;
# ifdef USE_SSS_ALBEDO
/* TODO Find a solution to this. Dither? */
cl.sss_albedo = (cl1.sss_data.a > 0.0) ? cl1.sss_albedo : cl2.sss_albedo;
cl.sss_albedo = (use_cl1) ? cl1.sss_albedo : cl2.sss_albedo;
/* Add radiance that was supposed to be filtered but was rejected. */
cl.radiance += (cl1.sss_data.a > 0.0) ? cl2.sss_data.rgb * cl2.sss_albedo :
cl1.sss_data.rgb * cl1.sss_albedo;
cl.radiance += (use_cl1) ? cl2.sss_data.rgb * cl2.sss_albedo : cl1.sss_data.rgb * cl1.sss_albedo;
# else
/* Add radiance that was supposed to be filtered but was rejected. */
cl.radiance += (cl1.sss_data.a > 0.0) ? cl2.sss_data.rgb : cl1.sss_data.rgb;
cl.radiance += (use_cl1) ? cl2.sss_data.rgb : cl1.sss_data.rgb;
# endif
# endif