[PATCH vkd3d v2 3/3] vkd3d: Reject overflowing descriptor ranges.
Conor McCarthy
cmccarthy at codeweavers.com
Tue Oct 12 08:50:25 CDT 2021
Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
v2: Warning wording.
---
libs/vkd3d/state.c | 7 +++++++
tests/d3d12.c | 3 ---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 92978a1b..094530b8 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -351,6 +351,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 "
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 775fabff..70f73b79 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -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;
--
2.32.0
More information about the wine-devel
mailing list