January 2024 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Validate that condition expressions are numeric.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 183172eff4cfe53e0e36abb875f083f18f9da439 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/183172eff4cfe53e0e36abb875f08… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 30 19:04:00 2023 -0500 vkd3d-shader/hlsl: Validate that condition expressions are numeric. --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c2e9b525..c934aaae 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -296,7 +296,7 @@ static void check_condition_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node { const struct hlsl_type *type = cond->data_type; - if (type->dimx > 1 || type->dimy > 1) + if (type->class > HLSL_CLASS_LAST_NUMERIC || type->dimx > 1 || type->dimy > 1) { struct vkd3d_string_buffer *string;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Always cast to bool in if() statements.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: a8b0c0391273bbeeec9ca9438fc0d2fa8d2ccd90 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a8b0c0391273bbeeec9ca9438fc0d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 22 14:51:02 2024 -0600 vkd3d-shader/hlsl: Always cast to bool in if() statements. We emit sm4 if_nz for these, but that does a bitwise comparison to zero, which is wrong for floats. --- libs/vkd3d-shader/hlsl.y | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c934aaae..8dc353e1 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6763,6 +6763,15 @@ selection_statement: } } + check_condition_type(ctx, condition); + + if (!(condition = add_cast(ctx, $4, condition, hlsl_get_scalar_type(ctx, HLSL_TYPE_BOOL), &@4))) + { + destroy_block($6.then_block); + destroy_block($6.else_block); + YYABORT; + } + if (!(instr = hlsl_new_if(ctx, condition, $6.then_block, $6.else_block, &@2))) { destroy_block($6.then_block); @@ -6772,8 +6781,6 @@ selection_statement: destroy_block($6.then_block); destroy_block($6.else_block); - check_condition_type(ctx, condition); - $$ = $4; hlsl_block_add_instr($$, instr); }

1 0

Zebediah Figura : tests: Add tests for valid conditional types.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 57c4a13024f144ed39a8e21e13fad27fc39ff0d9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/57c4a13024f144ed39a8e21e13fad… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 30 19:04:33 2023 -0500 tests: Add tests for valid conditional types. --- Makefile.am | 1 + tests/hlsl/cf-cond-types.shader_test | 131 +++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/Makefile.am b/Makefile.am index 1b9abc35..1810b24f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,6 +73,7 @@ vkd3d_shader_tests = \ tests/hlsl/cast-to-uint.shader_test \ tests/hlsl/cbuffer.shader_test \ tests/hlsl/ceil.shader_test \ + tests/hlsl/cf-cond-types.shader_test \ tests/hlsl/clamp.shader_test \ tests/hlsl/clip.shader_test \ tests/hlsl/combined-samplers.shader_test \ diff --git a/tests/hlsl/cf-cond-types.shader_test b/tests/hlsl/cf-cond-types.shader_test new file mode 100644 index 00000000..9a6e800a --- /dev/null +++ b/tests/hlsl/cf-cond-types.shader_test @@ -0,0 +1,131 @@ +% Condition to if/for/while must be numeric. They must also be 1-component +% (although not per se scalar — vectors and matrices are allowed, but not +% arrays). +% +% In theory an implicit conversion to bool is being performed, except that, +% unlike other places where implicit conversions are performed (assignments, +% return values) vectors are not truncated, but instead result in an error. + +[pixel shader fail] +static const float2 f; +float4 main() : sv_target +{ + if (f); + return 0; +} + +[pixel shader fail] +static const float f[1]; +float4 main() : sv_target +{ + if (f); + return 0; +} + +[pixel shader fail] +static const Texture2D f; +float4 main() : sv_target +{ + if (f); + return 0; +} + +[pixel shader fail] +static const float2 f; +float4 main() : sv_target +{ + while (f); + return 0; +} + +[pixel shader fail] +static const float f[1]; +float4 main() : sv_target +{ + while (f); + return 0; +} + +[pixel shader fail] +static const Texture2D f; +float4 main() : sv_target +{ + while (f); + return 0; +} + +[pixel shader fail] +static const float2 f; +float4 main() : sv_target +{ + do; while(f); + return 0; +} + +[pixel shader fail] +static const float f[1]; +float4 main() : sv_target +{ + do; while(f); + return 0; +} + +[pixel shader fail] +static const Texture2D f; +float4 main() : sv_target +{ + do; while(f); + return 0; +} + +[pixel shader fail] +static const float2 f; +float4 main() : sv_target +{ + for (; f;); + return 0; +} + +[pixel shader fail] +static const float f[1]; +float4 main() : sv_target +{ + for (; f;); + return 0; +} + +[pixel shader fail] +static const Texture2D f; +float4 main() : sv_target +{ + for (; f;); + return 0; +} + +[pixel shader todo] +static const float1x1 f; +float4 main() : sv_target +{ + if (f); + for (; f;); + while (f); + do; while (f); + return 0; +} + +[pixel shader] +uniform float1 f; +float4 main() : sv_target +{ + if (f) + return 1; + return 0; +} + +[test] +uniform 0 float4 -2.0 0.0 0.0 0.0 +draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) +uniform 0 float4 -0.0 0.0 0.0 0.0 +draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0)

1 0

Conor McCarthy : vkd3d-shader/dxil: Use strcmp() to check the entry point name.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 4dec25cbdea47d9ddb12868e34a05da489705506 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4dec25cbdea47d9ddb12868e34a05… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 15:16:29 2024 +1000 vkd3d-shader/dxil: Use strcmp() to check the entry point name. Function names are case-sensitive. --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 48664b5a..0f94e799 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6764,7 +6764,7 @@ static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) sm6->entry_point = value->u.function.name; if (!sm6_metadata_value_is_string(entry_node->operands[1]) - || ascii_strcasecmp(sm6->entry_point, entry_node->operands[1]->u.string_value)) + || strcmp(sm6->entry_point, entry_node->operands[1]->u.string_value)) { WARN("Entry point function name %s mismatch.\n", sm6->entry_point); vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_ENTRY_POINT_MISMATCH,

1 0

Conor McCarthy : vkd3d-shader/dxil: Use strcmp() to find function names.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 1cca18a22878b398ba693bdc19967f8db05d2581 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1cca18a22878b398ba693bdc19967… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 15:18:28 2024 +1000 vkd3d-shader/dxil: Use strcmp() to find function names. Function names are case-sensitive. --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0f94e799..b71d04b1 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6954,7 +6954,7 @@ static struct sm6_function *sm6_parser_get_function(const struct sm6_parser *sm6 { size_t i; for (i = 0; i < sm6->function_count; ++i) - if (!ascii_strcasecmp(sm6->functions[i].declaration->u.function.name, name)) + if (!strcmp(sm6->functions[i].declaration->u.function.name, name)) return &sm6->functions[i]; return NULL; }

1 0

Conor McCarthy : vkd3d-shader/dxil: Use strcmp() to find the handle type.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 367a06d748db377e699c49fde616bf32b7a386d1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/367a06d748db377e699c49fde616b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 15:22:19 2024 +1000 vkd3d-shader/dxil: Use strcmp() to find the handle type. We use strcmp() on the same type name elsewhere, and case-insensitive matching does not seem necessary. --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index b71d04b1..6b38f028 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1634,7 +1634,7 @@ static enum vkd3d_result sm6_parser_type_table_init(struct sm6_parser *sm6) break; } - if (!ascii_strcasecmp(struct_name, "dx.types.Handle")) + if (!strcmp(struct_name, "dx.types.Handle")) sm6->handle_type = type; type->u.struc->name = struct_name;

1 0

Conor McCarthy : vkd3d-shader/spirv: Emit DISCARD as a function call.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: e4660fe0e694021b7041ec3d1f6e730caa2fca5c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4660fe0e694021b7041ec3d1f6e7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 16:47:26 2024 +1000 vkd3d-shader/spirv: Emit DISCARD as a function call. --- libs/vkd3d-shader/spirv.c | 61 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ec9786ea..9286e87d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2328,6 +2328,7 @@ struct spirv_compiler uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t private_output_variable_write_mask[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t epilogue_function_id; + uint32_t discard_function_id; uint32_t binding_idx; @@ -7626,16 +7627,39 @@ static void spirv_compiler_emit_retc(struct spirv_compiler *compiler, vkd3d_spirv_build_op_label(builder, merge_block_id); } -static void spirv_compiler_emit_kill(struct spirv_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) +static uint32_t spirv_compiler_get_discard_function_id(struct spirv_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t target_id, merge_block_id; - target_id = vkd3d_spirv_alloc_id(builder); - merge_block_id = spirv_compiler_emit_conditional_branch(compiler, instruction, target_id); + if (!compiler->discard_function_id) + compiler->discard_function_id = vkd3d_spirv_alloc_id(builder); - vkd3d_spirv_build_op_label(builder, target_id); + return compiler->discard_function_id; +} + +static void spirv_compiler_emit_discard_function(struct spirv_compiler *compiler) +{ + uint32_t void_id, bool_id, function_type_id, condition_id, target_block_id, merge_block_id; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_name(builder, compiler->discard_function_id, "discard"); + + void_id = vkd3d_spirv_get_op_type_void(builder); + bool_id = vkd3d_spirv_get_op_type_bool(builder); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &bool_id, 1); + + vkd3d_spirv_build_op_function(builder, void_id, compiler->discard_function_id, + SpvFunctionControlMaskNone, function_type_id); + condition_id = vkd3d_spirv_build_op_function_parameter(builder, bool_id); + + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + + target_block_id = vkd3d_spirv_alloc_id(builder); + merge_block_id = vkd3d_spirv_alloc_id(builder); + vkd3d_spirv_build_op_selection_merge(builder, merge_block_id, SpvSelectionControlMaskNone); + vkd3d_spirv_build_op_branch_conditional(builder, condition_id, target_block_id, merge_block_id); + + vkd3d_spirv_build_op_label(builder, target_block_id); if (spirv_compiler_is_target_extension_supported(compiler, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION)) @@ -7650,6 +7674,26 @@ static void spirv_compiler_emit_kill(struct spirv_compiler *compiler, } vkd3d_spirv_build_op_label(builder, merge_block_id); + vkd3d_spirv_build_op_return(builder); + vkd3d_spirv_build_op_function_end(builder); +} + +static void spirv_compiler_emit_discard(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t condition_id, void_id; + + /* discard is not a block terminator in VSIR, and emitting it as such in SPIR-V would cause + * a mismatch between the VSIR structure and the SPIR-V one, which would cause problems if + * structurisation is necessary. Therefore we emit it as a function call. */ + condition_id = spirv_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); + condition_id = spirv_compiler_emit_int_to_bool(compiler, + instruction->flags, src->reg.data_type, 1, condition_id); + void_id = vkd3d_spirv_get_op_type_void(builder); + vkd3d_spirv_build_op_function_call(builder, void_id, spirv_compiler_get_discard_function_id(compiler), + &condition_id, 1); } static bool spirv_compiler_init_blocks(struct spirv_compiler *compiler, unsigned int block_count) @@ -9515,7 +9559,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, break; case VKD3DSIH_DISCARD: case VKD3DSIH_TEXKILL: - spirv_compiler_emit_kill(compiler, instruction); + spirv_compiler_emit_discard(compiler, instruction); break; case VKD3DSIH_LABEL: spirv_compiler_emit_label(compiler, instruction); @@ -9801,6 +9845,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, } } + if (compiler->discard_function_id) + spirv_compiler_emit_discard_function(compiler); + if (compiler->epilogue_function_id) { vkd3d_spirv_build_op_name(builder, compiler->epilogue_function_id, "epilogue");

1 0

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

23 Jan '24

Module: vkd3d Branch: master Commit: af160ef0c4c2b656437431b08638143227753c45 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af160ef0c4c2b656437431b086381… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:56:23 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_instance_init(). --- libs/vkd3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 75efa41f..3c544bf9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -594,7 +594,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr))) { - ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr); + ERR("Failed to initialise Vulkan global procs, hr %s.\n", debugstr_hresult(hr)); return hr; } @@ -674,7 +674,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, if (FAILED(hr = vkd3d_load_vk_instance_procs(&instance->vk_procs, vk_global_procs, vk_instance))) { - ERR("Failed to load instance procs, hr %#x.\n", hr); + ERR("Failed to load instance procs, hr %s.\n", debugstr_hresult(hr)); if (instance->vk_procs.vkDestroyInstance) instance->vk_procs.vkDestroyInstance(vk_instance, NULL); if (instance->libvulkan)

1 0

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

23 Jan '24

Module: vkd3d Branch: master Commit: 8dc1239e145dba1021ee5396be4ca4571e356827 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8dc1239e145dba1021ee5396be4ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:04:26 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_create_vk_device(). --- libs/vkd3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3c544bf9..80fa9d35 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2071,7 +2071,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (FAILED(hr = vkd3d_load_vk_device_procs(&device->vk_procs, vk_procs, vk_device))) { - ERR("Failed to load device procs, hr %#x.\n", hr); + ERR("Failed to load device procs, hr %s.\n", debugstr_hresult(hr)); if (device->vk_procs.vkDestroyDevice) device->vk_procs.vkDestroyDevice(vk_device, NULL); return hr; @@ -2081,7 +2081,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (FAILED(hr = d3d12_device_create_vkd3d_queues(device, &device_queue_info))) { - ERR("Failed to create queues, hr %#x.\n", hr); + ERR("Failed to create queues, hr %s.\n", debugstr_hresult(hr)); device->vk_procs.vkDestroyDevice(vk_device, NULL); return hr; }

1 0

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

23 Jan '24

Module: vkd3d Branch: master Commit: e965701776c0ce8cadd46dd97d3430a6cd999410 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e965701776c0ce8cadd46dd97d343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:05:31 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_device_init(). --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 80fa9d35..88cf9aa1 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4404,7 +4404,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (device->use_vk_heaps && FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, device_worker_main, device, &device->worker_thread))) { - WARN("Failed to create worker thread, hr %#x.\n", hr); + WARN("Failed to create worker thread, hr %s.\n", debugstr_hresult(hr)); goto out_cleanup_descriptor_heap_layouts; }

1 0