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

Fix leak of AttachmentState 

Unlike API objects, the AttachmentState object is only used internally
and should have no external references. We should not increment the
reference count on creation because it is Ref'ed internally. This patch
also adds ASSERTs that all Device caches are empty when the Device is
destroyed.

Bug: dawn:154
Change-Id: I5dd46bde03c0be920356444e6b1214ed38e833e8
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/9761
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Austin Eng 2019-08-07 21:47:24 +00:00 committed by Commit Bot service account
parent 421584173c
commit bb10a91876
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/dawn_native/Device.cpp
View File

@ -77,6 +77,14 @@ namespace dawn_native {
// Devices must explicitly free the uploader
ASSERT(mDynamicUploader == nullptr);
ASSERT(mDeferredCreateBufferMappedAsyncResults.empty());
ASSERT(mCaches->attachmentStates.empty());
ASSERT(mCaches->bindGroupLayouts.empty());
ASSERT(mCaches->computePipelines.empty());
ASSERT(mCaches->pipelineLayouts.empty());
ASSERT(mCaches->renderPipelines.empty());
ASSERT(mCaches->samplers.empty());
ASSERT(mCaches->shaderModules.empty());
}
void DeviceBase::HandleError(const char* message) {
@ -255,35 +263,33 @@ namespace dawn_native {
ASSERT(removedCount == 1);
}
AttachmentState* DeviceBase::GetOrCreateAttachmentState(
Ref<AttachmentState> DeviceBase::GetOrCreateAttachmentState(
const RenderPipelineDescriptor* descriptor) {
AttachmentStateBlueprint blueprint(descriptor);
auto iter = mCaches->attachmentStates.find(&blueprint);
if (iter != mCaches->attachmentStates.end()) {
AttachmentState* cachedState = static_cast<AttachmentState*>(*iter);
cachedState->Reference();
return cachedState;
return static_cast<AttachmentState*>(*iter);
}
AttachmentState* attachmentState = new AttachmentState(this, blueprint);
mCaches->attachmentStates.insert(attachmentState);
Ref<AttachmentState> attachmentState = new AttachmentState(this, blueprint);
attachmentState->Release();
mCaches->attachmentStates.insert(attachmentState.Get());
return attachmentState;
}
AttachmentState* DeviceBase::GetOrCreateAttachmentState(
Ref<AttachmentState> DeviceBase::GetOrCreateAttachmentState(
const RenderPassDescriptor* descriptor) {
AttachmentStateBlueprint blueprint(descriptor);
auto iter = mCaches->attachmentStates.find(&blueprint);
if (iter != mCaches->attachmentStates.end()) {
AttachmentState* cachedState = static_cast<AttachmentState*>(*iter);
cachedState->Reference();
return cachedState;
return static_cast<AttachmentState*>(*iter);
}
AttachmentState* attachmentState = new AttachmentState(this, blueprint);
mCaches->attachmentStates.insert(attachmentState);
Ref<AttachmentState> attachmentState = new AttachmentState(this, blueprint);
attachmentState->Release();
mCaches->attachmentStates.insert(attachmentState.Get());
return attachmentState;
}

4
src/dawn_native/Device.h
View File

@ -115,8 +115,8 @@ namespace dawn_native {
const ShaderModuleDescriptor* descriptor);
void UncacheShaderModule(ShaderModuleBase* obj);
AttachmentState* GetOrCreateAttachmentState(const RenderPipelineDescriptor* descriptor);
AttachmentState* GetOrCreateAttachmentState(const RenderPassDescriptor* descriptor);
Ref<AttachmentState> GetOrCreateAttachmentState(const RenderPipelineDescriptor* descriptor);
Ref<AttachmentState> GetOrCreateAttachmentState(const RenderPassDescriptor* descriptor);
void UncacheAttachmentState(AttachmentState* obj);
// Dawn API