February 2024 - Wine-Commits

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_load().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 4c7d956bdb4e5d5b12802ad0b0f85f85cbd83fb3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c7d956bdb4e5d5b12802ad0b0f85… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:13:57 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_load(). --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index fdaabc92..ea0e434f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5114,7 +5114,8 @@ static void sm6_parser_emit_load(struct sm6_parser *sm6, const struct dxil_recor vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); - src_param = instruction_src_params_alloc(ins, 1, sm6); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; src_param_init_from_value(&src_param[0], ptr); src_param->reg.alignment = alignment;

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_store().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: c89627ec73dde18db3b191eb42d44fe73c2aae71 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c89627ec73dde18db3b191eb42d44… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:14:10 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_store(). --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index ea0e434f..f465deb7 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5274,7 +5274,8 @@ static void sm6_parser_emit_store(struct sm6_parser *sm6, const struct dxil_reco vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); - src_param = instruction_src_params_alloc(ins, 1, sm6); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; src_param_init_from_value(&src_param[0], src); dst_param = instruction_dst_params_alloc(ins, 1, sm6);

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_vselect().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 55c28e94f8c1be43c7c4efbec7f3d1e76c15eb13 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/55c28e94f8c1be43c7c4efbec7f3d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:14:22 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_vselect(). --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index f465deb7..33d30aef 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5395,7 +5395,8 @@ static void sm6_parser_emit_vselect(struct sm6_parser *sm6, const struct dxil_re vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOVC); - src_params = instruction_src_params_alloc(ins, 3, sm6); + if (!(src_params = instruction_src_params_alloc(ins, 3, sm6))) + return; for (i = 0; i < 3; ++i) src_param_init_from_value(&src_params[i], src[i]);

1 0

Conor McCarthy : vkd3d-shader: Raise the instruction parameter allocation size if necessary.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 6e634ad6902000363788cb0a4baad4e00e4389c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6e634ad6902000363788cb0a4baad… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 9 12:02:13 2024 +1000 vkd3d-shader: Raise the instruction parameter allocation size if necessary. Monolithic switch instructions have no definite case count limit. --- libs/vkd3d-shader/vkd3d_shader_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 1ef8d949..ebabf50e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -2048,9 +2048,12 @@ void *shader_param_allocator_get(struct vkd3d_shader_param_allocator *allocator, if (count > allocator->count - allocator->index) { - struct vkd3d_shader_param_node *next = shader_param_allocator_node_create(allocator); + struct vkd3d_shader_param_node *next; - if (!next) + /* Monolithic switch has no definite parameter count limit. */ + allocator->count = max(allocator->count, count); + + if (!(next = shader_param_allocator_node_create(allocator))) return NULL; if (allocator->current) allocator->current->next = next;

1 0

Conor McCarthy : tests/shader-runner: Add a 64-bit switch test.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 7d51a7d99caf7e0ff0c176fd2673c25744f30351 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d51a7d99caf7e0ff0c176fd2673c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 16:50:39 2024 +1000 tests/shader-runner: Add a 64-bit switch test. --- tests/hlsl/switch.shader_test | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test index 274822f4..ddfeca31 100644 --- a/tests/hlsl/switch.shader_test +++ b/tests/hlsl/switch.shader_test @@ -616,3 +616,36 @@ if(sm<4) uniform 0 float4 1 0 3 1 if(sm>=4) uniform 0 uint4 1 0 3 1 draw quad probe all rgba (3.0, 4.0, 5.0, 6.0) + +[require] +shader model >= 6.0 + +[pixel shader] +uint64_t2 v; + +float4 main() : sv_target +{ + // Need three cases because dxcompiler optimises two case values to a pair of vselect instructions. + switch (v.x) + { + case 0: + return 3.0; + case 0x100000002: + return 4.0; + case 3: + return 2.0; + default: + return 5.0; + } +} + +[test] +uniform 0 uint64_t2 2 0 +draw quad +probe all rgba (5.0, 5.0, 5.0, 5.0) +uniform 0 uint64_t2 0x100000002 0 +draw quad +probe all rgba (4.0, 4.0, 4.0, 4.0) +uniform 0 uint64_t2 0 0 +draw quad +probe all rgba (3.0, 3.0, 3.0, 3.0)

1 0

Henri Verbeet : tests/shader_runner: Allow UAV resources to be created without initial data.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: f614d987598afd65522fd703df9c80839286a0fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f614d987598afd65522fd703df9c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 12 20:27:52 2024 +0100 tests/shader_runner: Allow UAV resources to be created without initial data. We can e.g. initialise these with a shader. --- tests/shader_runner_d3d12.c | 21 +++++++++++++-------- tests/shader_runner_vulkan.c | 9 +++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 16cfec1b..e08a953e 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -130,6 +130,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co D3D12_SUBRESOURCE_DATA resource_data[2]; struct d3d12_resource *resource; unsigned int buffer_offset = 0; + D3D12_RESOURCE_STATES state; if (params->level_count > ARRAY_SIZE(resource_data)) fatal_error("Level count %u is too high.\n", params->level_count); @@ -185,14 +186,18 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co runner->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); - resource->resource = create_default_texture2d(device, params->width, params->height, 1, params->level_count, - params->format, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_texture_data_with_states(resource->resource, resource_data, - params->level_count, test_context->queue, test_context->list, - RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - reset_command_list(test_context->list, test_context->allocator); - ID3D12Device_CreateUnorderedAccessView(device, resource->resource, - NULL, NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); + state = params->data ? D3D12_RESOURCE_STATE_COPY_DEST : D3D12_RESOURCE_STATE_UNORDERED_ACCESS; + resource->resource = create_default_texture2d(device, params->width, params->height, 1, + params->level_count, params->format, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, state); + if (params->data) + { + upload_texture_data_with_states(resource->resource, resource_data, + params->level_count, test_context->queue, test_context->list, + RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + reset_command_list(test_context->list, test_context->allocator); + } + ID3D12Device_CreateUnorderedAccessView(device, resource->resource, NULL, NULL, + get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); break; case RESOURCE_TYPE_BUFFER_UAV: diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 0aa61107..96e462af 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -310,6 +310,15 @@ static struct resource *vulkan_runner_create_resource(struct shader_runner *r, c usage, format, &resource->memory); resource->image_view = create_2d_image_view(runner, resource->image, format); + if (!params->data) + { + begin_command_buffer(runner); + transition_image_layout(runner, resource->image, + VK_IMAGE_LAYOUT_UNDEFINED, layout); + end_command_buffer(runner); + break; + } + staging_buffer = create_buffer(runner, params->data_size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_memory); VK_CALL(vkMapMemory(device, staging_memory, 0, VK_WHOLE_SIZE, 0, &data));

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_split_double().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: d04a8ea893683215678b7674b0ee8b76d93cfb3f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d04a8ea893683215678b7674b0ee8… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:12:46 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_split_double(). --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index fe0d631d..b8241345 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4170,7 +4170,8 @@ static void sm6_parser_emit_dx_split_double(struct sm6_parser *sm6, enum dx_intr struct vkd3d_shader_src_param *src_param; vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); - src_param = instruction_src_params_alloc(ins, 1, sm6); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; src_param_init_from_value(src_param, operands[0]); instruction_dst_param_init_ssa_vector(ins, 2, sm6);

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_cmp2().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 3c1ad054f0a34048625b2e5cdec2a2843bd3e535 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3c1ad054f0a34048625b2e5cdec2a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:13:30 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_cmp2(). --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index ac8c0ac9..a175875b 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4903,7 +4903,8 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor "Ignoring flags %#"PRIx64" for a comparison operation.", flags); } - src_params = instruction_src_params_alloc(ins, 2, sm6); + if (!(src_params = instruction_src_params_alloc(ins, 2, sm6))) + return; src_param_init_from_value(&src_params[0 ^ cmp->src_swap], a); src_param_init_from_value(&src_params[1 ^ cmp->src_swap], b);

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_buffer_load().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: cc5293bb4f47116c164dcfd6efb735c58acd8d56 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cc5293bb4f47116c164dcfd6efb73… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:12:11 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_buffer_load(). --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e57bd1ea..47c5c788 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4047,7 +4047,8 @@ static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intri instruction_init_with_resource(ins, (resource->u.handle.d->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) ? VKD3DSIH_LD_UAV_TYPED : VKD3DSIH_LD, resource, sm6); - src_params = instruction_src_params_alloc(ins, 2, sm6); + if (!(src_params = instruction_src_params_alloc(ins, 2, sm6))) + return; src_param_init_from_value(&src_params[0], operands[1]); if (!sm6_value_is_undef(operands[2])) {

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_sincos().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 8c3512bd102d968447331a2d1699b9efcc90206d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8c3512bd102d968447331a2d1699b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:12:31 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_sincos(). --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 47c5c788..fe0d631d 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4150,7 +4150,8 @@ static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_ unsigned int index; vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_SINCOS); - src_param = instruction_src_params_alloc(ins, 1, sm6); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; src_param_init_from_value(src_param, operands[0]); index = op == DX_COS;

1 0