Conor McCarthy : vkd3d: Reject empty descriptor ranges.
Alexandre Julliard
julliard at winehq.org
Wed Oct 13 15:53:07 CDT 2021
Module: vkd3d
Branch: master
Commit: 8239064826f5ebdb256c7095e92bd2c4b4d931c1
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8239064826f5ebdb256c7095e92bd2c4b4d931c1
Author: Conor McCarthy <cmccarthy at codeweavers.com>
Date: Tue Oct 12 23:50:24 2021 +1000
vkd3d: Reject empty descriptor ranges.
Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/state.c | 6 ++++++
tests/d3d12.c | 3 ---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 701af89..3acf042 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -344,6 +344,12 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig
const D3D12_DESCRIPTOR_RANGE *range = &table->pDescriptorRanges[i];
unsigned int binding_count;
+ if (!range->NumDescriptors)
+ {
+ WARN("A descriptor range is empty.\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 1b52aa2..6ae9df3 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -2707,10 +2707,7 @@ static void test_create_root_signature(void)
descriptor_ranges[0].NumDescriptors = 0;
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);
/* descriptor range overflow
* Windows results vary for overflowing to zero, but anything beyond that is invalid. */
More information about the wine-cvs
mailing list