November 2023 - Wine-commits

Paul Gofman : winmm: Fix pszSound allocation in PlaySound_Alloc().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: d9636260442292990bab00aec308116f3062f3ad URL: https://gitlab.winehq.org/wine/wine/-/commit/d9636260442292990bab00aec30811… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 30 20:31:58 2023 -0600 winmm: Fix pszSound allocation in PlaySound_Alloc(). --- dlls/winmm/playsound.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 2ba2ad1e8dc..bd26bf481f3 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -231,8 +231,9 @@ static WINE_PLAYSOUND* PlaySound_Alloc(const void* pszSound, HMODULE hmod, else { UNICODE_STRING usBuffer; - RtlCreateUnicodeStringFromAsciiz(&usBuffer, pszSound); - wps->pszSound = usBuffer.Buffer; + if (!RtlCreateUnicodeStringFromAsciiz(&usBuffer, pszSound)) goto oom_error; + wps->pszSound = wcsdup(usBuffer.Buffer); + RtlFreeUnicodeString(&usBuffer); if (!wps->pszSound) goto oom_error; wps->bAlloc = TRUE; }

1 0

Rémi Bernon : dmime/tests: Test IDirectMusicPerformance_GetSegmentState.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 617d7fc9b81c4da3266b9c99cda4935d4e58a18b URL: https://gitlab.winehq.org/wine/wine/-/commit/617d7fc9b81c4da3266b9c99cda493… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 23:59:27 2023 +0200 dmime/tests: Test IDirectMusicPerformance_GetSegmentState. --- dlls/dmime/tests/dmime.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 79fbb902868..b15c3a1ac37 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4053,6 +4053,12 @@ static void test_segment_state(void) check_track_state(track, initialized, FALSE); check_track_state(track, playing, FALSE); + hr = IDirectMusicPerformance_GetSegmentState(performance, NULL, 0); + todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 0); + todo_wine ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); + + tmp_state = state; state = (void *)0xdeadbeef; hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 20, &state); @@ -4062,6 +4068,22 @@ static void test_segment_state(void) ok(state != tmp_state, "got %p\n", state); IDirectMusicSegmentState_Release(tmp_state); + tmp_state = (void *)0xdeadbeef; + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 0); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(state == tmp_state, "got %p\n", state); + if (tmp_state != (void *)0xdeadbeef) IDirectMusicSegmentState_Release(tmp_state); + + tmp_state = (void *)0xdeadbeef; + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 69); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(state == tmp_state, "got %p\n", state); + if (tmp_state != (void *)0xdeadbeef) IDirectMusicSegmentState_Release(tmp_state); + + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 70); + todo_wine ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); + + check_track_state(track, downloaded, FALSE); check_track_state(track, initialized, TRUE); @@ -4074,6 +4096,9 @@ static void test_segment_state(void) ret = test_track_wait_playing(track, 50); ok(ret == 0, "got %#lx\n", ret); + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 0); + todo_wine ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); + tmp_segment = (void *)0xdeadbeef; hr = IDirectMusicSegmentState_GetSegment(state, &tmp_segment);

1 0

Zebediah Figura : vkd3d-shader/ir: Normalize all I/O registers to INPUT/OUTPUT/PATCHCONST.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: c7a7d9a18c537f4cb206d9334a69c188f42602df URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c7a7d9a18c537f4cb206d9334a69c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 16 23:56:22 2023 -0500 vkd3d-shader/ir: Normalize all I/O registers to INPUT/OUTPUT/PATCHCONST. Specifically, map COLOROUT to OUTPUT, and map INCONTROLPOINT to INPUT for domain shaders as well as hull shaders. Obscure the non-existent differences from the view of the backend. --- libs/vkd3d-shader/ir.c | 8 ++++---- libs/vkd3d-shader/spirv.c | 33 +++++++++++++++++--------------- libs/vkd3d-shader/vkd3d_shader_private.h | 15 --------------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 16e5948f..abc8b1cd 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -876,11 +876,13 @@ static bool shader_dst_param_io_normalise(struct vkd3d_shader_dst_param *dst_par else if (reg->type == VKD3DSPR_OUTPUT || dst_param->reg.type == VKD3DSPR_COLOROUT) { signature = normaliser->output_signature; + reg->type = VKD3DSPR_OUTPUT; dcl_params = normaliser->output_dcl_params; } else if (dst_param->reg.type == VKD3DSPR_INCONTROLPOINT || dst_param->reg.type == VKD3DSPR_INPUT) { signature = normaliser->input_signature; + reg->type = VKD3DSPR_INPUT; dcl_params = normaliser->input_dcl_params; } else @@ -980,15 +982,13 @@ static void shader_src_param_io_normalise(struct vkd3d_shader_src_param *src_par signature = normaliser->patch_constant_signature; break; case VKD3DSPR_INCONTROLPOINT: - if (normaliser->shader_type == VKD3D_SHADER_TYPE_HULL) - reg->type = VKD3DSPR_INPUT; + reg->type = VKD3DSPR_INPUT; /* fall through */ case VKD3DSPR_INPUT: signature = normaliser->input_signature; break; case VKD3DSPR_OUTCONTROLPOINT: - if (normaliser->shader_type == VKD3D_SHADER_TYPE_HULL) - reg->type = VKD3DSPR_OUTPUT; + reg->type = VKD3DSPR_OUTPUT; /* fall through */ case VKD3DSPR_OUTPUT: signature = normaliser->output_signature; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8a9910e4..b1679889 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2141,14 +2141,22 @@ static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol, symbol->type = VKD3D_SYMBOL_REGISTER; memset(&symbol->key, 0, sizeof(symbol->key)); symbol->key.reg.type = reg->type; - if (vkd3d_shader_register_is_input(reg) || vkd3d_shader_register_is_output(reg) - || vkd3d_shader_register_is_patch_constant(reg)) + + switch (reg->type) { - symbol->key.reg.idx = reg->idx_count ? reg->idx[reg->idx_count - 1].offset : ~0u; - assert(!reg->idx_count || symbol->key.reg.idx != ~0u); + case VKD3DSPR_INPUT: + case VKD3DSPR_OUTPUT: + case VKD3DSPR_PATCHCONST: + symbol->key.reg.idx = reg->idx_count ? reg->idx[reg->idx_count - 1].offset : ~0u; + assert(!reg->idx_count || symbol->key.reg.idx != ~0u); + break; + + case VKD3DSPR_IMMCONSTBUFFER: + break; + + default: + symbol->key.reg.idx = reg->idx_count ? reg->idx[0].offset : ~0u; } - else if (reg->type != VKD3DSPR_IMMCONSTBUFFER) - symbol->key.reg.idx = reg->idx_count ? reg->idx[0].offset : ~0u; } static void vkd3d_symbol_set_register_info(struct vkd3d_symbol *symbol, @@ -3047,9 +3055,6 @@ static bool spirv_compiler_get_register_name(char *buffer, unsigned int buffer_s case VKD3DSPR_INPUT: snprintf(buffer, buffer_size, "v%u", idx); break; - case VKD3DSPR_INCONTROLPOINT: - snprintf(buffer, buffer_size, "vicp%u", idx); - break; case VKD3DSPR_OUTPUT: snprintf(buffer, buffer_size, "o%u", idx); break; @@ -4514,8 +4519,7 @@ static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(const struct sp if ((builtin = get_spirv_builtin_for_register(reg_type))) return builtin; - if (sysval != VKD3D_SIV_NONE || (reg_type != VKD3DSPR_OUTPUT && reg_type != VKD3DSPR_COLOROUT - && reg_type != VKD3DSPR_PATCHCONST)) + if (sysval != VKD3D_SIV_NONE || (reg_type != VKD3DSPR_OUTPUT && reg_type != VKD3DSPR_PATCHCONST)) FIXME("Unhandled builtin (register type %#x, sysval %#x).\n", reg_type, sysval); return NULL; } @@ -4884,7 +4888,6 @@ static void spirv_compiler_emit_shader_phase_input(struct spirv_compiler *compil switch (reg->type) { case VKD3DSPR_INPUT: - case VKD3DSPR_INCONTROLPOINT: case VKD3DSPR_PATCHCONST: spirv_compiler_emit_input(compiler, dst); return; @@ -6175,7 +6178,7 @@ static void spirv_compiler_emit_dcl_input(struct spirv_compiler *compiler, if (spirv_compiler_get_current_shader_phase(compiler)) spirv_compiler_emit_shader_phase_input(compiler, dst); - else if (vkd3d_shader_register_is_input(&dst->reg) || dst->reg.type == VKD3DSPR_PATCHCONST) + else if (dst->reg.type == VKD3DSPR_INPUT || dst->reg.type == VKD3DSPR_PATCHCONST) spirv_compiler_emit_input(compiler, dst); else spirv_compiler_emit_input_register(compiler, dst); @@ -6192,8 +6195,8 @@ static void spirv_compiler_emit_dcl_output(struct spirv_compiler *compiler, { const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; - if (vkd3d_shader_register_is_output(&dst->reg) - || (is_in_fork_or_join_phase(compiler) && vkd3d_shader_register_is_patch_constant(&dst->reg))) + if (dst->reg.type == VKD3DSPR_OUTPUT + || (is_in_fork_or_join_phase(compiler) && dst->reg.type == VKD3DSPR_PATCHCONST)) spirv_compiler_emit_output(compiler, dst); else spirv_compiler_emit_output_register(compiler, dst); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 30a8a7dd..30fda136 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1133,21 +1133,6 @@ static inline bool vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_ return ins->texel_offset.u || ins->texel_offset.v || ins->texel_offset.w; } -static inline bool vkd3d_shader_register_is_input(const struct vkd3d_shader_register *reg) -{ - return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT; -} - -static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_register *reg) -{ - return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; -} - -static inline bool vkd3d_shader_register_is_patch_constant(const struct vkd3d_shader_register *reg) -{ - return reg->type == VKD3DSPR_PATCHCONST; -} - static inline bool register_is_constant(const struct vkd3d_shader_register *reg) { return (reg->type == VKD3DSPR_IMMCONST || reg->type == VKD3DSPR_IMMCONST64);

1 0

Zebediah Figura : vkd3d-shader/spirv: Simplify spirv_compiler_emit_dcl_input().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 87cb66dd433b25c1c7ad6768aff78fef353f1cb7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/87cb66dd433b25c1c7ad6768aff78… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 17 23:03:20 2023 -0500 vkd3d-shader/spirv: Simplify spirv_compiler_emit_dcl_input(). --- libs/vkd3d-shader/spirv.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b1679889..fd98d145 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4880,28 +4880,6 @@ static void spirv_compiler_emit_input_register(struct spirv_compiler *compiler, spirv_compiler_emit_register_debug_name(builder, input_id, reg); } -static void spirv_compiler_emit_shader_phase_input(struct spirv_compiler *compiler, - const struct vkd3d_shader_dst_param *dst) -{ - const struct vkd3d_shader_register *reg = &dst->reg; - - switch (reg->type) - { - case VKD3DSPR_INPUT: - case VKD3DSPR_PATCHCONST: - spirv_compiler_emit_input(compiler, dst); - return; - case VKD3DSPR_PRIMID: - spirv_compiler_emit_input_register(compiler, dst); - return; - case VKD3DSPR_OUTPOINTID: /* Emitted in spirv_compiler_emit_initial_declarations(). */ - return; - default: - FIXME("Unhandled shader phase input register %#x.\n", reg->type); - return; - } -} - static unsigned int get_shader_output_swizzle(const struct spirv_compiler *compiler, unsigned int register_idx) { @@ -6176,11 +6154,10 @@ static void spirv_compiler_emit_dcl_input(struct spirv_compiler *compiler, { const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; - if (spirv_compiler_get_current_shader_phase(compiler)) - spirv_compiler_emit_shader_phase_input(compiler, dst); - else if (dst->reg.type == VKD3DSPR_INPUT || dst->reg.type == VKD3DSPR_PATCHCONST) + /* OUTPOINTID is handled in spirv_compiler_emit_hull_shader_builtins(). */ + if (dst->reg.type == VKD3DSPR_INPUT || dst->reg.type == VKD3DSPR_PATCHCONST) spirv_compiler_emit_input(compiler, dst); - else + else if (dst->reg.type != VKD3DSPR_OUTPOINTID) spirv_compiler_emit_input_register(compiler, dst); }

1 0

Zebediah Figura : vkd3d-shader/spirv: Look up builtins by vkd3d_shader_sysval_semantic.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 8513f567fac08b38c53b230fdc3f688eaf8fec2a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8513f567fac08b38c53b230fdc3f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 20 00:02:55 2023 -0500 vkd3d-shader/spirv: Look up builtins by vkd3d_shader_sysval_semantic. Instead of by vkd3d_shader_input_sysval_semantic. --- libs/vkd3d-shader/spirv.c | 75 +++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 41 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/spirv: Remove no longer used private_output_variable_array_idx array.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 011e31f62458df0ef4b6ca3a87fc6f2d18dcd39b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/011e31f62458df0ef4b6ca3a87fc6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 22 21:24:52 2023 -0500 vkd3d-shader/spirv: Remove no longer used private_output_variable_array_idx array. --- libs/vkd3d-shader/spirv.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 19c14da7..35561079 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2356,7 +2356,6 @@ struct spirv_compiler uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ - uint32_t private_output_variable_array_idx[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; @@ -5309,7 +5308,6 @@ static void spirv_compiler_emit_shader_epilogue_function(struct spirv_compiler * STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); - STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(compiler->private_output_variable_array_idx)); STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(compiler->private_output_variable_write_mask)); is_patch_constant = is_in_fork_or_join_phase(compiler); @@ -5365,7 +5363,6 @@ static void spirv_compiler_emit_shader_epilogue_function(struct spirv_compiler * vkd3d_spirv_build_op_function_end(builder); memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); - memset(compiler->private_output_variable_array_idx, 0, sizeof(compiler->private_output_variable_array_idx)); memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); compiler->epilogue_function_id = 0; } @@ -6397,7 +6394,6 @@ static void spirv_compiler_leave_shader_phase(struct spirv_compiler *compiler) * Control point phase has separate output registers. */ memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); - memset(compiler->private_output_variable_array_idx, 0, sizeof(compiler->private_output_variable_array_idx)); memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); } } @@ -6526,36 +6522,17 @@ static void spirv_compiler_emit_hull_shader_barrier(struct spirv_compiler *compi static void spirv_compiler_emit_shader_epilogue_invocation(struct spirv_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t void_id, type_id, ptr_type_id, function_id; uint32_t arguments[MAX_REG_OUTPUT]; + uint32_t void_id, function_id; unsigned int i, count; if ((function_id = compiler->epilogue_function_id)) { void_id = vkd3d_spirv_get_op_type_void(builder); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 4); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); for (i = 0, count = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) { if (compiler->private_output_variable[i]) - { - uint32_t argument_id = compiler->private_output_variable[i]; - unsigned int argument_idx = count++; - - if (compiler->private_output_variable_array_idx[i]) - { - uint32_t tmp_id; - - tmp_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, - argument_id, compiler->private_output_variable_array_idx[i]); - tmp_id = vkd3d_spirv_build_op_load(builder, type_id, tmp_id, SpvMemoryAccessMaskNone); - argument_id = vkd3d_spirv_build_op_variable(builder, - &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, 0); - vkd3d_spirv_build_op_store(builder, argument_id, tmp_id, SpvMemoryAccessMaskNone); - } - - arguments[argument_idx] = argument_id; - } + arguments[count++] = compiler->private_output_variable[i]; } vkd3d_spirv_build_op_function_call(builder, void_id, function_id, arguments, count);

1 0

Zebediah Figura : tests: Add some more tests for function overloads.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 3e35570221fa9ec4343e06fe99d77e10a362a906 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e35570221fa9ec4343e06fe99d77… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 8 16:07:47 2023 -0500 tests: Add some more tests for function overloads. --- tests/hlsl/function-overload.shader_test | 55 ++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tests/hlsl/function-overload.shader_test b/tests/hlsl/function-overload.shader_test index c5a30b16..e9a8a8b9 100644 --- a/tests/hlsl/function-overload.shader_test +++ b/tests/hlsl/function-overload.shader_test @@ -16,6 +16,7 @@ float4 main() : sv_target return 0; } + [pixel shader todo] /* Test a basic overload. */ float func(int arg) @@ -38,3 +39,57 @@ float4 main() : sv_target [test] todo(sm<6) draw quad probe all rgba (0.1, 0.2, 0.1, 0.2) + + +% float and float1 can be defined separately... + +[pixel shader todo] +void func(float arg) {} +void func(float1 arg) {} + +float4 main() : sv_target +{ + return 1.0; +} + + +% ...but invoking them is considered ambiguous and fails. + +[pixel shader fail] + +void func(float arg) {} +void func(float1 arg) {} + +float4 main() : sv_target +{ + float x = 1.0; + func(x); + return 1.0; +} + +[pixel shader fail] + +void func(float arg) {} +void func(float1 arg) {} + +float4 main() : sv_target +{ + float1 x = {1.0}; + func(x); + return 1.0; +} + + +% This holds true even if one variant isn't actually defined. + +[pixel shader fail todo] + +void func(float arg); +void func(float1 arg) {} + +float4 main() : sv_target +{ + float1 x = {1.0}; + func(x); + return 1.0; +}

1 0

Zebediah Figura : vkd3d-shader/hlsl: Rename hlsl_get_func_decl() to hlsl_get_first_func_decl().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 2b59a759d5e81a95b54db9dcc691eb9b4162dead URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2b59a759d5e81a95b54db9dcc691e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 8 16:21:47 2023 -0500 vkd3d-shader/hlsl: Rename hlsl_get_func_decl() to hlsl_get_first_func_decl(). --- libs/vkd3d-shader/hlsl.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c3a7a604..5ba36864 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -825,7 +825,7 @@ struct hlsl_ir_function *hlsl_get_function(struct hlsl_ctx *ctx, const char *nam return NULL; } -struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) +struct hlsl_ir_function_decl *hlsl_get_first_func_decl(struct hlsl_ctx *ctx, const char *name) { struct hlsl_ir_function_decl *decl; struct hlsl_ir_function *func; @@ -3740,7 +3740,7 @@ struct hlsl_ir_function_decl *hlsl_compile_internal_function(struct hlsl_ctx *ct hlsl_release_string_buffer(ctx, internal_name); return NULL; } - func = hlsl_get_func_decl(ctx, internal_name->buffer); + func = hlsl_get_first_func_decl(ctx, internal_name->buffer); hlsl_release_string_buffer(ctx, internal_name); return func; } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4e8c60f7..9f2fea9b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1172,7 +1172,7 @@ void hlsl_free_type(struct hlsl_type *type); void hlsl_free_var(struct hlsl_ir_var *decl); struct hlsl_ir_function *hlsl_get_function(struct hlsl_ctx *ctx, const char *name); -struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name); +struct hlsl_ir_function_decl *hlsl_get_first_func_decl(struct hlsl_ctx *ctx, const char *name); const struct hlsl_profile_info *hlsl_get_target_info(const char *target); struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive, bool case_insensitive); struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d5126afc..3b22a447 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2186,7 +2186,7 @@ static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v) "Target profile doesn't support objects as struct members in uniform variables."); } - if ((func = hlsl_get_func_decl(ctx, var->name))) + if ((func = hlsl_get_first_func_decl(ctx, var->name))) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "'%s' is already defined as a function.", var->name);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Store function overloads in a list.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: b1c2852cd7228c89da41b1b443d2195ab1c55893 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b1c2852cd7228c89da41b1b443d21… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 8 16:27:10 2023 -0500 vkd3d-shader/hlsl: Store function overloads in a list. The choice to store them in an rbtree was made early on. It does not seem likely that HLSL programs would define many overloads for any of their functions, but I suspect the idea was rather that intrinsics would be defined as plain hlsl_ir_function_decl structures [cf. 447463e5900ca6a636998a65429b8a08a5441657] and that some intrinsics that could operate on any type would therefore need many overrides. This is not how we deal with intrinsics, however. When the first intrinsics were implemented I made the choice disregard this intended design, and instead match and convert their types manually, in C. Nothing that has happened in the time since has led me to question that choice, and in fact, the flexibility with which we must accommodate functions has led me to believe that matching in this way was definitely the right choice. The main other designs I see would have been: * define each intrinsic variant separately using existing HLSL types. Besides efficiency concerns (i.e. this would take more space in memory, and would take longer to generate each variant), the normal type-matching rules don't really apply to intrinsics. [For example: elementwise intrinsics like abs() return the same type as the input, including preserving the distinction between float and float1. It is legal to define separate HLSL overloads taking float and float1, but trying to invoke these functions yields an "ambiguous function call" error.] * introduce new (semi-)generic types. This is far more code and ends up acting like our current scheme (with helpers) in a slightly more complex form. So I think we can go ahead and rip out this vestige of the original design for intrinsics. As for why to change it: rbtrees are simply more complex to deal with, and it seems unlikely to me that the difference is going to matter. I do not expect any program to define large quantities of intrinsics; linked list search should be good enough. --- libs/vkd3d-shader/hlsl.c | 47 ++++++++++++++--------- libs/vkd3d-shader/hlsl.h | 8 ++-- libs/vkd3d-shader/hlsl.y | 81 ++++++++++++++-------------------------- libs/vkd3d-shader/hlsl_codegen.c | 16 +++----- 4 files changed, 69 insertions(+), 83 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Do not consider scalars and 1-dimensional vectors to be equivalent in function parameters.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 514d179b70462945f41220a3028318d8f30dfeaf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/514d179b70462945f41220a302831… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 8 16:40:22 2023 -0500 vkd3d-shader/hlsl: Do not consider scalars and 1-dimensional vectors to be equivalent in function parameters. --- libs/vkd3d-shader/hlsl.c | 6 +----- tests/hlsl/function-overload.shader_test | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 108f1a75..7893497d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2053,11 +2053,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls int r; if ((r = vkd3d_u32_compare(t1->class, t2->class))) - { - if (!((t1->class == HLSL_CLASS_SCALAR && t2->class == HLSL_CLASS_VECTOR) - || (t1->class == HLSL_CLASS_VECTOR && t2->class == HLSL_CLASS_SCALAR))) - return r; - } + return r; if ((r = vkd3d_u32_compare(t1->base_type, t2->base_type))) return r; if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) diff --git a/tests/hlsl/function-overload.shader_test b/tests/hlsl/function-overload.shader_test index e9a8a8b9..ae35c483 100644 --- a/tests/hlsl/function-overload.shader_test +++ b/tests/hlsl/function-overload.shader_test @@ -43,7 +43,7 @@ probe all rgba (0.1, 0.2, 0.1, 0.2) % float and float1 can be defined separately... -[pixel shader todo] +[pixel shader] void func(float arg) {} void func(float1 arg) {} @@ -55,7 +55,7 @@ float4 main() : sv_target % ...but invoking them is considered ambiguous and fails. -[pixel shader fail] +[pixel shader fail todo] void func(float arg) {} void func(float1 arg) {} @@ -67,7 +67,7 @@ float4 main() : sv_target return 1.0; } -[pixel shader fail] +[pixel shader fail todo] void func(float arg) {} void func(float1 arg) {}

1 0