diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-02-14 14:17:06 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-02-14 14:26:49 +0300 |
commit | 31ad86884cb1b9257f8958cd50942e76aefbd705 (patch) | |
tree | cf724719a49dcd4fc24a6f653ae766428097901c /source/blender/draw/engines | |
parent | 38ced52d34328adf97ec30880ab49fbf53c13d46 (diff) |
EEVEE: Shadow: Fix cascade shadowmap bias multiplicator
This fixes the issue where sun shadowmaps needs a very big bias value to
make any difference.
The bias is now in world space and not dependant on shadow bounds.
Unfortunatelly this breaks compatibility with previous version and old
scene are likely to need user intervention to fix.
Also fixes the property range.
Fix T71661 EEVEE shadow from sun on incorrect face
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 1 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_shadows_cascade.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 8ba68589cbd..e39cb430fe5 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -398,6 +398,7 @@ typedef struct EEVEE_ShadowCascadeRender { float projmat[MAX_CASCADE_NUM][4][4]; float viewmat[4][4], viewinv[4][4]; float radius[MAX_CASCADE_NUM]; + float original_bias; float cascade_max_dist; float cascade_exponent; float cascade_fade; diff --git a/source/blender/draw/engines/eevee/eevee_shadows_cascade.c b/source/blender/draw/engines/eevee/eevee_shadows_cascade.c index b2dc8103df2..32045e12a1c 100644 --- a/source/blender/draw/engines/eevee/eevee_shadows_cascade.c +++ b/source/blender/draw/engines/eevee/eevee_shadows_cascade.c @@ -40,7 +40,6 @@ void EEVEE_shadows_cascade_add(EEVEE_LightsInfo *linfo, EEVEE_Light *evli, Objec EEVEE_ShadowCascade *csm_data = linfo->shadow_cascade_data + linfo->cascade_len; EEVEE_ShadowCascadeRender *csm_render = linfo->shadow_cascade_render + linfo->cascade_len; - sh_data->bias = max_ff(la->bias * 0.00002f, 0.0f); eevee_contact_shadow_setup(la, sh_data); linfo->shadow_cascade_light_indices[linfo->cascade_len] = linfo->num_light; @@ -51,6 +50,7 @@ void EEVEE_shadows_cascade_add(EEVEE_LightsInfo *linfo, EEVEE_Light *evli, Objec csm_render->cascade_count = la->cascade_count; csm_render->cascade_exponent = la->cascade_exponent; csm_render->cascade_max_dist = la->cascade_max_dist; + csm_render->original_bias = max_ff(la->bias, 0.0f); linfo->num_cascade_layer += la->cascade_count; } @@ -380,6 +380,8 @@ static void eevee_shadow_cascade_setup(EEVEE_LightsInfo *linfo, #endif } + /* Bias is in clipspace, divide by range. */ + shdw_data->bias = csm_render->original_bias * 0.05f / fabsf(sh_far - sh_near); shdw_data->near = sh_near; shdw_data->far = sh_far; } |