commit 956a2fc7802b36a9bcac770c03191a091f65a16c
author Peng Huang <penghuang@chromium.org> Fri May 19 23:21:44 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 19 23:21:44 2023 +0000
tree 55fb8f27fb637cd722b636f9a7a10686372e8005
parent 3d3584793b226989b8addb5fbac9db6cf67482c0

d3d11: fix ASSERT() crash in d3d11::BindGroupTracker::unApplyNindGroup()

Bug: dawn:1705
Change-Id: I87d464c5321375a96aa4926a0968e6acab7194e4
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/133760
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Peng Huang <penghuang@chromium.org>

src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp

diff --git a/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp b/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp
index a33897c..d7be5c0 100644
--- a/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp
+++ b/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp
@@ -101,10 +101,11 @@
     // conflict, we need to unbind groups which are not used by the new pipeline. and unbind groups
     // which are not inherited by the new pipeline.
     if (mLastAppliedPipelineLayout) {
-        BindGroupLayoutMask unusedGroups = mLastAppliedPipelineLayout->GetBindGroupLayoutsMask() &
-                                           ~mPipelineLayout->GetBindGroupLayoutsMask();
+        BindGroupLayoutMask lastGroups = mLastAppliedPipelineLayout->GetBindGroupLayoutsMask();
+        BindGroupLayoutMask currentGroups = mPipelineLayout->GetBindGroupLayoutsMask();
+        BindGroupLayoutMask unApplyGroups = (mDirtyBindGroups | ~currentGroups) & lastGroups;
         // Unset bind groups which are not used by the new pipeline and are not inherited.
-        for (BindGroupIndex index : IterateBitSet(mDirtyBindGroups | unusedGroups)) {
+        for (BindGroupIndex index : IterateBitSet(unApplyGroups)) {
             UnApplyBindGroup(index);
         }
     }