ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[D3D12] Fix retarded render target allocation bugs

This commit is contained in:
Triang3l 2018-08-10 18:44:38 +03:00
parent 952bb91c3f
commit 6b9717c7f7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -424,6 +424,7 @@ bool RenderTargetCache::UpdateRenderTargets() {
if (binding.render_target == nullptr) { if (binding.render_target == nullptr) {
continue; continue;
} }
heap_usage[heap_page_first >> 3] += heap_page_count;
// Inform Direct3D that we're reusing the heap for this render target. // Inform Direct3D that we're reusing the heap for this render target.
D3D12_RESOURCE_BARRIER& barrier = barriers[barrier_count++]; D3D12_RESOURCE_BARRIER& barrier = barriers[barrier_count++];
@ -594,7 +595,15 @@ bool RenderTargetCache::GetResourceDesc(RenderTargetKey key,
RenderTargetCache::RenderTarget* RenderTargetCache::FindOrCreateRenderTarget( RenderTargetCache::RenderTarget* RenderTargetCache::FindOrCreateRenderTarget(
RenderTargetKey key, uint32_t heap_page_first) { RenderTargetKey key, uint32_t heap_page_first) {
assert_true(heap_page_first <= 8 * 5); assert_true(heap_page_first <= 8 * 5);
// TODO(Triang3l): Find an existing render target.
// Try to find an existing render target.
auto found_range = render_targets_.equal_range(key.value);
for (auto iter = found_range.first; iter != found_range.second; ++iter) {
RenderTarget* found_render_target = iter->second;
if (found_render_target->heap_page_first == heap_page_first) {
return found_render_target;
}
}
D3D12_RESOURCE_DESC resource_desc; D3D12_RESOURCE_DESC resource_desc;
if (!GetResourceDesc(key, resource_desc)) { if (!GetResourceDesc(key, resource_desc)) {