encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D12: Reference all signatures when destroying pipeline layout 

This patch implements PipelineLayoutD3D12::DestroyImpl() where we
call ReferenceUntilUnused() to all the root and command signatures
so that they won't be destroyed when they are referenced by GPU
operations in-flight on command queue.

BUG=dawn:1422
TEST=dawn_end2end_tests

Change-Id: I54df7b53645c9beaaa2e7b74aef54e0f6d37c440
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/90940
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
This commit is contained in:
Jiawei Shao 2022-05-20 08:33:00 +00:00 committed by Dawn LUCI CQ
parent 9ebba367e8
commit 3607cb8465
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/dawn/native/d3d12/PipelineLayoutD3D12.cpp
View File

@ -275,6 +275,27 @@ MaybeError PipelineLayout::Initialize() {
return {}; return {};
} }
void PipelineLayout::DestroyImpl() {
PipelineLayoutBase::DestroyImpl();
Device* device = ToBackend(GetDevice());
device->ReferenceUntilUnused(mRootSignature);
// The ID3D12CommandSignature object should not be referenced by GPU operations in-flight on
// Command Queue when it is being deleted. According to D3D12 debug layer, "it is not safe to
// final-release objects that may have GPU operations pending. This can result in application
// instability (921)".
if (mDispatchIndirectCommandSignatureWithNumWorkgroups.Get()) {
device->ReferenceUntilUnused(mDispatchIndirectCommandSignatureWithNumWorkgroups);
}
if (mDrawIndirectCommandSignatureWithInstanceVertexOffsets.Get()) {
device->ReferenceUntilUnused(mDrawIndirectCommandSignatureWithInstanceVertexOffsets);
}
if (mDrawIndexedIndirectCommandSignatureWithInstanceVertexOffsets.Get()) {
device->ReferenceUntilUnused(mDrawIndexedIndirectCommandSignatureWithInstanceVertexOffsets);
}
}
uint32_t PipelineLayout::GetCbvUavSrvRootParameterIndex(BindGroupIndex group) const { uint32_t PipelineLayout::GetCbvUavSrvRootParameterIndex(BindGroupIndex group) const {
ASSERT(group < kMaxBindGroupsTyped); ASSERT(group < kMaxBindGroupsTyped);
return mCbvUavSrvRootParameterInfo[group]; return mCbvUavSrvRootParameterInfo[group];

2
src/dawn/native/d3d12/PipelineLayoutD3D12.h
View File

@ -85,6 +85,8 @@ class PipelineLayout final : public PipelineLayoutBase {
~PipelineLayout() override = default; ~PipelineLayout() override = default;
using PipelineLayoutBase::PipelineLayoutBase; using PipelineLayoutBase::PipelineLayoutBase;
MaybeError Initialize(); MaybeError Initialize();
void DestroyImpl() override;
ityp::array<BindGroupIndex, uint32_t, kMaxBindGroups> mCbvUavSrvRootParameterInfo; ityp::array<BindGroupIndex, uint32_t, kMaxBindGroups> mCbvUavSrvRootParameterInfo;
ityp::array<BindGroupIndex, uint32_t, kMaxBindGroups> mSamplerRootParameterInfo; ityp::array<BindGroupIndex, uint32_t, kMaxBindGroups> mSamplerRootParameterInfo;
ityp::array<BindGroupIndex, ityp::array<BindGroupIndex,