KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

d3d12: Fix incorrect hash table usage 

I'd assumed that since insert didn't take a deleter, it was
find-or-insert, not insert-or-replace. This caused a bo reference
leak if the same bo was used more than once in a batch.

Fixes: fde36d7992 ("d3d12: Don't wait for GPU reads to do CPU reads")
Reviewed By: Bill Kristiansen <billkris@microsoft.com>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13819>
This commit is contained in:
Jesse Natalie 2021-11-16 07:05:45 -08:00 committed by Marge Bot
parent 764760314d
commit a818f7b686
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/d3d12/d3d12_batch.cpp
View File

@ -230,9 +230,11 @@ d3d12_batch_reference_resource(struct d3d12_batch *batch,
struct d3d12_resource *res,
bool write)
{
hash_entry *entry = _mesa_hash_table_insert(batch->bos, res->bo, NULL);
if (entry->data == NULL)
hash_entry *entry = _mesa_hash_table_search(batch->bos, res->bo);
if (entry == NULL) {
d3d12_bo_reference(res->bo);
entry = _mesa_hash_table_insert(batch->bos, res->bo, NULL);
}
size_t new_data = write ? batch_bo_reference_written : batch_bo_reference_read;
size_t old_data = (size_t)entry->data;
entry->data = (void*)(old_data | new_data);