wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Allow D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT only when explicitly requested.

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2019-01-18 10:25:50 +01:00 committed by Alexandre Julliard
parent 8f3db5ecef
commit ec49d3ebd2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/vkd3d/device.c
View File

@ -2077,6 +2077,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour
struct d3d12_device *device = impl_from_ID3D12Device(iface); struct d3d12_device *device = impl_from_ID3D12Device(iface);
const struct vkd3d_format *format; const struct vkd3d_format *format;
const D3D12_RESOURCE_DESC *desc; const D3D12_RESOURCE_DESC *desc;
UINT64 requested_alignment;
UINT64 estimated_size; UINT64 estimated_size;
TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n", TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n",
@ -2101,6 +2102,9 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour
goto invalid; goto invalid;
} }
requested_alignment = desc->Alignment
? desc->Alignment : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
{ {
info->SizeInBytes = desc->Width; info->SizeInBytes = desc->Width;
@ -2114,6 +2118,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour
goto invalid; goto invalid;
} }
info->Alignment = max(info->Alignment, requested_alignment);
if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)
{ {
if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0)))
@ -2124,13 +2130,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour
estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count; estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count;
if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)
{
info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT);
}
else
{
info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT);
}
} }
} }

2
libs/vkd3d/resource.c
View File

@ -1085,6 +1085,8 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc)
return E_INVALIDARG; return E_INVALIDARG;
} }
/* FIXME: Validate alignment for textures. */
return S_OK; return S_OK;
} }