From 50982b82831a8dbf3b3cb9849ee9e09f334f495d Mon Sep 17 00:00:00 2001 From: mrieggeramzn <61609885+mrieggeramzn@users.noreply.github.com> Date: Wed, 26 Jan 2022 16:04:12 -0800 Subject: [PATCH] Exposing / Unifying the rasterstate depth bias values for all the shadowmap shaders (#7150) Signed-off-by: mrieggeramzn --- .../Types/EnhancedPBR_Shadowmap_WithPS.shader | 8 ++++++++ .../StandardMultilayerPBR_Shadowmap_WithPS.shader | 8 ++++++++ .../Types/StandardPBR_Shadowmap_WithPS.shader | 10 +++++++++- .../Common/Assets/Shaders/Shadow/Shadowmap.shader | 2 ++ .../Common/Assets/Shaders/Shadow/ShadowmapSkin.shader | 2 ++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.shader b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.shader index 09d793e822..a2568e85ac 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.shader +++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.shader @@ -7,6 +7,14 @@ "DrawList" : "shadow", + // Note that lights now expose their own bias controls. + // It may be worth increasing their default values in the future and reducing the depthBias values encoded here. + "RasterState" : + { + "depthBias" : "10", + "depthBiasSlopeScale" : "4" + }, + "ProgramSettings": { "EntryPoints": diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.shader b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.shader index eb0d6dc40c..59c0b72d28 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.shader +++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.shader @@ -7,6 +7,14 @@ "DrawList" : "shadow", + // Note that lights now expose their own bias controls. + // It may be worth increasing their default values in the future and reducing the depthBias values encoded here. + "RasterState" : + { + "depthBias" : "10", + "depthBiasSlopeScale" : "4" + }, + "ProgramSettings": { "EntryPoints": diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.shader b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.shader index b9074dae4b..c73af2c1ed 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.shader +++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.shader @@ -6,7 +6,15 @@ }, "DrawList" : "shadow", - + + // Note that lights now expose their own bias controls. + // It may be worth increasing their default values in the future and reducing the depthBias values encoded here. + "RasterState" : + { + "depthBias" : "10", + "depthBiasSlopeScale" : "4" + }, + "ProgramSettings": { "EntryPoints": diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/Shadowmap.shader b/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/Shadowmap.shader index d56f40ccdb..5fc7917b40 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/Shadowmap.shader +++ b/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/Shadowmap.shader @@ -7,6 +7,8 @@ "DrawList" : "shadow", + // Note that lights now expose their own bias controls. + // It may be worth increasing their default values in the future and reducing the depthBias values encoded here. "RasterState" : { "depthBias" : "10", diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/ShadowmapSkin.shader b/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/ShadowmapSkin.shader index 40379d9193..c5c11d0b2b 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/ShadowmapSkin.shader +++ b/Gems/Atom/Feature/Common/Assets/Shaders/Shadow/ShadowmapSkin.shader @@ -7,6 +7,8 @@ "DrawList" : "shadow", + // Note that lights now expose their own bias controls. + // It may be worth increasing their default values in the future and reducing the depthBias values encoded here. "RasterState" : { "depthBias" : "10",