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: Reject overflowing descriptor ranges.

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 2021-10-12 23:50:25 +10:00 committed by Alexandre Julliard
parent 8239064826
commit 832e740248
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/vkd3d/state.c
View File

@ -350,6 +350,13 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig
return E_INVALIDARG;
}
if (range->NumDescriptors != UINT_MAX && !vkd3d_bound_range(range->BaseShaderRegister,
range->NumDescriptors, UINT_MAX))
{
WARN("A descriptor range overflows.\n");
return E_INVALIDARG;
}
if (unbounded && range->OffsetInDescriptorsFromTableStart == D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND)
{
WARN("An unbounded range with offset D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND occurs after "

3
tests/d3d12.c
View File

@ -2715,10 +2715,7 @@ static void test_create_root_signature(void)
descriptor_ranges[0].BaseShaderRegister = 0xfffff001;
root_parameters[0].DescriptorTable.NumDescriptorRanges = 1;
hr = create_root_signature(device, &root_signature_desc, &root_signature);
todo
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr))
ID3D12RootSignature_Release(root_signature);
/* empty root signature */
root_signature_desc.NumParameters = 0;