February 2024 - Wine-commits

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

14 Feb '24

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_extractval().
by Alexandre Julliard 14 Feb '24

14 Feb '24

Module: vkd3d Branch: master Commit: 04a93401641bfd3d2766d66090c4ab549c8d436e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/04a93401641bfd3d2766d66090c4a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:13:45 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_extractval(). --- 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 a175875b..fdaabc92 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4962,7 +4962,8 @@ static void sm6_parser_emit_extractval(struct sm6_parser *sm6, const struct dxil 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->reg = src->u.reg; src_param_init_scalar(src_param, elem_idx);

1 0

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

14 Feb '24

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 14 Feb '24

14 Feb '24

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 14 Feb '24

14 Feb '24

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 14 Feb '24

14 Feb '24

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 14 Feb '24

14 Feb '24

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 14 Feb '24

14 Feb '24

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

Evan Tang : tests: Add some tests for rasteriser-ordered views.
by Alexandre Julliard 14 Feb '24

14 Feb '24

Module: vkd3d Branch: master Commit: 628acb6b96eaae24861402dfa2be641c44ce2480 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/628acb6b96eaae24861402dfa2be6… Author: Evan Tang <etang(a)codeweavers.com> Date: Fri Oct 13 16:35:12 2023 -0500 tests: Add some tests for rasteriser-ordered views. --- Makefile.am | 1 + tests/hlsl/rasteriser-ordered-views.shader_test | 69 +++++++++ tests/hlsl/uav-rwbuffer.shader_test | 76 +++++++++ tests/hlsl/uav-rwstructuredbuffer.shader_test | 53 +++++++ tests/hlsl/uav-rwtexture.shader_test | 195 ++++++++++++++++++++++++ tests/shader_runner.c | 5 + tests/shader_runner.h | 1 + tests/shader_runner_d3d11.c | 10 ++ tests/shader_runner_d3d12.c | 4 + tests/shader_runner_d3d9.c | 3 + tests/shader_runner_gl.c | 2 + tests/shader_runner_vulkan.c | 2 + 12 files changed, 421 insertions(+)

1 0

Conor McCarthy : vkd3d-shader/dxil: Load sampler descriptors.
by Alexandre Julliard 14 Feb '24

14 Feb '24

Module: vkd3d Branch: master Commit: 0a3eb611704e6aee17e864a3e829fcbb74736123 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a3eb611704e6aee17e864a3e829f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 12 16:54:29 2024 +1000 vkd3d-shader/dxil: Load sampler descriptors. --- libs/vkd3d-shader/dxil.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index a001f6f0..eeabc1c1 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -228,6 +228,13 @@ enum dxil_component_type COMPONENT_TYPE_PACKEDU8X32 = 18, }; +enum dxil_sampler_kind +{ + SAMPLER_KIND_DEFAULT = 0, + SAMPLER_KIND_COMPARISON = 1, + SAMPLER_KIND_MONO = 2, +}; + enum dxil_semantic_kind { SEMANTIC_KIND_ARBITRARY = 0, @@ -6755,6 +6762,70 @@ static enum vkd3d_result sm6_parser_resources_load_cbv(struct sm6_parser *sm6, return VKD3D_OK; } +static enum vkd3d_result sm6_parser_resources_load_sampler(struct sm6_parser *sm6, + const struct sm6_metadata_node *node, struct sm6_descriptor_info *d, struct vkd3d_shader_instruction *ins) +{ + struct vkd3d_shader_register *reg; + unsigned int kind; + + if (node->operand_count < 7) + { + WARN("Invalid operand count %u.\n", node->operand_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, + "Invalid operand count %u for a sampler descriptor.", node->operand_count); + return VKD3D_ERROR_INVALID_SHADER; + } + if (node->operand_count > 7 && node->operands[7]) + { + WARN("Ignoring %u extra operands.\n", node->operand_count - 7); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring %u extra operands for a sampler descriptor.", node->operand_count - 7); + } + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_DCL_SAMPLER); + ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; + + if (!sm6_metadata_get_uint_value(sm6, node->operands[6], &kind)) + { + WARN("Failed to load sampler mode.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Sampler mode metadata value is not an integer."); + return VKD3D_ERROR_INVALID_SHADER; + } + switch (kind) + { + case SAMPLER_KIND_DEFAULT: + break; + case SAMPLER_KIND_COMPARISON: + ins->flags = VKD3DSI_SAMPLER_COMPARISON_MODE; + break; + default: + FIXME("Ignoring sampler kind %u.\n", kind); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring sampler kind %u.", kind); + break; + } + + ins->declaration.sampler.src.swizzle = VKD3D_SHADER_NO_SWIZZLE; + ins->declaration.sampler.src.modifiers = VKD3DSPSM_NONE; + + reg = &ins->declaration.sampler.src.reg; + vsir_register_init(reg, VKD3DSPR_SAMPLER, VKD3D_DATA_UNUSED, 3); + reg->idx[0].offset = d->id; + reg->idx[1].offset = d->range.first; + reg->idx[2].offset = d->range.last; + + ins->declaration.sampler.range = d->range; + + d->resource_type = ins->resource_type; + d->kind = RESOURCE_KIND_SAMPLER; + d->reg_type = VKD3DSPR_SAMPLER; + d->reg_data_type = VKD3D_DATA_UNUSED; + d->resource_data_type = VKD3D_DATA_UNUSED; + + return VKD3D_OK; +} + static enum vkd3d_result sm6_parser_descriptor_type_init(struct sm6_parser *sm6, enum vkd3d_shader_descriptor_type type, const struct sm6_metadata_node *descriptor_node) { @@ -6831,6 +6902,10 @@ static enum vkd3d_result sm6_parser_descriptor_type_init(struct sm6_parser *sm6, if ((ret = sm6_parser_resources_load_uav(sm6, node, d, ins)) < 0) return ret; break; + case VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + if ((ret = sm6_parser_resources_load_sampler(sm6, node, d, ins)) < 0) + return ret; + break; default: FIXME("Unsupported descriptor type %u.\n", type); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES,

1 0