Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

2021-06-18 13:25:53 -07:00
parent 34e64ca5b0 7486488b60
commit e55580af57
578 changed files with 19526 additions and 20039 deletions
@@ -57,7 +57,7 @@ namespace AZ
            LoadShader();
        }

-        void FullscreenTrianglePass::OnShaderVariantReinitialized(const Shader&, const ShaderVariantId&, ShaderVariantStableId)
+        void FullscreenTrianglePass::OnShaderVariantReinitialized(const ShaderVariant&)
        {
            LoadShader();
        }