fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[D3D12] Cleanup object destruction in Shutdown functions

Browse Source
This commit is contained in:
Triang3l
2018-08-26 00:24:25 +03:00
parent ff014d47d4
commit 791c275fab
5 changed files with 21 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/xenia/gpu/d3d12/render_target_cache.cc
View File

@@ -283,46 +283,17 @@ void RenderTargetCache::Shutdown() {
resolve_pipeline.pipeline->Release();
}
resolve_pipelines_.clear();
if (resolve_root_signature_ != nullptr) {
resolve_root_signature_->Release();
resolve_root_signature_ = nullptr;
}
if (edram_tile_sample_32bpp_pipeline_ != nullptr) {
edram_tile_sample_32bpp_pipeline_->Release();
edram_tile_sample_32bpp_pipeline_ = nullptr;
}
if (edram_clear_depth_float_pipeline_ != nullptr) {
edram_clear_depth_float_pipeline_->Release();
edram_clear_depth_float_pipeline_ = nullptr;
}
if (edram_clear_32bpp_pipeline_ != nullptr) {
edram_clear_32bpp_pipeline_->Release();
edram_clear_32bpp_pipeline_ = nullptr;
}
ui::d3d12::util::ReleaseAndNull(resolve_root_signature_);
ui::d3d12::util::ReleaseAndNull(edram_tile_sample_32bpp_pipeline_);
ui::d3d12::util::ReleaseAndNull(edram_clear_depth_float_pipeline_);
ui::d3d12::util::ReleaseAndNull(edram_clear_32bpp_pipeline_);
for (uint32_t i = 0; i < uint32_t(EDRAMLoadStoreMode::kCount); ++i) {
if (edram_load_pipelines_[i] != nullptr) {
edram_load_pipelines_[i]->Release();
edram_load_pipelines_[i] = nullptr;
}
if (edram_store_pipelines_[i] != nullptr) {
edram_store_pipelines_[i]->Release();
edram_store_pipelines_[i] = nullptr;
}
}
if (edram_clear_root_signature_ != nullptr) {
edram_clear_root_signature_->Release();
edram_clear_root_signature_ = nullptr;
}
if (edram_load_store_root_signature_ != nullptr) {
edram_load_store_root_signature_->Release();
edram_load_store_root_signature_ = nullptr;
}
if (edram_buffer_ != nullptr) {
edram_buffer_->Release();
edram_buffer_ = nullptr;
ui::d3d12::util::ReleaseAndNull(edram_store_pipelines_[i]);
ui::d3d12::util::ReleaseAndNull(edram_load_pipelines_[i]);
}
ui::d3d12::util::ReleaseAndNull(edram_clear_root_signature_);
ui::d3d12::util::ReleaseAndNull(edram_load_store_root_signature_);
ui::d3d12::util::ReleaseAndNull(edram_buffer_);
}
void RenderTargetCache::ClearCache() {