wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Add DXGI_FORMAT_UNKNOWN to the array of vkd3d_format objects.

Browse Source 
This results in a valid format instead of NULL being returned for
buffers and any other case where DXGI_FORMAT_UNKNOWN is specified.
In some cases invalid use of a buffer or DXGI_FORMAT_UNKNOWN will
not result in E_INVALIDARG, and would need to be tested explicitly
if proven to be an issue.

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-18 15:07:55 +10:00
committed by Alexandre Julliard
parent b93edeccfd
commit ecb854c6c1
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/vkd3d/resource.c
View File

@@ -1589,6 +1589,12 @@ static void d3d12_validate_resource_flags(D3D12_RESOURCE_FLAGS flags)
static bool d3d12_resource_validate_texture_format(const D3D12_RESOURCE_DESC *desc,
const struct vkd3d_format *format)
{
if (desc->Format == DXGI_FORMAT_UNKNOWN)
{
WARN("DXGI_FORMAT_UNKNOWN is invalid for textures.\n");
return false;
}
if (!vkd3d_format_is_compressed(format))
return true;
@@ -2273,6 +2279,8 @@ static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device,
}
else if ((format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, view_format)))
{
/* TODO: if view_format is DXGI_FORMAT_UNKNOWN, this is always 1, which
* may not match driver behaviour (return false?). */
element_size = format->byte_count;
}
else