Improve MSAA color resolve when very different samples are merged together (#1839)

FrancescoC-unity · sebastienlagarde · web-flow · commit 359a97a86ae9 · 2020-09-25T23:02:11.000+02:00
* Improve MSAA color resolve. * Changelog * Revert unwanted changes This reverts commit a55a905. * Update refs * Linux refs * update linux and mac reference screenshots Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5009_HDRI_Sky_Flow.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5009_HDRI_Sky_Flow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56e6bed5113b0e2086d51c8ea2185c4a11dce25654b04fcee86be03118bb8af8
-size 337402
+oid sha256:c85dc11095b64cf0888e6b46c65d5b51a19d75e7bfd0e1c39ae5b55c8bcb8e38
+size 284397
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9401_MSAAForwardBoth.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9401_MSAAForwardBoth.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14fade7f201df878860d67cb67b03a70f7b67635aaa49380f05d325235fbff9d
-size 248190
+oid sha256:0a415add5c49d608cb621a262dbfdb9ff19ec5beac32280a83d6df17240204f1
+size 240541
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9401_MSAAForwardOnly.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9401_MSAAForwardOnly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a29b3bbc8069f4f4e2794c01069c736094c1102787460602f1d7d8cebb9e0f4
-size 276536
+oid sha256:18595d2d37152a589df6fcce86162cd38871d3271714c2d69d251e42ae9f817c
+size 267418
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9402_AlphaToMask-Graph.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9402_AlphaToMask-Graph.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f88f4a1646f1ed1aac090741714ca5153e4890e839b9d44f1bcc9ebf4b77eea1
-size 35205
+oid sha256:79510778833763a7adfbdca86fe8f5af7013d59c2bec4d15b54986e9b503b9d2
+size 32308
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4af11d397137c8d5fce1ab5dc762a281e5487ac0ebbff5b957b7f14f1296325
-size 111706
+oid sha256:4f27b638f044c8ad339e4170fa318d97331e6740d581eb2af042fe7712764929
+size 96865
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32a2a975e81abcdcc9bed565fb7d595ffb168e5dda416bdb5e07b945648a5179
-size 111711
+oid sha256:a8be6f7dc725944c652e342518cf11020d9dfaae5b5ef1109b9208040f5d63ef
+size 96853
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9603_MeshRendererBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9603_MeshRendererBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e26982303de32660a49e7d3d89a8ed83b6d410676df4bf7d3b01dc2dd11bbce
-size 588096
+oid sha256:1b1411070c7359bb2fc9e7d8f8d381e9dc45e4d27ff496b30ab74dd2ed50635b
+size 516327
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9604_MeshRendererBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/9604_MeshRendererBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de3cb5827e37e0596ccfed6ed549cb47b25fced95d641947bf2447206f14645b
-size 587981
+oid sha256:8666ea141d16c56d4416ef82933e00a8caba34ebcbb09a49c09f25d3fe5b0f84
+size 516167
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5009_HDRI_Sky_Flow.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5009_HDRI_Sky_Flow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6a0299253321dc2d79afe80aa1ea4880bca64435c31b0140ec65f04e362f687
-size 282630
+oid sha256:987b06181941f9c43e67e77291b9c6aea0f73b816c59214d33fbc9d99e3f822b
+size 285111
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/9601_SkinnedMeshBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/9601_SkinnedMeshBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4079daaa42dfe27688b9e9898fca21642b1436c6a8459392e7f4a2e1713c13cd
-size 96785
+oid sha256:e09da3c8869448655bf12ca428304086a921b64dc5df68ceafa9c86c3ddd2dc8
+size 97398
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/9602_SkinnedMeshBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/9602_SkinnedMeshBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:374a147412a217c19f788d4e1778da11cfbfb2d6e68d7a4a594b29b43cb47955
-size 96775
+oid sha256:ecf53f442760a27bda2d0f7256351d722079f2a0172cf26fa807697fcb593e29
+size 97391
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/9603_MeshRendererBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/9603_MeshRendererBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a7b786ca6795ef090b6c9de34c91b76e6c9629a1f441edbae5a2f6eac399942
-size 513181
+oid sha256:9ce146657c951a815fb3b3943e58bbb83a5cd143d4e4642fd4d1409b1ad2bd81
+size 515837
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/9604_MeshRendererBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/9604_MeshRendererBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58679cffb86978280daa375fe87e4e1604893f8d0d99d0345e85677835b04b44
-size 512995
+oid sha256:911d9307fa95a15867383ce686453fb574f83986814bc01d1f99fc3ba1209546
+size 515559
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5009_HDRI_Sky_Flow.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5009_HDRI_Sky_Flow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0b1037e0fc33f99ab3bff8bcf06711145617d1c1043c55007dad088686916a9
-size 281564
+oid sha256:68e9834c7ea80d40dc2a3fc159fbf15d8117d7b69dd2784ca607b9112a84e562
+size 284479
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9401_MSAAForwardBoth.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9401_MSAAForwardBoth.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93756ceb61efa77a7ada61295a50bcb6e622aff2ff67c2060e313dba8358b239
-size 218305
+oid sha256:ecc5dcef2af8ead7a50ebdda56c6504975cf07731bdfa6b2f7c0e6119f9d1904
+size 242283
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9401_MSAAForwardOnly.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9401_MSAAForwardOnly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f2d83c9a92dcdb7b83df8b4bcf3b459a5bcefc88379ee68604f1898d028a008
-size 242990
+oid sha256:942e55ae8483efb541159654622432865fcd4e88f496bb9ce6ff7bebd44d14fd
+size 268850
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9601_SkinnedMeshBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9601_SkinnedMeshBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93b977fa41d3352f010a85e027e7760675815af1a895681cba50361ca8134d9e
-size 96532
+oid sha256:9b50733524ecdea0b7a2439a96af9fdf8eb8649ceb02939256c9f69b9e8415e3
+size 97244
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9602_SkinnedMeshBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9602_SkinnedMeshBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0504525f33b86e13f588212df92db086d299524a39dc2b9d5f96176c9a5183bf
-size 96522
+oid sha256:767a63eafc1c8ed705ebb027e51c757bdacbda9198aa19186b315db4a24170b1
+size 97235
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9603_MeshRendererBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9603_MeshRendererBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86c17ef6c4ea86343625926d61aaf32dd1311c67472f17d0e6e1f41f3a2cc477
-size 514477
+oid sha256:1c5505fe7283305bf6990bd9db0f98567ae3a0fa46d872a8a25bb8034fedefbc
+size 518544
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9604_MeshRendererBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/9604_MeshRendererBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:651c1b74b9a5779d135df6e5afb0d7b505543ae059a27b4422776fbef514f43c
-size 514238
+oid sha256:470f9fb8be394175351598b5e0d3de2b36a9fbbf6e3d2a8e21426d58436a73e2
+size 518436
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5009_HDRI_Sky_Flow.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5009_HDRI_Sky_Flow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c92058c9ee1a3aa8f10e37b52c8317ab5291d1c7d1768d683e3797609248883
-size 337463
+oid sha256:68e9834c7ea80d40dc2a3fc159fbf15d8117d7b69dd2784ca607b9112a84e562
+size 284479
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9401_MSAAForwardBoth.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9401_MSAAForwardBoth.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:effe991cc1b487661c2317a780a6b121391ed86af778ddbc09e14e86953e0e89
-size 249964
+oid sha256:8cca39ac30ea80c71a7cd91dacdc855d906e97073a60904c6adcea0cd1f06c7a
+size 242610
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9401_MSAAForwardOnly.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9401_MSAAForwardOnly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15afea0cbb604791fc61c243e3e56ed1ca07b1f8df282e4345910c920ef2a269
-size 278227
+oid sha256:22623f990cd7729467ef2ef4554296fbf9fd513e3d8b2bff6a725f659eb84876
+size 269039
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9601_SkinnedMeshBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9601_SkinnedMeshBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87383e6a1b1663a74a6f3277a84b3bb18165e5775bff0a343f6b40eab7c1d75b
-size 112116
+oid sha256:9b50733524ecdea0b7a2439a96af9fdf8eb8649ceb02939256c9f69b9e8415e3
+size 97244
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9602_SkinnedMeshBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9602_SkinnedMeshBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a78773aa613ca994b39345aaddae688d93fa5bb0f8758a15f3aa123579cb055
-size 112120
+oid sha256:767a63eafc1c8ed705ebb027e51c757bdacbda9198aa19186b315db4a24170b1
+size 97235
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9603_MeshRendererBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9603_MeshRendererBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96ddc024ec3c0a699e893e059d5449c724ffa07305dda1a85540a26ec4a4bea9
-size 591034
+oid sha256:3f0df2e584a202353b04dbd3390a31e4911c01c67b77f03c38b8f3fa7361f962
+size 518768
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9604_MeshRendererBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/9604_MeshRendererBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bba8a02c0bdbde534926d3315e6f6df02eb37dd59df4c102de50a99b7db16ed7
-size 590971
+oid sha256:e44f6c8e569f8713167e3807f021f6a3e673ac19e93b8e490025fed88267df17
+size 518531
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5009_HDRI_Sky_Flow.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5009_HDRI_Sky_Flow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0b1037e0fc33f99ab3bff8bcf06711145617d1c1043c55007dad088686916a9
-size 281564
+oid sha256:c85dc11095b64cf0888e6b46c65d5b51a19d75e7bfd0e1c39ae5b55c8bcb8e38
+size 284397
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9401_MSAAForwardBoth.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9401_MSAAForwardBoth.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2e93ceb436877dfe8583b0e7964900756268dae021d0bd323f148c43dd1c558
-size 248151
+oid sha256:0a415add5c49d608cb621a262dbfdb9ff19ec5beac32280a83d6df17240204f1
+size 240541
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9401_MSAAForwardOnly.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9401_MSAAForwardOnly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a508ca27e84958126594445beb05740d7cbc44a9cd36f4db8bf90bc7d6c673f
-size 276483
+oid sha256:18595d2d37152a589df6fcce86162cd38871d3271714c2d69d251e42ae9f817c
+size 267418
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9402_AlphaToMask-Graph.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9402_AlphaToMask-Graph.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3780daa2f3e6f9d2501af1a6b9878fd559700ba332a9d95d326edbc1c5b4aece
-size 32526
+oid sha256:79510778833763a7adfbdca86fe8f5af7013d59c2bec4d15b54986e9b503b9d2
+size 32308
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f7b45b6ffdad0548e77b314c9fb2129dd5c6ab40f0314cf30e663a95a8b5ddf
-size 111784
+oid sha256:4f27b638f044c8ad339e4170fa318d97331e6740d581eb2af042fe7712764929
+size 96865
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0743105eb58163defe80745d8869ae5e1ec428fe062859ec51a84548621fb3c
-size 111789
+oid sha256:a8be6f7dc725944c652e342518cf11020d9dfaae5b5ef1109b9208040f5d63ef
+size 96853
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9603_MeshRendererBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9603_MeshRendererBatching-Off.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2c983f65d09bd93563b6fa9d90a47532e03d057628b6f6216ffd72448d42d49
-size 512282
+oid sha256:1b1411070c7359bb2fc9e7d8f8d381e9dc45e4d27ff496b30ab74dd2ed50635b
+size 516327
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9604_MeshRendererBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9604_MeshRendererBatching-On.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5691fb073fe7e51646796d8f4f1826e1c7753fb52acce11350aa0370280eb44f
-size 512112
+oid sha256:8666ea141d16c56d4416ef82933e00a8caba34ebcbb09a49c09f25d3fe5b0f84
+size 516167
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -125,6 +125,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Optimized Grain and sRGB Dithering.
 - On platforms that allow it skip the first mip of the depth pyramid and compute it alongside the depth buffer used for low res transparents.
 - When trying to install the local configuration package, if another one is already present the user is now asked whether they want to keep it or not.
+- Improved MSAA color resolve to fix issues when very bright and very dark samples are resolved together.
 
 ## [10.0.0] - 2019-06-10
 
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/ColorResolve.shader b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/ColorResolve.shader
@@ -33,11 +33,41 @@ Shader "Hidden/HDRP/ColorResolve"
             return output;
         }
 
+        float ResolveWeight(float4 color, float totalSampleCount)
+        {
+            const float boxFilterWeight = rcp(totalSampleCount);
+            float toneMapWeight = rcp(1.0f + Luminance(color.xyz));
+
+            return boxFilterWeight * toneMapWeight;
+        }
+
+        float InverseToneMapWeight(float4 color)
+        {
+            return rcp(1.0f - Luminance(color.xyz));
+        }
+
         float4 LoadColorTextureMS(float2 pixelCoords, uint sampleIndex)
         {
             return LOAD_TEXTURE2D_X_MSAA(_ColorTextureMS, pixelCoords, sampleIndex);
         }
 
+        float4 Resolve(Varyings input, uint sampleCount)
+        {
+            UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
+            int2 pixelCoords = int2(input.texcoord);
+
+            float4 finalVal = 0;
+            for (int i = 0; i < sampleCount; ++i)
+            {
+                float4 currSample = (LoadColorTextureMS(pixelCoords, i));
+                finalVal += currSample * ResolveWeight(currSample, sampleCount);
+            }
+
+            finalVal.xyz *= InverseToneMapWeight(finalVal);
+
+            return float4(finalVal.rgb, 1.0f);
+        }
+
         float4 Frag1X(Varyings input) : SV_Target
         {
             UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
@@ -47,28 +77,19 @@ Shader "Hidden/HDRP/ColorResolve"
 
         float4 Frag2X(Varyings input) : SV_Target
         {
-            UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
-            int2 pixelCoords = int2(input.texcoord);
-            return FastTonemapInvert((FastTonemap(LoadColorTextureMS(pixelCoords, 0)) + FastTonemap(LoadColorTextureMS(pixelCoords, 1))) * 0.5f);
+            return Resolve(input, 2);
         }
 
         float4 Frag4X(Varyings input) : SV_Target
         {
-            UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
-            int2 pixelCoords = int2(input.texcoord);
-            return FastTonemapInvert((FastTonemap(LoadColorTextureMS(pixelCoords, 0)) + FastTonemap(LoadColorTextureMS(pixelCoords, 1))
-                                    + FastTonemap(LoadColorTextureMS(pixelCoords, 2)) + FastTonemap(LoadColorTextureMS(pixelCoords, 3))) * 0.25f);
+            return Resolve(input, 4);
         }
 
         float4 Frag8X(Varyings input) : SV_Target
         {
-            UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
-            int2 pixelCoords = int2(input.texcoord);
-            return FastTonemapInvert((FastTonemap(LoadColorTextureMS(pixelCoords, 0)) + FastTonemap(LoadColorTextureMS(pixelCoords, 1))
-                                    + FastTonemap(LoadColorTextureMS(pixelCoords, 2)) + FastTonemap(LoadColorTextureMS(pixelCoords, 3))
-                                    + FastTonemap(LoadColorTextureMS(pixelCoords, 4)) + FastTonemap(LoadColorTextureMS(pixelCoords, 5))
-                                    + FastTonemap(LoadColorTextureMS(pixelCoords, 6)) + FastTonemap(LoadColorTextureMS(pixelCoords, 7))) * 0.125f);
+            return Resolve(input, 8);
         }
+
     ENDHLSL
     SubShader
     {
