Skip to content

Commit 17703ab

Browse files
Fix corruption of cpu descriptor heap free blocks
1 parent 60710df commit 17703ab

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

drivers/d3d12/rendering_device_driver_d3d12.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -489,13 +489,15 @@ Error RenderingDeviceDriverD3D12::CPUDescriptorsHeapPool::release(const CPUDescr
489489
} else if (next != free_blocks_by_offset.end()) {
490490
// Connects to the next block.
491491
remove_from_size_map(next->value);
492-
free_blocks_by_offset.erase(next->value.global_offset);
493492

494-
next->value.global_offset -= p_result.count;
495-
next->value.size += p_result.count;
493+
FreeBlockInfo merged_block = next->value;
494+
merged_block.global_offset -= p_result.count;
495+
merged_block.size += p_result.count;
496496

497-
DEV_ASSERT(!free_blocks_by_offset.has(next->value.global_offset));
498-
new_block = free_blocks_by_offset.insert(next->value.global_offset, next->value);
497+
// Replace with the merged block.
498+
free_blocks_by_offset.erase(next->value.global_offset);
499+
DEV_ASSERT(!free_blocks_by_offset.has(merged_block.global_offset));
500+
new_block = free_blocks_by_offset.insert(merged_block.global_offset, merged_block);
499501
} else {
500502
// Connects to no block.
501503
new_block = free_blocks_by_offset.insert(global_offset, FreeBlockInfo{ p_result.heap, global_offset, p_result.base_offset, p_result.count });

0 commit comments

Comments
 (0)