vkd3d: Return the correct depth/stencil plane format from GetCopyableFootprints().

This commit is contained in:
Conor McCarthy
2024-05-31 10:17:31 +10:00
committed by Henri Verbeet
parent 17adde7f73
commit 1a4dedbc8d
Notes: Henri Verbeet 2025-01-20 16:18:31 +01:00
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/899
2 changed files with 13 additions and 8 deletions

View File

@@ -20294,7 +20294,6 @@ static void check_copyable_footprints_(const char *file, unsigned int line, cons
todo_if(format_is_ds && l->Offset != base_offset + offset)
ok_(file, line)(l->Offset == base_offset + offset,
"Got offset %"PRIu64", expected %"PRIu64".\n", l->Offset, base_offset + offset);
todo_if(format_is_ds)
ok_(file, line)(f->Format == expected_format, "Got format %#x, expected %#x.\n",
f->Format, expected_format);
ok_(file, line)(f->Width == width, "Got width %u, expected %u.\n", f->Width, width);
@@ -20308,11 +20307,8 @@ static void check_copyable_footprints_(const char *file, unsigned int line, cons
ok_(file, line)(row_counts[i] == row_count, "Got row count %u, expected %u.\n", row_counts[i], row_count);
if (row_sizes)
{
todo_if(format_is_ds && (plane_idx || format_size(desc->Format) > 4))
ok_(file, line)(row_sizes[i] == row_size, "Got row size %"PRIu64", expected %u.\n",
row_sizes[i], row_size);
}
size = max(0, row_count - 1) * row_pitch + row_size;
size = max(0, depth - 1) * align(size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT * plane_count) + size;