diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-11-25 19:40:05 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-11-25 19:47:52 +0300 |
| commit | 0c4740735c5215a1e97ae8bb29cb74bcd472264e (patch) | |
| tree | 98dcaeaef4eca83b00b9174ba0d4b8734a84cc55 /source/blender/draw | |
| parent | 5dfeecf47b575e54fddd3e915024b721efd29eb6 (diff) | |
Eevee: Fix SSS mixing with transparent bsdf
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl index f02812e3e6e..aecb1e6dde4 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl @@ -612,14 +612,6 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac) { Closure cl; -#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; -#ifdef USE_SSS_ALBEDO - cl.sss_albedo = (cl1.sss_data.a > 0.0) ? cl1.sss_albedo : cl2.sss_albedo; -#endif -#endif - if (cl1.ssr_id == outputSsrId) { cl.ssr_data = mix(cl1.ssr_data.xyzw, vec4(vec3(0.0), cl1.ssr_data.w), fac); /* do not blend roughness */ cl.ssr_normal = cl1.ssr_normal; @@ -633,12 +625,34 @@ Closure closure_mix(Closure cl1, Closure cl2, float fac) } if (cl1.ssr_id == TRANSPARENT_CLOSURE_FLAG) { cl1.radiance = cl2.radiance; +#ifdef USE_SSS + cl1.sss_data = cl2.sss_data; +#ifdef USE_SSS_ALBEDO + cl1.sss_albedo = cl2.sss_albedo; +#endif +#endif } if (cl2.ssr_id == TRANSPARENT_CLOSURE_FLAG) { cl2.radiance = cl1.radiance; +#ifdef USE_SSS + cl2.sss_data = cl1.sss_data; +#ifdef USE_SSS_ALBEDO + cl2.sss_albedo = cl1.sss_albedo; +#endif +#endif } cl.radiance = mix(cl1.radiance, cl2.radiance, fac); cl.opacity = mix(cl1.opacity, cl2.opacity, fac); + +#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; +#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; +#endif +#endif + return cl; } @@ -648,6 +662,7 @@ Closure closure_add(Closure cl1, Closure cl2) #ifdef USE_SSS cl.sss_data = (cl1.sss_data.a > 0.0) ? 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; #endif #endif |