vkd3d: Consider query pool when merging query ranges.

Otherwise, we accidentally merge ranges from different pools if
the indices happen to align.

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2022-01-05 16:57:33 +01:00 committed by Hans-Kristian Arntzen
parent c0a3fa8adc
commit 1354ecabb4
1 changed files with 4 additions and 2 deletions

View File

@ -4121,14 +4121,16 @@ static void d3d12_command_list_insert_query_range(struct d3d12_command_list *lis
if (pos > 0)
{
range = &list->query_ranges[pos - 1];
merge_lo = range->flags == flags
merge_lo = range->vk_pool == vk_pool
&& range->flags == flags
&& range->index + range->count == index;
}
if (pos < list->query_ranges_count)
{
range = &list->query_ranges[pos];
merge_hi = range->flags == flags
merge_hi = range->vk_pool == vk_pool
&& range->flags == flags
&& range->index == index + count;
}