mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Set GetCopyableFootprints total_bytes late. 

Halo Infinite uses &desc->Width for total_bytes.
We can't set total_bytes early because code after this relies on desc->Width.

Signed-off-by: Robin Kertels <robin.kertels@gmail.com>
This commit is contained in:
Robin Kertels 2021-11-15 23:44:24 +01:00 committed by Hans-Kristian Arntzen
parent 3fefc540c8
commit 19a1dce393
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/vkd3d/device.c
View File

@ -4189,8 +4189,8 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(d3d12_device_if
memset(row_counts, 0xff, sizeof(*row_counts) * sub_resource_count); memset(row_counts, 0xff, sizeof(*row_counts) * sub_resource_count);
if (row_sizes) if (row_sizes)
memset(row_sizes, 0xff, sizeof(*row_sizes) * sub_resource_count); memset(row_sizes, 0xff, sizeof(*row_sizes) * sub_resource_count);
if (total_bytes)
*total_bytes = ~(uint64_t)0; total = ~(uint64_t)0;
if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
{ {
@ -4199,13 +4199,13 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(d3d12_device_if
else if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) else if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0)))
{ {
WARN("Invalid format %#x.\n", desc->Format); WARN("Invalid format %#x.\n", desc->Format);
return; goto end;
} }
if (FAILED(d3d12_resource_validate_desc(desc, device))) if (FAILED(d3d12_resource_validate_desc(desc, device)))
{ {
WARN("Invalid resource desc.\n"); WARN("Invalid resource desc.\n");
return; goto end;
} }
num_planes = format->plane_count; num_planes = format->plane_count;
@ -4216,7 +4216,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(d3d12_device_if
|| sub_resource_count > num_subresources - first_sub_resource) || sub_resource_count > num_subresources - first_sub_resource)
{ {
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; goto end;
} }
offset = 0; offset = 0;
@ -4260,6 +4260,8 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(d3d12_device_if
total = offset + size; total = offset + size;
offset = align(total, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); offset = align(total, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
} }
end:
if (total_bytes) if (total_bytes)
*total_bytes = total; *total_bytes = total;
} }