commit | a2a30eac99da2e13d4ab68050a148c088f94541a | [log] [tgz] |
---|---|---|
author | Roman Lavrov <romanl@google.com> | Fri Mar 03 14:41:39 2023 |
committer | Roman Lavrov <romanl@google.com> | Fri Mar 03 14:42:38 2023 |
tree | 06a8c4f87a771f99ec19dbcbbf13c2ff29065ee9 | |
parent | 6967b40ed67b061d9a5a457e56853baa15207238 [diff] |
Revert "MSRTSS uses AppendToPNextChain due to non-NULL pNext." This reverts commit 33df630f9c8944061902b2e38fe65b280f731802. Reason for revert: appears to crash angle_CtsSkQPTestCases_internal_main_presubmit on panther-userdebug https://r.android.com/2466997 Original change's description: > MSRTSS uses AppendToPNextChain due to non-NULL pNext. > > As discussed in: > https://chromium-review.googlesource.com/c/angle/angle/+/4116675/comment/3097cb31_16922d39/ > > Not currently causing issues as it requires very recent drivers but I > saw the `ASSERT(ptr->pNext == nullptr);` in AddToPNextChain fail > somewhere. > > Bug: angleproject:7899 > Change-Id: Id46162a5aacd3d8599382ce1dfca25aca5e730e1 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4296801 > Auto-Submit: Roman Lavrov <romanl@google.com> > Commit-Queue: Yuxin Hu <yuxinhu@google.com> > Reviewed-by: Yuxin Hu <yuxinhu@google.com> Bug: angleproject:7899 Change-Id: Ib59bee567b4249077b67f52dcf763d55dc9a7811 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4307769 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
diff --git a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp index 3034d17..abab85d 100644 --- a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp +++ b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
@@ -767,8 +767,7 @@ if (renderer->getFeatures().supportsMultisampledRenderToSingleSampled.enabled) { - // msrtss->pNext is not null so can't use AddToPNextChain - AppendToPNextChain(subpass, msrtss); + AddToPNextChain(subpass, msrtss); } else {