January 2024 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Do not try to lower ternaries of types other than scalar or vector.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: vkd3d Branch: master Commit: a5549bae3840b25277636a52c8f70ee9c1a0eb44 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a5549bae3840b25277636a52c8f70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 9 19:41:00 2023 -0600 vkd3d-shader/hlsl: Do not try to lower ternaries of types other than scalar or vector. --- libs/vkd3d-shader/hlsl_codegen.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d37bef15..1fe141a3 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2890,6 +2890,12 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru first = expr->operands[1].node; second = expr->operands[2].node; + if (cond->data_type->class > HLSL_CLASS_VECTOR || instr->data_type->class > HLSL_CLASS_VECTOR) + { + hlsl_fixme(ctx, &instr->loc, "Lower ternary of type other than scalar or vector.\n"); + return false; + } + if (ctx->profile->major_version < 4 && ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) { struct hlsl_ir_node *abs, *neg;

1 0

Nikolay Sivov : mf/tests: Skip tests if video renderer can't be created.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 8e82b56a7e8095377f683af02fec8b44c6196c41 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e82b56a7e8095377f683af02fec8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 15 19:58:26 2024 +0100 mf/tests: Skip tests if video renderer can't be created. --- dlls/mf/tests/mf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 3dd0d9b076d..13b55b1f836 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5799,7 +5799,12 @@ static void test_evr(void) ok(hr == S_OK, "Startup failure, hr %#lx.\n", hr); hr = MFCreateVideoRenderer(&IID_IMFVideoRenderer, (void **)&video_renderer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (FAILED(hr)) + { + skip("Failed to create video renderer object, skipping tests.\n"); + MFShutdown(); + return; + } hr = IMFVideoRenderer_InitializeRenderer(video_renderer, NULL, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Conor McCarthy : vkd3d-shader/spirv: Do not emit function code before the main prolog.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: vkd3d Branch: master Commit: d402804851537da1b431dac1d592a170ff7a3f21 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d402804851537da1b431dac1d592a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 12 12:54:05 2024 +1000 vkd3d-shader/spirv: Do not emit function code before the main prolog. --- libs/vkd3d-shader/spirv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a5fa58cc..8d787e8c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2334,7 +2334,9 @@ struct spirv_compiler const struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info; unsigned int input_control_point_count; unsigned int output_control_point_count; + bool use_vocp; + bool emit_point_size; enum vkd3d_shader_opcode phase; bool emit_default_control_point_phase; @@ -2530,6 +2532,8 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) { compiler->xfb_info = vkd3d_find_struct(compile_info->next, TRANSFORM_FEEDBACK_INFO); + compiler->emit_point_size = compiler->xfb_info && compiler->xfb_info->element_count + && compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY; compiler->shader_interface = *shader_interface; if (shader_interface->push_constant_buffer_count) @@ -6332,7 +6336,7 @@ static void spirv_compiler_emit_dcl_output_topology(struct spirv_compiler *compi { case VKD3D_PT_POINTLIST: mode = SpvExecutionModeOutputPoints; - spirv_compiler_emit_point_size(compiler); + compiler->emit_point_size = true; break; case VKD3D_PT_LINESTRIP: mode = SpvExecutionModeOutputLineStrip; @@ -9220,8 +9224,7 @@ static void spirv_compiler_emit_main_prolog(struct spirv_compiler *compiler) { spirv_compiler_emit_push_constant_buffers(compiler); - if (compiler->xfb_info && compiler->xfb_info->element_count - && compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) + if (compiler->emit_point_size) spirv_compiler_emit_point_size(compiler); }

1 0

Conor McCarthy : vkd3d-shader/ir: Include an initial label instruction in the first control flow block.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: vkd3d Branch: master Commit: 559d9d4ee0a19cd03f6e977ed23b159cb3fd7fc3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/559d9d4ee0a19cd03f6e977ed23b1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 12 13:20:32 2024 +1000 vkd3d-shader/ir: Include an initial label instruction in the first control flow block. --- libs/vkd3d-shader/dxil.c | 14 ++++++++ libs/vkd3d-shader/ir.c | 35 +++++++++++++++++--- libs/vkd3d-shader/spirv.c | 56 ++++++++++++++++++++------------ libs/vkd3d-shader/tpf.c | 3 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 5 files changed, 84 insertions(+), 26 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/spirv: Emit descriptor offset loads in the function entry block.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: vkd3d Branch: master Commit: db0d51675c21b915fada2fd60ae2fd781dc9a5f2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/db0d51675c21b915fada2fd60ae2f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 14 12:32:10 2023 +1000 vkd3d-shader/spirv: Emit descriptor offset loads in the function entry block. Ensures they are loaded only once per function independent of the control flow graph. --- libs/vkd3d-shader/spirv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 067ba1b2..9f63d678 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2440,6 +2440,7 @@ static bool is_in_fork_or_join_phase(const struct spirv_compiler *compiler) } static void spirv_compiler_emit_initial_declarations(struct spirv_compiler *compiler); +static size_t spirv_compiler_get_current_function_location(struct spirv_compiler *compiler); static const char *spirv_compiler_get_entry_point_name(const struct spirv_compiler *compiler) { @@ -3520,11 +3521,13 @@ static uint32_t spirv_compiler_get_descriptor_index(struct spirv_compiler *compi index_ids[0] = compiler->descriptor_offsets_member_id; index_ids[1] = spirv_compiler_get_constant_uint(compiler, push_constant_index); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPushConstant, type_id); + vkd3d_spirv_begin_function_stream_insertion(builder, + spirv_compiler_get_current_function_location(compiler)); ptr_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, compiler->push_constants_var_id, index_ids, 2); offset_id = vkd3d_spirv_build_op_load(builder, type_id, ptr_id, SpvMemoryAccessMaskNone); - if (!compiler->control_flow_depth) - compiler->descriptor_offset_ids[push_constant_index] = offset_id; + vkd3d_spirv_end_function_stream_insertion(builder); + compiler->descriptor_offset_ids[push_constant_index] = offset_id; } index_id = vkd3d_spirv_build_op_iadd(builder, type_id, index_id, offset_id); } @@ -6664,6 +6667,9 @@ static void spirv_compiler_emit_hull_shader_main(struct spirv_compiler *compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t void_id; + /* If a patch constant function used descriptor indexing the offsets must be reloaded. */ + memset(compiler->descriptor_offset_ids, 0, compiler->offset_info.descriptor_table_count + * sizeof(*compiler->descriptor_offset_ids)); vkd3d_spirv_builder_begin_main_function(builder); void_id = vkd3d_spirv_get_op_type_void(builder);

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle DISCARD and TEXKILL in spirv_compiler_handle_instruction().
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: vkd3d Branch: master Commit: bc1b5e71320c9e26462cc7ab2e9ee4acdc67691e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bc1b5e71320c9e26462cc7ab2e9ee… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Dec 12 16:07:05 2023 +1000 vkd3d-shader/spirv: Handle DISCARD and TEXKILL in spirv_compiler_handle_instruction(). --- libs/vkd3d-shader/spirv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9f63d678..a8fe645a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7976,11 +7976,6 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c spirv_compiler_emit_retc(compiler, instruction); break; - case VKD3DSIH_DISCARD: - case VKD3DSIH_TEXKILL: - spirv_compiler_emit_kill(compiler, instruction); - break; - default: ERR("Unexpected instruction %#x.\n", instruction->handler_idx); break; @@ -9739,7 +9734,6 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_CONTINUE: case VKD3DSIH_CONTINUEP: case VKD3DSIH_DEFAULT: - case VKD3DSIH_DISCARD: case VKD3DSIH_ELSE: case VKD3DSIH_ENDIF: case VKD3DSIH_ENDLOOP: @@ -9749,9 +9743,12 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_RET: case VKD3DSIH_RETP: case VKD3DSIH_SWITCH: - case VKD3DSIH_TEXKILL: ret = spirv_compiler_emit_control_flow_instruction(compiler, instruction); break; + case VKD3DSIH_DISCARD: + case VKD3DSIH_TEXKILL: + spirv_compiler_emit_kill(compiler, instruction); + break; case VKD3DSIH_DSX: case VKD3DSIH_DSX_COARSE: case VKD3DSIH_DSX_FINE:

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle RETP in spirv_compiler_handle_instruction().
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: vkd3d Branch: master Commit: f3d464de0e5b6c46b5cbfb1aa2e25836bf0411d7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3d464de0e5b6c46b5cbfb1aa2e25… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Dec 12 16:10:12 2023 +1000 vkd3d-shader/spirv: Handle RETP in spirv_compiler_handle_instruction(). --- libs/vkd3d-shader/spirv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a8fe645a..9492811a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7972,10 +7972,6 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c compiler->main_block_open = false; break; - case VKD3DSIH_RETP: - spirv_compiler_emit_retc(compiler, instruction); - break; - default: ERR("Unexpected instruction %#x.\n", instruction->handler_idx); break; @@ -9741,10 +9737,12 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_IF: case VKD3DSIH_LOOP: case VKD3DSIH_RET: - case VKD3DSIH_RETP: case VKD3DSIH_SWITCH: ret = spirv_compiler_emit_control_flow_instruction(compiler, instruction); break; + case VKD3DSIH_RETP: + spirv_compiler_emit_retc(compiler, instruction); + break; case VKD3DSIH_DISCARD: case VKD3DSIH_TEXKILL: spirv_compiler_emit_kill(compiler, instruction);

1 0

Conor McCarthy : vkd3d-shader/ir: Flatten IF/ELSE/ENDIF control flow instructions.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: vkd3d Branch: master Commit: e1dddc01b7e7b549d392f81228bfa709ad5c102a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e1dddc01b7e7b549d392f81228bfa… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 5 00:55:51 2024 +1000 vkd3d-shader/ir: Flatten IF/ELSE/ENDIF control flow instructions. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/ir.c | 353 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 179 ++++++++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 7 + 4 files changed, 452 insertions(+), 88 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/ir: Flatten LOOP/BREAK/CONTINUE/ENDLOOP control flow instructions.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: vkd3d Branch: master Commit: dcb8527327106e31bc864167aaf1ba6140d1e813 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dcb8527327106e31bc864167aaf1b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Dec 12 15:34:51 2023 +1000 vkd3d-shader/ir: Flatten LOOP/BREAK/CONTINUE/ENDLOOP control flow instructions. --- libs/vkd3d-shader/ir.c | 194 +++++++++++++++++++++++++++++++++++++++++----- libs/vkd3d-shader/spirv.c | 151 +++++------------------------------- 2 files changed, 194 insertions(+), 151 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/ir: Flatten SWITCH/CASE/DEFAULT/ENDSWITCH control flow instructions.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: vkd3d Branch: master Commit: ffc65215ba7f624d84ddaf83be46da3edfb19e67 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ffc65215ba7f624d84ddaf83be46d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Dec 12 15:58:08 2023 +1000 vkd3d-shader/ir: Flatten SWITCH/CASE/DEFAULT/ENDSWITCH control flow instructions. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/ir.c | 110 +++++++++++- libs/vkd3d-shader/spirv.c | 295 +++++-------------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 155 insertions(+), 252 deletions(-)

1 0