wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Conor McCarthy : vkd3d: Create and write descriptor sets for root signature unbounded ranges.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: 104626cc1d91d0a3568b8bc17ab782ebf062b858 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=104626cc1d91d0a3568b8bc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Oct 6 18:43:30 2021 +0200 vkd3d: Create and write descriptor sets for root signature unbounded ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 120 ++++++++++++++++++++++++------ libs/vkd3d/device.c | 114 ++++++++++++++++++++++++++++ libs/vkd3d/resource.c | 9 +++ libs/vkd3d/state.c | 181 +++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 40 +++++++++- tests/d3d12.c | 18 ++--- 6 files changed, 424 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=104626cc1d91d0a3568…

1 0

Conor McCarthy : vkd3d: Reject descriptor tables containing register collisions.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: d3090699c5996ad596b4b773deb0d0ffc5d18093 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d3090699c5996ad596b4b77… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Oct 6 18:43:29 2021 +0200 vkd3d: Reject descriptor tables containing register collisions. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 37 +++++++++++++++++++++++++++++++++++++ tests/d3d12.c | 4 +--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ffb3e2f..990b49b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -662,6 +662,39 @@ static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_r return S_OK; } +static int compare_register_range(const void *a, const void *b) +{ + const struct d3d12_root_descriptor_table_range *range_a = a, *range_b = b; + int ret; + + if ((ret = range_a->type - range_b->type)) + return ret; + + if ((ret = range_a->register_space - range_b->register_space)) + return ret; + + return range_a->base_register_idx - range_b->base_register_idx; +} + +static HRESULT validate_descriptor_register_ranges(const struct d3d12_root_descriptor_table_range *ranges, + unsigned int count) +{ + const struct d3d12_root_descriptor_table_range *range, *prev; + unsigned int i; + + for (i = 1; i < count; ++i) + { + range = &ranges[i]; + prev = &ranges[i - 1]; + + if (range->type == prev->type && range->register_space == prev->register_space + && range->base_register_idx - prev->base_register_idx < prev->descriptor_count) + return E_INVALIDARG; + } + + return S_OK; +} + static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_root_signature *root_signature, const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_descriptor_set_context *context) { @@ -715,6 +748,10 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo offset += range->NumDescriptors; } + qsort(table->ranges, range_count, sizeof(*table->ranges), compare_register_range); + if (FAILED(hr = validate_descriptor_register_ranges(table->ranges, range_count))) + return hr; + for (j = 0; j < range_count; ++j) { struct d3d12_root_descriptor_table_range *range; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5dea781..57c39d2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2674,9 +2674,7 @@ static void test_create_root_signature(void) descriptor_ranges[1].BaseShaderRegister = 7; descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 8; 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); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* Identical ranges and register indices but different type. */ descriptor_ranges[1] = descriptor_ranges[0];

1 0

Conor McCarthy : vkd3d: Reject OFFSET_APPEND after unbounded ranges in d3d12_root_signature_info_count_descriptors().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: c5fdd2f404c2cf6103e3d245795c7fdab3aa3986 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c5fdd2f404c2cf6103e3d24… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Oct 6 18:43:28 2021 +0200 vkd3d: Reject OFFSET_APPEND after unbounded ranges in d3d12_root_signature_info_count_descriptors(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 17 ++++++++++++++--- tests/d3d12.c | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9e554b4..ffb3e2f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -325,6 +325,7 @@ struct d3d12_root_signature_info static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, const D3D12_ROOT_DESCRIPTOR_TABLE *table, bool use_array) { + bool unbounded = false; unsigned int i; for (i = 0; i < table->NumDescriptorRanges; ++i) @@ -332,12 +333,16 @@ 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 == 0xffffffff) + if (unbounded && range->OffsetInDescriptorsFromTableStart == D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) { - FIXME("Unhandled unbound descriptor range.\n"); - return E_NOTIMPL; + WARN("An unbounded range with offset D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND occurs after " + "another unbounded range.\n"); + return E_INVALIDARG; } + if (range->NumDescriptors == UINT_MAX) + unbounded = true; + binding_count = use_array ? 1 : range->NumDescriptors; switch (range->RangeType) @@ -365,6 +370,12 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig info->binding_count += binding_count; } + if (unbounded) + { + FIXME("Unhandled unbounded descriptor range.\n"); + return E_NOTIMPL; + } + return S_OK; } diff --git a/tests/d3d12.c b/tests/d3d12.c index 74b4877..5dea781 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2814,7 +2814,7 @@ static void test_create_root_signature(void) * D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND. */ descriptor_ranges[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* A bounded range overlapping an unbounded one, mapped to the same * register space and type. */

1 0

Henri Verbeet : tests: Add root signature tests for unbounded descriptor ranges.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: 441d8e24b2318225c0418c7fb71b051d42f279b8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=441d8e24b2318225c0418c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 6 18:43:27 2021 +0200 tests: Add root signature tests for unbounded descriptor ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0b02e10..74b4877 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2777,6 +2777,83 @@ static void test_create_root_signature(void) refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + /* Unbounded descriptor ranges. */ + + /* A bounded range overlapping an unbounded one, mapped to a different + * register space of the same type. */ + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_ranges[0].NumDescriptors = UINT_MAX; + descriptor_ranges[0].BaseShaderRegister = 0; + descriptor_ranges[0].RegisterSpace = 0; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0; + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_ranges[1].NumDescriptors = 1; + descriptor_ranges[1].BaseShaderRegister = 16; + descriptor_ranges[1].RegisterSpace = 1; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 16; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 2; + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == S_OK || (binding_tier == D3D12_RESOURCE_BINDING_TIER_1 && (hr == E_FAIL || hr == E_INVALIDARG)), + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + + /* A bounded range overlapping an unbounded one, mapped to a different + * register space of the same type. Using + * D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND. */ + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* A bounded range overlapping an unbounded one, mapped to the same + * register space and type. */ + descriptor_ranges[1].RegisterSpace = 0; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 16; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* A bounded range overlapping an unbounded one, mapped to the same + * register space, but a different type. */ + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == S_OK || (binding_tier <= D3D12_RESOURCE_BINDING_TIER_2 && (hr == E_FAIL || hr == E_INVALIDARG)), + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + + /* An unbounded range overlapping another unbounded range, mapped to the + * same register space and type. */ + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_ranges[1].NumDescriptors = UINT_MAX; + 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); + + /* And unbounded range overlapping a bounded one, mapped to the same + * register space and type. */ + descriptor_ranges[0].NumDescriptors = 16; + descriptor_ranges[1].BaseShaderRegister = 0; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 15; + 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); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Conor McCarthy : tests: Add root signature tests for descriptor register range collisions.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: 39ec44f345d39144a4f895f2dfb7f844e1530fad URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=39ec44f345d39144a4f895f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Oct 6 18:43:26 2021 +0200 tests: Add root signature tests for descriptor register range collisions. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 009f833..0b02e10 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -584,6 +584,21 @@ static bool is_shader_float64_supported(ID3D12Device *device) return options.DoublePrecisionFloatShaderOps; } +static D3D12_RESOURCE_BINDING_TIER get_resource_binding_tier(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return D3D12_RESOURCE_BINDING_TIER_1; + } + + return options.ResourceBindingTier; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -2590,6 +2605,7 @@ static void test_create_root_signature(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_DESCRIPTOR_RANGE descriptor_ranges[2]; + D3D12_RESOURCE_BINDING_TIER binding_tier; D3D12_ROOT_PARAMETER root_parameters[3]; ID3D12RootSignature *root_signature; ID3D12Device *device, *tmp_device; @@ -2602,6 +2618,11 @@ static void test_create_root_signature(void) return; } + /* Tier 2 is required for unbounded SRVs and Tier > 2 for unbounded CBVs and UAVs + * due to the need for partial binding support. It is also required for overlapping + * ranges of different types. */ + binding_tier = get_resource_binding_tier(device); + /* descriptor table */ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; descriptor_ranges[0].NumDescriptors = 1; @@ -2637,6 +2658,35 @@ static void test_create_root_signature(void) refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + /* Overlapping ranges but unique register indices. */ + descriptor_ranges[0].NumDescriptors = 8; + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_ranges[1].NumDescriptors = 2; + descriptor_ranges[1].BaseShaderRegister = 8; + descriptor_ranges[1].RegisterSpace = 0; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 7; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 2; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + ID3D12RootSignature_Release(root_signature); + + /* Separate ranges with ambiguous register indices. */ + descriptor_ranges[1].BaseShaderRegister = 7; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 8; + 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); + + /* Identical ranges and register indices but different type. */ + descriptor_ranges[1] = descriptor_ranges[0]; + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK || (binding_tier <= D3D12_RESOURCE_BINDING_TIER_2 && (hr == E_FAIL || hr == E_INVALIDARG)), + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + /* sampler and SRV in the same descriptor table */ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER; descriptor_ranges[1].NumDescriptors = 1;

1 0

Henri Verbeet : vkd3d-shader/sm1: Add support for vkd3d_shader_scan().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: b5a7abbfa6c8cca5cf7ae83fe3b8fc5d2ddbd8d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b5a7abbfa6c8cca5cf7ae83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 6 17:11:49 2021 +0200 vkd3d-shader/sm1: Add support for vkd3d_shader_scan(). Nominally, at least. Not all of the early shader models explicitly declare resources and samplers, so those may currently get missed for those. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 51 ++++++++++++++++++++++++++++------- tests/vkd3d_shader_api.c | 3 +++ 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6c9301c..d204533 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -928,13 +928,12 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte return VKD3D_OK; } -static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_message_context *message_context) +static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser *parser) { struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; struct vkd3d_shader_instruction instruction; struct vkd3d_shader_scan_context context; - struct vkd3d_shader_parser *parser; int ret; if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO))) @@ -945,12 +944,6 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, vkd3d_shader_scan_context_init(&context, compile_info, scan_descriptor_info, message_context); - if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) - { - vkd3d_shader_scan_context_cleanup(&context); - return ret; - } - if (TRACE_ON()) { vkd3d_shader_trace(parser); @@ -982,7 +975,42 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, done: vkd3d_shader_scan_context_cleanup(&context); + return ret; +} + +static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_shader_parser *parser; + int ret; + + if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) + { + WARN("Failed to initialise shader parser.\n"); + return ret; + } + + ret = scan_with_parser(compile_info, message_context, parser); + vkd3d_shader_parser_destroy(parser); + + return ret; +} + +static int scan_d3dbc(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_shader_parser *parser; + int ret; + + if ((ret = vkd3d_shader_sm1_parser_create(compile_info, message_context, &parser)) < 0) + { + WARN("Failed to initialise shader parser.\n"); + return ret; + } + + ret = scan_with_parser(compile_info, message_context, parser); vkd3d_shader_parser_destroy(parser); + return ret; } @@ -1012,6 +1040,10 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char ret = VKD3D_ERROR_NOT_IMPLEMENTED; break; + case VKD3D_SHADER_SOURCE_D3D_BYTECODE: + ret = scan_d3dbc(compile_info, &message_context); + break; + default: ERR("Unsupported source type %#x.\n", compile_info->source_type); ret = VKD3D_ERROR_INVALID_ARGUMENT; @@ -1045,6 +1077,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) { + WARN("Failed to initialise shader parser.\n"); vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; } diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index c9045b8..6fb855c 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -274,6 +274,9 @@ static void test_d3dbc(void) (int)d3d_asm.size, (char *)d3d_asm.code); vkd3d_shader_free_shader_code(&d3d_asm); + rc = vkd3d_shader_scan(&info, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + info.source.size = sizeof(vs_minimal) + 1; rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc);

1 0

Henri Verbeet : vkd3d-shader/sm1: Introduce a parser for the legacy D3D byte-code format.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: f7662f9878f6e7c2950a5e876682126cb5a735e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f7662f9878f6e7c2950a5e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 6 17:11:48 2021 +0200 vkd3d-shader/sm1: Introduce a parser for the legacy D3D byte-code format. This is largely derived from the parser in Wine/wined3d, as of wine-6.18. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + include/private/vkd3d_debug.h | 1 + include/vkd3d_shader.h | 5 + libs/vkd3d-common/debug.c | 18 +- libs/vkd3d-shader/d3dbc.c | 958 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 50 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 12 + programs/vkd3d-compiler/main.c | 4 + tests/vkd3d_shader_api.c | 89 +++ 9 files changed, 1133 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f7662f9878f6e7c2950…

1 0

Henri Verbeet : vkd3d-shader: Introduce struct vkd3d_shader_parser_ops.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: 28316b2694601a49623d9bc7bda3d422739e456c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=28316b2694601a49623d9bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 6 17:11:47 2021 +0200 vkd3d-shader: Introduce struct vkd3d_shader_parser_ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 182 ++++++++++++++++--------------- libs/vkd3d-shader/glsl.c | 4 +- libs/vkd3d-shader/trace.c | 6 +- libs/vkd3d-shader/vkd3d_shader_main.c | 18 ++- libs/vkd3d-shader/vkd3d_shader_private.h | 39 +++++-- 5 files changed, 138 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=28316b2694601a49623…

1 0

Henri Verbeet : vkd3d-shader: Introduce vkd3d_shader_parser_error().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: f5c6f2ea0edcbab979d9ec003eaf8b540aa6c266 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f5c6f2ea0edcbab979d9ec0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 6 17:11:46 2021 +0200 vkd3d-shader: Introduce vkd3d_shader_parser_error(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 18 +++--------------- libs/vkd3d-shader/vkd3d_shader_main.c | 12 ++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 527f69b..656c982 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -175,18 +175,6 @@ static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *sm4) return version->major >= 5 && version->minor >= 1; } -static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *sm4, - enum vkd3d_shader_error error, const char *format, ...) -{ - va_list args; - - va_start(args, format); - vkd3d_shader_verror(sm4->p.message_context, &sm4->p.location, error, format, args); - va_end(args); - - sm4->p.failed = true; -} - static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, @@ -246,15 +234,15 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, ui ins->declaration.icb = &priv->icb; } -static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_parser *priv, +static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_parser *sm4, struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) { range->first = reg->idx[1].offset; - range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 1].offset; + range->last = reg->idx[shader_is_sm_5_1(sm4) ? 2 : 1].offset; if (range->last < range->first) { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); - shader_sm4_error(priv, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE, + vkd3d_shader_parser_error(&sm4->p, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE, "Last register %u must not be less than first register %u in range.\n", range->last, range->first); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 696c332..c30a375 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -378,6 +378,18 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) shader_sm4_free(parser); } +void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(parser->message_context, &parser->location, error, format, args); + va_end(args); + + parser->failed = true; +} + static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, bool validate_target_type) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ba17d29..97048ea 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -904,6 +904,8 @@ struct vkd3d_shader_parser const uint32_t *ptr; }; +void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vkd3d_shader_message_context *message_context, const char *source_name, const struct vkd3d_shader_version *version);

1 0

Henri Verbeet : vkd3d-shader/sm4: Set an error state when shader_sm4_error() is called.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: a0c2e52b4b4c0d191677397d3030a2f0da565af9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a0c2e52b4b4c0d191677397… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 6 17:11:45 2021 +0200 vkd3d-shader/sm4: Set an error state when shader_sm4_error() is called. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 3 +++ libs/vkd3d-shader/glsl.c | 4 ++-- libs/vkd3d-shader/trace.c | 3 +++ libs/vkd3d-shader/vkd3d_shader_main.c | 5 ++++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e9b8954..527f69b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -183,6 +183,8 @@ static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_par va_start(args, format); vkd3d_shader_verror(sm4->p.message_context, &sm4->p.location, error, format, args); va_end(args); + + sm4->p.failed = true; } static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, @@ -1665,6 +1667,7 @@ void shader_sm4_reset(struct vkd3d_shader_parser *parser) struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); parser->ptr = sm4->start; + parser->failed = false; } int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 9858098..b90a5d9 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -114,8 +114,8 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_glsl_handle_instruction(generator, &ins); } - if (generator->failed) - return VKD3D_ERROR; + if (parser->failed || generator->failed) + return VKD3D_ERROR_INVALID_SHADER; vkd3d_string_buffer_printf(&generator->buffer, "}\n"); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 2858c7f..5710424 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1937,6 +1937,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, } } + if (parser->failed) + result = VKD3D_ERROR_INVALID_SHADER; + if ((code = vkd3d_malloc(buffer->content_size))) { memcpy(code, buffer->buffer, buffer->content_size); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f02514b..696c332 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -958,7 +958,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, } } - ret = VKD3D_OK; + ret = parser->failed ? VKD3D_ERROR_INVALID_SHADER : VKD3D_OK; done: vkd3d_shader_scan_context_cleanup(&context); @@ -1084,6 +1084,9 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info break; } + if (parser->failed) + ret = VKD3D_ERROR_INVALID_SHADER; + if (ret >= 0) ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, compile_info, out); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f937ff5..ba17d29 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -897,6 +897,7 @@ struct vkd3d_shader_parser { struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_location location; + bool failed; struct vkd3d_shader_desc shader_desc; struct vkd3d_shader_version shader_version;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021