Merge pull request #16964 from aws-lumberyard-dev/Atom/FixesForSkin

antonmic · web-flow · commit 31d43f554e98 · 2023-10-30T11:22:41.000-07:00
Fixing Skin Dual Specular and IBL getting applied twice
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Pipelines/MainPipeline/ForwardPassVertexAndPixel.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Pipelines/MainPipeline/ForwardPassVertexAndPixel.azsli
@@ -79,7 +79,15 @@ ForwardPassOutput PixelShader(VsOutput IN, bool isFrontFace : SV_IsFrontFace)
     // --- Normal ---
 
     OUT.m_normal.rgb = EncodeNormalSignedOctahedron(surface.GetDefaultNormal());
-    OUT.m_normal.a = EncodeUnorm2BitFlags(o_enableIBL, o_specularF0_enableMultiScatterCompensation);
+
+    // --- Fullscreen Passes IBL & Multiscatter ---
+
+    bool applyIblInFullscreenPasses = o_enableIBL;
+#if FORCE_IBL_IN_FORWARD_PASS
+    applyIblInFullscreenPasses = false;
+#endif
+
+    OUT.m_normal.a = EncodeUnorm2BitFlags(applyIblInFullscreenPasses, o_specularF0_enableMultiScatterCompensation);
 
     // --- Emissive ---
     // Sending to specular output for historical reasons until sending to diffuse can be validated
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Materials/MaterialInputs/DualSpecular.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/Materials/MaterialInputs/DualSpecular.azsli
@@ -29,7 +29,6 @@ void GetDualSpecularInput(float3 normal, float roughnessLinear, float specularF0
         outDualSpecRoughness = pow(roughnessLinear, dualSpecRoughnessExponent) * dualSpecRoughnessMultiplier;
         CalculateRoughnessValues(normal, outDualSpecRoughness, dummyRoughnessA, outDualSpecRoughnessA2);
         outDualSpecF0 = specularF0 * dualSpecF0Multiplier;
-        outDualSpecFactor = 0;
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ void GetDualSpecularInput(float3 normal, float roughnessLinear, float specularF0`
`29`	`29`	`outDualSpecRoughness = pow(roughnessLinear, dualSpecRoughnessExponent) * dualSpecRoughnessMultiplier;`
`30`	`30`	`CalculateRoughnessValues(normal, outDualSpecRoughness, dummyRoughnessA, outDualSpecRoughnessA2);`
`31`	`31`	`outDualSpecF0 = specularF0 * dualSpecF0Multiplier;`
`32`		`- outDualSpecFactor = 0;`
`33`	`32`	`}`
`34`	`33`	`else`
`35`	`34`	`{`