January 2024 - Wine-commits

Henri Verbeet : vkd3d: Use debugstr_hresult() in d3d12_pipeline_state_find_and_init_uav_counters().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: c5b5621e2897f3917fd4ab9b5d4b368aaeb372af URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5b5621e2897f3917fd4ab9b5d4b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:15:59 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_pipeline_state_find_and_init_uav_counters(). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index c4afa1ed..fed5c7e2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2400,7 +2400,7 @@ static HRESULT d3d12_pipeline_state_find_and_init_uav_counters(struct d3d12_pipe } if (FAILED(hr = d3d12_pipeline_state_init_uav_counters(state, device, root_signature, &shader_info, stage_flags))) - WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); + WARN("Failed to create descriptor set layout for UAV counters, hr %s.\n", debugstr_hresult(hr)); vkd3d_shader_free_scan_descriptor_info(&shader_info);

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in d3d12_pipeline_state_init_compute().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 1599de9a0d77557d4543f7544bd9a4fbe5abc2f9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1599de9a0d77557d4543f7544bd9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:18:14 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_pipeline_state_init_compute(). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index fed5c7e2..2b9d24ba 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2474,7 +2474,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st if (FAILED(hr = vkd3d_create_compute_pipeline(device, &desc->cs, &shader_interface, vk_pipeline_layout, &state->u.compute.vk_pipeline))) { - WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); + WARN("Failed to create Vulkan compute pipeline, hr %s.\n", debugstr_hresult(hr)); d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); return hr; }

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_uav_clear_state_init().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: ad08cbc39032d056fbd7e7bce4744d9cd7de2def URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ad08cbc39032d056fbd7e7bce4744… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:18:54 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_uav_clear_state_init(). --- libs/vkd3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2b9d24ba..5f383d25 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -4028,14 +4028,14 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, 0, 1, false, &set_binding, set_layouts[i].set_layout))) { - ERR("Failed to create descriptor set layout %u, hr %#x.\n", i, hr); + ERR("Failed to create descriptor set layout %u, hr %s.\n", i, debugstr_hresult(hr)); goto fail; } if (FAILED(hr = vkd3d_create_pipeline_layout(device, 1, set_layouts[i].set_layout, 1, &push_constant_range, set_layouts[i].pipeline_layout))) { - ERR("Failed to create pipeline layout %u, hr %#x.\n", i, hr); + ERR("Failed to create pipeline layout %u, hr %s.\n", i, debugstr_hresult(hr)); goto fail; } } @@ -4073,7 +4073,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d vkd3d_shader_free_shader_code(&dxbc); if (FAILED(hr)) { - ERR("Failed to create compute pipeline %u, hr %#x.\n", i, hr); + ERR("Failed to create compute pipeline %u, hr %s.\n", i, debugstr_hresult(hr)); goto fail; } }

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_create_device().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: a86a21667cfbd5c6bd2f62773eb8d5b6059f769a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a86a21667cfbd5c6bd2f62773eb8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:58:52 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_create_device(). --- libs/vkd3d/vkd3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 245edb5a..73c0a6ab 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -60,7 +60,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, } else if (FAILED(hr = vkd3d_create_instance(create_info->instance_create_info, &instance))) { - WARN("Failed to create instance, hr %#x.\n", hr); + WARN("Failed to create instance, hr %s.\n", debugstr_hresult(hr)); return E_FAIL; }

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_serialize_root_signature().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 30113c098dfd85abf1ab97dcb2fa6bdd8b6a1c7e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/30113c098dfd85abf1ab97dcb2fa6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:21:33 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_serialize_root_signature(). --- libs/vkd3d/vkd3d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 73c0a6ab..6758d302 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -456,7 +456,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, if (error_blob && messages) { if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), error_blob))) - ERR("Failed to create error blob, hr %#x.\n", hr); + ERR("Failed to create error blob, hr %s.\n", debugstr_hresult(hr)); } return hresult_from_vkd3d_result(ret); } @@ -464,7 +464,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, if (FAILED(hr = vkd3d_blob_create((void *)dxbc.code, dxbc.size, blob))) { - WARN("Failed to create blob object, hr %#x.\n", hr); + WARN("Failed to create blob object, hr %s.\n", debugstr_hresult(hr)); vkd3d_shader_free_shader_code(&dxbc); } return hr;

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_serialize_versioned_root_signature().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 766f5f039ba4776b5ecda015a54e28976df5dda5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/766f5f039ba4776b5ecda015a54e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:22:14 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_serialize_versioned_root_signature(). --- libs/vkd3d/vkd3d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 6758d302..0139de5d 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -497,7 +497,7 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN if (error_blob && messages) { if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), error_blob))) - ERR("Failed to create error blob, hr %#x.\n", hr); + ERR("Failed to create error blob, hr %s.\n", debugstr_hresult(hr)); } return hresult_from_vkd3d_result(ret); } @@ -505,7 +505,7 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN if (FAILED(hr = vkd3d_blob_create((void *)dxbc.code, dxbc.size, blob))) { - WARN("Failed to create blob object, hr %#x.\n", hr); + WARN("Failed to create blob object, hr %s.\n", debugstr_hresult(hr)); vkd3d_shader_free_shader_code(&dxbc); } return hr;

1 0

Zebediah Figura : include: Add vkd3d_d3d12shader.idl.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: e73ba2a4c34438ca92df916c69963b80beef5c79 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e73ba2a4c34438ca92df916c69963… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 27 20:50:21 2021 -0600 include: Add vkd3d_d3d12shader.idl. --- Makefile.am | 2 + include/vkd3d_d3d12shader.idl | 306 ++++++++++++++++++++++++++++++++++++++++++ include/vkd3d_d3dcommon.idl | 72 ++++++++++ 3 files changed, 380 insertions(+)

1 0

Zebediah Figura : vkd3d-utils: Add D3DReflect().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 53bd1f541969ca51a71545b52faf87a09b1aec6e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/53bd1f541969ca51a71545b52faf8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 27 20:52:29 2021 -0600 vkd3d-utils: Add D3DReflect(). --- Makefile.am | 1 + include/vkd3d_utils.h | 3 + libs/vkd3d-common/blob.c | 1 + libs/vkd3d-utils/reflection.c | 285 +++++++++++++++++++++++++++++++++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_private.h | 1 + 6 files changed, 292 insertions(+)

1 0

Zebediah Figura : vkd3d-utils: Implement input and output signature reflection.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 579e262d98b2761bec8b854bdd1c677dabf6c515 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/579e262d98b2761bec8b854bdd1c6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 17 22:13:01 2024 -0600 vkd3d-utils: Implement input and output signature reflection. --- libs/vkd3d-utils/reflection.c | 59 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index dc235cab..2f604864 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -25,6 +25,8 @@ struct d3d12_reflection { ID3D12ShaderReflection ID3D12ShaderReflection_iface; unsigned int refcount; + + struct vkd3d_shader_scan_signature_info signature_info; }; static struct d3d12_reflection *impl_from_ID3D12ShaderReflection(ID3D12ShaderReflection *iface) @@ -70,6 +72,7 @@ static ULONG STDMETHODCALLTYPE d3d12_reflection_Release(ID3D12ShaderReflection * if (!refcount) { + vkd3d_shader_free_scan_signature_info(&reflection->signature_info); free(reflection); } @@ -80,9 +83,15 @@ static ULONG STDMETHODCALLTYPE d3d12_reflection_Release(ID3D12ShaderReflection * static HRESULT STDMETHODCALLTYPE d3d12_reflection_GetDesc(ID3D12ShaderReflection *iface, D3D12_SHADER_DESC *desc) { + struct d3d12_reflection *reflection = impl_from_ID3D12ShaderReflection(iface); + FIXME("iface %p, desc %p partial stub!\n", iface, desc); - return E_NOTIMPL; + desc->InputParameters = reflection->signature_info.input.element_count; + desc->OutputParameters = reflection->signature_info.output.element_count; + desc->PatchConstantParameters = reflection->signature_info.patch_constant.element_count; + + return S_OK; } static struct ID3D12ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d12_reflection_GetConstantBufferByIndex( @@ -109,20 +118,49 @@ static HRESULT STDMETHODCALLTYPE d3d12_reflection_GetResourceBindingDesc( return E_NOTIMPL; } +static HRESULT get_signature_parameter(const struct vkd3d_shader_signature *signature, + unsigned int index, D3D12_SIGNATURE_PARAMETER_DESC *desc, bool output) +{ + const struct vkd3d_shader_signature_element *e; + + if (!desc || index >= signature->element_count) + { + WARN("Invalid argument specified.\n"); + return E_INVALIDARG; + } + e = &signature->elements[index]; + + desc->SemanticName = e->semantic_name; + desc->SemanticIndex = e->semantic_index; + desc->Register = e->register_index; + desc->SystemValueType = (D3D_NAME)e->sysval_semantic; + desc->ComponentType = (D3D_REGISTER_COMPONENT_TYPE)e->component_type; + desc->Mask = e->mask; + desc->ReadWriteMask = output ? (e->mask & ~e->used_mask) : e->used_mask; + desc->Stream = e->stream_index; + desc->MinPrecision = (D3D_MIN_PRECISION)e->min_precision; + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d12_reflection_GetInputParameterDesc( ID3D12ShaderReflection *iface, UINT index, D3D12_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d12_reflection *reflection = impl_from_ID3D12ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + return get_signature_parameter(&reflection->signature_info.input, index, desc, false); } static HRESULT STDMETHODCALLTYPE d3d12_reflection_GetOutputParameterDesc( ID3D12ShaderReflection *iface, UINT index, D3D12_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d12_reflection *reflection = impl_from_ID3D12ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + return get_signature_parameter(&reflection->signature_info.output, index, desc, true); } static HRESULT STDMETHODCALLTYPE d3d12_reflection_GetPatchConstantParameterDesc( @@ -251,10 +289,19 @@ static const struct ID3D12ShaderReflectionVtbl d3d12_reflection_vtbl = static HRESULT d3d12_reflection_init(struct d3d12_reflection *reflection, const void *data, size_t data_size) { + struct vkd3d_shader_compile_info compile_info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO}; + reflection->ID3D12ShaderReflection_iface.lpVtbl = &d3d12_reflection_vtbl; reflection->refcount = 1; - return S_OK; + compile_info.source.code = data; + compile_info.source.size = data_size; + compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + + compile_info.next = &reflection->signature_info; + reflection->signature_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_SIGNATURE_INFO; + + return hresult_from_vkd3d_result(vkd3d_shader_scan(&compile_info, NULL)); } HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID iid, void **reflection)

1 0

Zebediah Figura : tests: Test VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: d1be80e08d28507962b0bc19243ef9933821525e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d1be80e08d28507962b0bc19243ef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 6 19:00:55 2024 -0600 tests: Test VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES. --- tests/vkd3d_shader_api.c | 59 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 018506a4..00dcd224 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -441,6 +441,7 @@ static void test_scan_signatures(void) struct vkd3d_shader_scan_signature_info signature_info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_SIGNATURE_INFO}; struct vkd3d_shader_hlsl_source_info hlsl_info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO}; struct vkd3d_shader_compile_info compile_info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO}; + struct vkd3d_shader_compile_option options[1]; struct vkd3d_shader_code dxbc; size_t i, j; int rc; @@ -496,6 +497,11 @@ static void test_scan_signatures(void) {"position", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, }; + static const struct vkd3d_shader_signature_element vs2_legacy_outputs[] = + { + {"SV_Position", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, + }; + static const char vs3_source[] = "void main(\n" " in float4 c : position,\n" @@ -656,6 +662,27 @@ static void test_scan_signatures(void) {"VFACE", 0, 0, VKD3D_SHADER_SV_IS_FRONT_FACE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0x1, 0x1}, }; + static const char ps5_source[] = + "void main(\n" + " inout float4 a : color2,\n" + " inout float b : depth,\n" + " in float4 c : position)\n" + "{\n" + "}"; + + static const struct vkd3d_shader_signature_element ps5_inputs[] = + { + {"color", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, + {"depth", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0x1, 0x1}, + {"SV_Position", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf}, + }; + + static const struct vkd3d_shader_signature_element ps5_outputs[] = + { + {"SV_Target", 2, 0, VKD3D_SHADER_SV_TARGET, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, + {"SV_Depth", 0, 0, VKD3D_SHADER_SV_DEPTH, VKD3D_SHADER_COMPONENT_FLOAT, ~0u, 0x1, 0x1}, + }; + static const char cs1_source[] = "[numthreads(1, 1, 1)]\n" "void main(\n" @@ -670,6 +697,7 @@ static void test_scan_signatures(void) const char *source; bool sm4; const char *profile; + bool compat; const struct vkd3d_shader_signature_element *inputs; size_t input_count; const struct vkd3d_shader_signature_element *outputs; @@ -679,16 +707,20 @@ static void test_scan_signatures(void) } tests[] = { - {vs1_source, true, "vs_4_0", vs1_inputs, ARRAY_SIZE(vs1_inputs), vs1_outputs, ARRAY_SIZE(vs1_outputs)}, - {vs2_source, true, "vs_4_0", vs2_inputs, ARRAY_SIZE(vs2_inputs), vs2_outputs, ARRAY_SIZE(vs2_outputs)}, - {vs3_source, false, "vs_1_1", vs3_inputs, ARRAY_SIZE(vs3_inputs), vs3_outputs, ARRAY_SIZE(vs3_outputs)}, - {vs3_source, false, "vs_2_0", vs3_inputs, ARRAY_SIZE(vs3_inputs), vs3_outputs, ARRAY_SIZE(vs3_outputs)}, - {vs4_source, false, "vs_3_0", vs4_inputs, ARRAY_SIZE(vs4_inputs), vs4_outputs, ARRAY_SIZE(vs4_outputs)}, - {ps1_source, true, "ps_4_0", ps1_inputs, ARRAY_SIZE(ps1_inputs), ps1_outputs, ARRAY_SIZE(ps1_outputs)}, - {ps2_source, false, "ps_1_1", ps2_inputs, ARRAY_SIZE(ps2_inputs), ps2_outputs, ARRAY_SIZE(ps2_outputs)}, - {ps3_source, false, "ps_2_0", ps3_inputs, ARRAY_SIZE(ps3_inputs), ps3_outputs, ARRAY_SIZE(ps3_outputs)}, - {ps4_source, false, "ps_3_0", ps4_inputs, ARRAY_SIZE(ps4_inputs), ps3_outputs, ARRAY_SIZE(ps3_outputs)}, - {cs1_source, true, "cs_5_0", NULL, 0, NULL, 0}, + {vs1_source, true, "vs_4_0", false, vs1_inputs, ARRAY_SIZE(vs1_inputs), vs1_outputs, ARRAY_SIZE(vs1_outputs)}, + {vs1_source, true, "vs_4_0", true, vs1_inputs, ARRAY_SIZE(vs1_inputs), vs1_outputs, ARRAY_SIZE(vs1_outputs)}, + {vs2_source, true, "vs_4_0", false, vs2_inputs, ARRAY_SIZE(vs2_inputs), vs2_outputs, ARRAY_SIZE(vs2_outputs)}, + {vs2_source, true, "vs_4_0", true, vs2_inputs, ARRAY_SIZE(vs2_inputs), vs2_legacy_outputs, ARRAY_SIZE(vs2_legacy_outputs)}, + {ps1_source, true, "ps_4_0", false, ps1_inputs, ARRAY_SIZE(ps1_inputs), ps1_outputs, ARRAY_SIZE(ps1_outputs)}, + {ps5_source, true, "ps_4_0", true, ps5_inputs, ARRAY_SIZE(ps5_inputs), ps5_outputs, ARRAY_SIZE(ps5_outputs)}, + {cs1_source, true, "cs_5_0", false, NULL, 0, NULL, 0}, + + {vs3_source, false, "vs_1_1", false, vs3_inputs, ARRAY_SIZE(vs3_inputs), vs3_outputs, ARRAY_SIZE(vs3_outputs)}, + {vs3_source, false, "vs_2_0", false, vs3_inputs, ARRAY_SIZE(vs3_inputs), vs3_outputs, ARRAY_SIZE(vs3_outputs)}, + {vs4_source, false, "vs_3_0", false, vs4_inputs, ARRAY_SIZE(vs4_inputs), vs4_outputs, ARRAY_SIZE(vs4_outputs)}, + {ps2_source, false, "ps_1_1", false, ps2_inputs, ARRAY_SIZE(ps2_inputs), ps2_outputs, ARRAY_SIZE(ps2_outputs)}, + {ps3_source, false, "ps_2_0", false, ps3_inputs, ARRAY_SIZE(ps3_inputs), ps3_outputs, ARRAY_SIZE(ps3_outputs)}, + {ps4_source, false, "ps_3_0", false, ps4_inputs, ARRAY_SIZE(ps4_inputs), ps3_outputs, ARRAY_SIZE(ps3_outputs)}, }; for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -700,6 +732,13 @@ static void test_scan_signatures(void) compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; compile_info.target_type = tests[i].sm4 ? VKD3D_SHADER_TARGET_DXBC_TPF : VKD3D_SHADER_TARGET_D3D_BYTECODE; compile_info.log_level = VKD3D_SHADER_LOG_INFO; + compile_info.options = options; + compile_info.option_count = 1; + + options[0].name = VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY; + options[0].value = 0; + if (tests[i].compat) + options[0].value = VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; compile_info.next = &hlsl_info; hlsl_info.profile = tests[i].profile;

1 0