wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Handle depth/stencil planes in GetCopyableFootprints().

Browse Source 
Signed-off-by: Conor McCarthy <cmccarthy@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Conor McCarthy 2022-01-11 00:01:34 +10:00 committed by Alexandre Julliard
parent c6e46f84df
commit 2566b8dd8c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/vkd3d/device.c
View File

@ -3660,7 +3660,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i
= {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0};
unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch;
unsigned int width, height, depth, array_size; unsigned int width, height, depth, plane_count, sub_resources_per_plane;
const struct vkd3d_format *format; const struct vkd3d_format *format;
uint64_t offset, size, total; uint64_t offset, size, total;
@ -3694,9 +3694,11 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i
return; return;
} }
array_size = d3d12_resource_desc_get_layer_count(desc); plane_count = ((format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT)
&& (format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) ? 2 : 1;
sub_resources_per_plane = d3d12_resource_desc_get_sub_resource_count(desc);
if (!vkd3d_bound_range(first_sub_resource, sub_resource_count, desc->MipLevels * array_size)) if (!vkd3d_bound_range(first_sub_resource, sub_resource_count, sub_resources_per_plane * plane_count))
{ {
WARN("Invalid sub-resource range %u-%u for resource.\n", first_sub_resource, sub_resource_count); WARN("Invalid sub-resource range %u-%u for resource.\n", first_sub_resource, sub_resource_count);
return; return;
@ -3706,7 +3708,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i
total = 0; total = 0;
for (i = 0; i < sub_resource_count; ++i) for (i = 0; i < sub_resource_count; ++i)
{ {
sub_resource_idx = first_sub_resource + i; sub_resource_idx = (first_sub_resource + i) % sub_resources_per_plane;
miplevel_idx = sub_resource_idx % desc->MipLevels; miplevel_idx = sub_resource_idx % desc->MipLevels;
width = align(d3d12_resource_desc_get_width(desc, miplevel_idx), format->block_width); width = align(d3d12_resource_desc_get_width(desc, miplevel_idx), format->block_width);
height = align(d3d12_resource_desc_get_height(desc, miplevel_idx), format->block_height); height = align(d3d12_resource_desc_get_height(desc, miplevel_idx), format->block_height);

6
tests/d3d12.c
View File

@ -19550,11 +19550,9 @@ static void test_get_copyable_footprints(void)
sub_resource_count *= resource_desc.DepthOrArraySize; sub_resource_count *= resource_desc.DepthOrArraySize;
if (resource_desc.Format == DXGI_FORMAT_D24_UNORM_S8_UINT) if (resource_desc.Format == DXGI_FORMAT_D24_UNORM_S8_UINT)
{ {
/* FIXME: we require D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL here for DS formats but windows doesn't. */
if (!vkd3d_test_platform_is_windows()) if (!vkd3d_test_platform_is_windows())
{ resource_desc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;
skip("Depth/stencil planes are not supported.\n");
continue;
}
sub_resource_count *= 2; sub_resource_count *= 2;
} }
assert(sub_resource_count <= ARRAY_SIZE(layouts)); assert(sub_resource_count <= ARRAY_SIZE(layouts));