May 2023 - Wine-commits - list.winehq.org

Alexandros Frantzis : winewayland.drv: Update display devices from the desktop window thread.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 82c6becb048b41202b8a816c8852853845e067d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/82c6becb048b41202b8a816c885285… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 24 17:29:43 2023 +0300 winewayland.drv: Update display devices from the desktop window thread. Use a driver internal window message to dispatch updates to display devices from the desktop window thread. --- dlls/winewayland.drv/Makefile.in | 1 + dlls/winewayland.drv/wayland_output.c | 2 +- dlls/winewayland.drv/waylanddrv.h | 6 +++++ dlls/winewayland.drv/waylanddrv_main.c | 1 + dlls/winewayland.drv/window.c | 47 ++++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/Makefile.in b/dlls/winewayland.drv/Makefile.in index 3f9c052f2b0..454a7e5a4b4 100644 --- a/dlls/winewayland.drv/Makefile.in +++ b/dlls/winewayland.drv/Makefile.in @@ -10,4 +10,5 @@ SOURCES = \ wayland.c \ wayland_output.c \ waylanddrv_main.c \ + window.c \ xdg-output-unstable-v1.xml diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index 5ea04340347..4b2cb0505be 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -119,7 +119,7 @@ static void maybe_init_display_devices(void) /* We only update the display devices from the desktop process. */ if (GetCurrentProcessId() != desktop_pid) return; - wayland_init_display_devices(TRUE); + NtUserPostMessage(desktop_hwnd, WM_WAYLAND_INIT_DISPLAY_DEVICES, 0, 0); } static void wayland_output_mode_free_rb(struct rb_entry *entry, void *ctx) diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 600fcfce355..ecd144950c2 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -46,6 +46,11 @@ extern struct wayland process_wayland DECLSPEC_HIDDEN; * Definitions for wayland types */ +enum wayland_window_message +{ + WM_WAYLAND_INIT_DISPLAY_DEVICES = 0x80001000 +}; + struct wayland { BOOL initialized; @@ -107,5 +112,6 @@ void wayland_output_use_xdg_extension(struct wayland_output *output) DECLSPEC_HI BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, BOOL force, void *param) DECLSPEC_HIDDEN; +LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; #endif /* __WINE_WAYLANDDRV_H */ diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index a578db76c66..1d9877f4518 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -32,6 +32,7 @@ static const struct user_driver_funcs waylanddrv_funcs = { .pUpdateDisplayDevices = WAYLAND_UpdateDisplayDevices, + .pWindowMessage = WAYLAND_WindowMessage }; static NTSTATUS waylanddrv_unix_init(void *arg) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c new file mode 100644 index 00000000000..946ad6801a9 --- /dev/null +++ b/dlls/winewayland.drv/window.c @@ -0,0 +1,47 @@ +/* + * Wayland window handling + * + * Copyright 2020 Alexandros Frantzis for Collabora Ltd + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include "waylanddrv.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); + +/********************************************************************** + * WAYLAND_WindowMessage + */ +LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch (msg) + { + case WM_WAYLAND_INIT_DISPLAY_DEVICES: + wayland_init_display_devices(TRUE); + return 0; + default: + FIXME("got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (long)wp, lp); + return 0; + } +}

1 0

Alexandros Frantzis : winewayland.drv: Update desktop window size on display changes.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: e10da7ab2e3d151c8347802600862aa608672f6f URL: https://gitlab.winehq.org/wine/wine/-/commit/e10da7ab2e3d151c8347802600862a… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Apr 26 15:58:43 2023 +0300 winewayland.drv: Update desktop window size on display changes. Update the desktop window size to match the current virtual screen rect. --- dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/waylanddrv_main.c | 1 + dlls/winewayland.drv/window.c | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index ecd144950c2..57125e011cb 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -110,6 +110,7 @@ void wayland_output_use_xdg_extension(struct wayland_output *output) DECLSPEC_HI * USER driver functions */ +LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, BOOL force, void *param) DECLSPEC_HIDDEN; LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index 1d9877f4518..2a7bed9d1d8 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -31,6 +31,7 @@ static const struct user_driver_funcs waylanddrv_funcs = { + .pDesktopWindowProc = WAYLAND_DesktopWindowProc, .pUpdateDisplayDevices = WAYLAND_UpdateDisplayDevices, .pWindowMessage = WAYLAND_WindowMessage }; diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 946ad6801a9..ea5ac22a8a2 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -30,6 +30,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); +static void wayland_resize_desktop(void) +{ + RECT virtual_rect = NtUserGetVirtualScreenRect(); + NtUserSetWindowPos(NtUserGetDesktopWindow(), 0, + virtual_rect.left, virtual_rect.top, + virtual_rect.right - virtual_rect.left, + virtual_rect.bottom - virtual_rect.top, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE); +} + /********************************************************************** * WAYLAND_WindowMessage */ @@ -39,9 +49,25 @@ LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { case WM_WAYLAND_INIT_DISPLAY_DEVICES: wayland_init_display_devices(TRUE); + wayland_resize_desktop(); return 0; default: FIXME("got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (long)wp, lp); return 0; } } + +/********************************************************************** + * WAYLAND_DesktopWindowProc + */ +LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch (msg) + { + case WM_DISPLAYCHANGE: + wayland_resize_desktop(); + break; + } + + return NtUserMessageCall(hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE); +}

1 0

Conor McCarthy : vkd3d-shader/spirv: Support emitting multi-dimensional array variables.
by Alexandre Julliard 24 May '23

24 May '23

Module: vkd3d Branch: master Commit: 31682c52c70e305be1028d7038336bd8619956fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/31682c52c70e305be1028d7038336… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 5 18:44:21 2023 +1000 vkd3d-shader/spirv: Support emitting multi-dimensional array variables. --- libs/vkd3d-shader/spirv.c | 50 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fa4d056e..8923f355 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2981,18 +2981,26 @@ static uint32_t spirv_compiler_emit_variable(struct spirv_compiler *compiler, static uint32_t spirv_compiler_emit_array_variable(struct spirv_compiler *compiler, struct vkd3d_spirv_stream *stream, SpvStorageClass storage_class, - enum vkd3d_shader_component_type component_type, unsigned int component_count, unsigned int array_length) + enum vkd3d_shader_component_type component_type, unsigned int component_count, + const unsigned int *array_lengths, unsigned int length_count) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, length_id, ptr_type_id; + unsigned int i; - if (!array_length) + if (!length_count) return spirv_compiler_emit_variable(compiler, stream, storage_class, component_type, component_count); type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); - length_id = spirv_compiler_get_constant_uint(compiler, array_length); - type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); + for (i = 0; i < length_count; ++i) + { + if (!array_lengths[i]) + continue; + length_id = spirv_compiler_get_constant_uint(compiler, array_lengths[i]); + type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); + } + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); return vkd3d_spirv_build_op_variable(builder, stream, ptr_type_id, storage_class, 0); } @@ -4401,17 +4409,21 @@ static void spirv_compiler_decorate_xfb_output(struct spirv_compiler *compiler, vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationOffset, offset); } -static uint32_t spirv_compiler_emit_builtin_variable(struct spirv_compiler *compiler, - const struct vkd3d_spirv_builtin *builtin, SpvStorageClass storage_class, unsigned int array_size) +static uint32_t spirv_compiler_emit_builtin_variable_v(struct spirv_compiler *compiler, + const struct vkd3d_spirv_builtin *builtin, SpvStorageClass storage_class, const unsigned int *array_sizes, + unsigned int size_count) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int sizes[2]; uint32_t id; - array_size = max(array_size, builtin->spirv_array_size); + assert(size_count <= ARRAY_SIZE(sizes)); + memcpy(sizes, array_sizes, size_count * sizeof(sizes[0])); + array_sizes = sizes; + sizes[0] = max(sizes[0], builtin->spirv_array_size); - id = spirv_compiler_emit_array_variable(compiler, - &builder->global_stream, storage_class, - builtin->component_type, builtin->component_count, array_size); + id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, + builtin->component_type, builtin->component_count, array_sizes, size_count); vkd3d_spirv_add_iface_variable(builder, id); spirv_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); @@ -4423,6 +4435,12 @@ static uint32_t spirv_compiler_emit_builtin_variable(struct spirv_compiler *comp return id; } +static uint32_t spirv_compiler_emit_builtin_variable(struct spirv_compiler *compiler, + const struct vkd3d_spirv_builtin *builtin, SpvStorageClass storage_class, unsigned int array_size) +{ + return spirv_compiler_emit_builtin_variable_v(compiler, builtin, storage_class, &array_size, 1); +} + static bool needs_private_io_variable(const struct shader_signature *signature, unsigned int reg_idx, const struct vkd3d_spirv_builtin *builtin, unsigned int *component_count, unsigned int *out_write_mask) @@ -4611,7 +4629,7 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, unsigned int location = reg_idx; input_id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, component_type, input_component_count, array_size); + storage_class, component_type, input_component_count, &array_size, 1); vkd3d_spirv_add_iface_variable(builder, input_id); if (reg->type == VKD3DSPR_PATCHCONST) { @@ -4633,7 +4651,7 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, { storage_class = SpvStorageClassPrivate; var_id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, array_size); + storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, &array_size, 1); } vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, @@ -5050,7 +5068,7 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, location += compiler->output_signature->element_count; id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, component_type, output_component_count, array_size); + storage_class, component_type, output_component_count, &array_size, 1); vkd3d_spirv_add_iface_variable(builder, id); if (is_dual_source_blending(compiler) && reg->idx[0].offset < 2) @@ -5334,7 +5352,7 @@ static void spirv_compiler_emit_hull_shader_patch_constants(struct spirv_compile return; compiler->hs.patch_constants_id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassPrivate, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, register_count); + SpvStorageClassPrivate, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, &register_count, 1); vkd3d_spirv_build_op_name(builder, compiler->hs.patch_constants_id, "opc"); } @@ -5468,7 +5486,7 @@ static void spirv_compiler_emit_dcl_indexable_temp(struct spirv_compiler *compil vkd3d_spirv_begin_function_stream_insertion(builder, function_location); id = spirv_compiler_emit_array_variable(compiler, &builder->function_stream, - SpvStorageClassFunction, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, temp->register_size); + SpvStorageClassFunction, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, &temp->register_size, 1); spirv_compiler_emit_register_debug_name(builder, id, &reg); @@ -6568,7 +6586,7 @@ static void spirv_compiler_emit_default_control_point_phase(struct spirv_compile component_type = output->component_type; component_count = vkd3d_write_mask_component_count(output->mask); output_id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassOutput, component_type, component_count, compiler->output_control_point_count); + SpvStorageClassOutput, component_type, component_count, &compiler->output_control_point_count, 1); vkd3d_spirv_add_iface_variable(builder, output_id); vkd3d_spirv_build_op_decorate1(builder, output_id, SpvDecorationLocation, output->register_index); vkd3d_spirv_build_op_name(builder, output_id, "vocp%u", output->register_index);

1 0

Conor McCarthy : vkd3d-shader/ir: Eliminate struct vkd3d_shader_normaliser.
by Alexandre Julliard 24 May '23

24 May '23

Module: vkd3d Branch: master Commit: 110e48e54d1c6fa121aaa453bb59964c100356f2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/110e48e54d1c6fa121aaa453bb599… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 5 17:23:56 2023 +1000 vkd3d-shader/ir: Eliminate struct vkd3d_shader_normaliser. --- libs/vkd3d-shader/ir.c | 110 ++++++++++++++++++------------- libs/vkd3d-shader/spirv.c | 15 +++-- libs/vkd3d-shader/vkd3d_shader_private.h | 23 +------ 3 files changed, 76 insertions(+), 72 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/ir: Normalise signatures and input/output registers to the Shader Model 6 pattern.
by Alexandre Julliard 24 May '23

24 May '23

Module: vkd3d Branch: master Commit: 6835e8176ff81b1c4d9f42b1050506ab9dcdf7ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6835e8176ff81b1c4d9f42b105050… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 26 15:27:08 2023 +1000 vkd3d-shader/ir: Normalise signatures and input/output registers to the Shader Model 6 pattern. In Shader Model 6 each signature element can span a range of register indices, or 'rows', and system values do not share a register index with non-system values. Inputs and outputs are referenced by element index instead of register index. This patch merges multiple signature elements into a single element under the following conditions: - The register index in a load or store is specified dynamically by including a relative address parameter with a base register index. The dcl_index_range instruction is used to identify these. - A register declaration is split across multiple elements which declare different components of the register. - A patch constant function writes tessellation factors. These are an array in SPIR-V, but in SM 5.x each factor is declared as a separate register, and these are dynamically indexed by the fork/join instance id. Elimination of multiple fork/join phases converts the indices to constants, but merging the signature elements into a single arrayed element matches the SPIR-V output. All references to input/output register indices are converted to element indices. If a relative address is present, the element index is moved up a slot so it cannot be confused with a constant offset. Existing code only handles register index relative addressing for tessellation factors. This patch adds generic support for it. --- libs/vkd3d-shader/dxbc.c | 2 + libs/vkd3d-shader/ir.c | 615 +++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 688 ++++++++++--------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 9 + tests/d3d12.c | 1 - 5 files changed, 845 insertions(+), 470 deletions(-)

1 0

Ethan Lee : vkd3d-shader/tpf: Add support for emitting sample_l instructions.
by Alexandre Julliard 24 May '23

24 May '23

Module: vkd3d Branch: master Commit: ea7d8c65bde9e1712b38638340c0fcfdc7ffdb23 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea7d8c65bde9e1712b38638340c0f… Author: Ethan Lee <flibitijibibo(a)gmail.com> Date: Fri May 5 12:54:15 2023 -0400 vkd3d-shader/tpf: Add support for emitting sample_l instructions. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> --- libs/vkd3d-shader/tpf.c | 12 +++++++----- tests/sample-level.shader_test | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 690b7b9b..2166eb41 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4108,6 +4108,10 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer instr.opcode = VKD3D_SM4_OP_SAMPLE; break; + case HLSL_RESOURCE_SAMPLE_LOD: + instr.opcode = VKD3D_SM4_OP_SAMPLE_LOD; + break; + case HLSL_RESOURCE_SAMPLE_LOD_BIAS: instr.opcode = VKD3D_SM4_OP_SAMPLE_B; break; @@ -4138,7 +4142,8 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer sm4_src_from_deref(ctx, &instr.srcs[2], sampler, sampler->var->data_type, VKD3DSP_WRITEMASK_ALL); instr.src_count = 3; - if (load->load_type == HLSL_RESOURCE_SAMPLE_LOD_BIAS) + if (load->load_type == HLSL_RESOURCE_SAMPLE_LOD + || load->load_type == HLSL_RESOURCE_SAMPLE_LOD_BIAS) { sm4_src_from_node(&instr.srcs[3], load->lod.node, VKD3DSP_WRITEMASK_ALL); ++instr.src_count; @@ -4947,6 +4952,7 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, break; case HLSL_RESOURCE_SAMPLE: + case HLSL_RESOURCE_SAMPLE_LOD: case HLSL_RESOURCE_SAMPLE_LOD_BIAS: case HLSL_RESOURCE_SAMPLE_GRAD: if (!load->sampler.var) @@ -4976,10 +4982,6 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords, HLSL_SWIZZLE(W, W, W, W), texel_offset); break; - - case HLSL_RESOURCE_SAMPLE_LOD: - hlsl_fixme(ctx, &load->node.loc, "SM4 sample-LOD expression."); - break; } } diff --git a/tests/sample-level.shader_test b/tests/sample-level.shader_test index 564826d0..ec7c7e2a 100644 --- a/tests/sample-level.shader_test +++ b/tests/sample-level.shader_test @@ -14,7 +14,7 @@ levels 2 0.0 0.0 1.0 0.0 -[pixel shader todo] +[pixel shader] sampler s; Texture2D t; uniform float level; @@ -26,11 +26,11 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (1.0, 0.0, 1.0, 0.0) uniform 0 float4 0.5 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (0.5, 0.0, 1.0, 0.0) uniform 0 float4 1.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0

André Zwing : winedump: Recognize RISC-V PEs.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: dfe94187c0ed71e9d43dfb80e72e4ea58e3044c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfe94187c0ed71e9d43dfb80e72e4e… Author: André Zwing <nerv(a)dawncrow.de> Date: Tue May 23 20:24:33 2023 +0200 winedump: Recognize RISC-V PEs. --- include/winnt.h | 3 +++ tools/winedump/pe.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 64408126cba..66746d7f6ae 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2651,6 +2651,9 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_ARM64EC 0xa641 #define IMAGE_FILE_MACHINE_ARM64X 0xa64e #define IMAGE_FILE_MACHINE_ARM64 0xaa64 +#define IMAGE_FILE_MACHINE_RISCV32 0x5032 +#define IMAGE_FILE_MACHINE_RISCV64 0x5064 +#define IMAGE_FILE_MACHINE_RISCV128 0x5128 #define IMAGE_FILE_MACHINE_CEE 0xc0ee #define IMAGE_SIZEOF_FILE_HEADER 20 diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index bf3aa6b4d69..5c2898b6dbc 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -59,6 +59,9 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_CHPE_X86: return "CHPE-x86"; case IMAGE_FILE_MACHINE_ARM64EC: return "ARM64EC"; case IMAGE_FILE_MACHINE_ARM64X: return "ARM64X"; + case IMAGE_FILE_MACHINE_RISCV32: return "RISC-V 32-bit"; + case IMAGE_FILE_MACHINE_RISCV64: return "RISC-V 64-bit"; + case IMAGE_FILE_MACHINE_RISCV128: return "RISC-V 128-bit"; } return "???"; }

1 0

Anton Baskanov : dsound/tests: Test Doppler shift with moving listener.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 8c26e7e592038dd6452cc174867d9ee909125d56 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c26e7e592038dd6452cc174867d9e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 00:16:03 2023 +0700 dsound/tests: Test Doppler shift with moving listener. --- dlls/dsound/tests/ds3d.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 5e6ba4d204e..bfd632f3a00 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1441,6 +1441,12 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0, -90, 22050, 22050); + /* The Doppler shift does not depend on the frame of reference. */ + /* Wine TODO: The frequency is too low. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 90, 1, 0, 22050, 29400); + /* Wine TODO: The frequency is too low. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -90, 1, 0, 22050, 17640); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Anton Baskanov : dsound: Use relative velocity to compute Doppler shift.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 81feccb7e31bcc442932e521859a4dbf33c4575a URL: https://gitlab.winehq.org/wine/wine/-/commit/81feccb7e31bcc442932e521859a4d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 00:19:44 2023 +0700 dsound: Use relative velocity to compute Doppler shift. It's less physically correct but closer to the native behavior. --- dlls/dsound/sound3d.c | 18 ++++++++---------- dlls/dsound/tests/ds3d.c | 2 -- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index b062917b219..7cccef6cfe4 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -167,7 +167,8 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) int i, num_main_speakers; float a, ingain; /* doppler shift related stuff */ - D3DVALUE flFreq, flBufferVel, flListenerVel; + D3DVECTOR vRelativeVel; + D3DVALUE flFreq, flRelativeVel; TRACE("(%p)\n",dsb); @@ -292,6 +293,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) dsb->freq = dsb->ds3db_freq; /* doppler shift*/ + vRelativeVel = VectorBetweenTwoPoints(&dsb->device->ds3dl.vVelocity, &dsb->ds3db_ds3db.vVelocity); if (!VectorMagnitude(&dsb->ds3db_ds3db.vVelocity) && !VectorMagnitude(&dsb->device->ds3dl.vVelocity)) { TRACE("doppler: Buffer and Listener don't have velocities\n"); @@ -301,18 +303,14 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) dsb->ds3db_ds3db.vVelocity.z == dsb->device->ds3dl.vVelocity.z) && !(vDistance.x == 0.0f && vDistance.y == 0.0f && vDistance.z == 0.0f)) { - /* calculate length of ds3db_ds3db.vVelocity component which causes Doppler Effect + /* calculate length of vRelativeVel component which causes Doppler Effect NOTE: if buffer moves TOWARDS the listener, its velocity component is NEGATIVE if buffer moves AWAY from listener, its velocity component is POSITIVE */ - flBufferVel = ProjectVector(&dsb->ds3db_ds3db.vVelocity, &vDistance); - /* calculate length of ds3dl.vVelocity component which causes Doppler Effect - NOTE: if listener moves TOWARDS the buffer, its velocity component is POSITIVE - if listener moves AWAY from buffer, its velocity component is NEGATIVE */ - flListenerVel = ProjectVector(&dsb->device->ds3dl.vVelocity, &vDistance); + flRelativeVel = ProjectVector(&vRelativeVel, &vDistance); /* formula taken from Gianicoli D.: Physics, 4th edition: */ - flFreq = dsb->ds3db_freq * ((DEFAULT_VELOCITY + flListenerVel)/(DEFAULT_VELOCITY + flBufferVel)); - TRACE("doppler: Buffer velocity (component) = %f, Listener velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", - flBufferVel, flListenerVel, dsb->ds3db_freq, flFreq); + flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flRelativeVel)); + TRACE("doppler: Relative velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", + flRelativeVel, dsb->ds3db_freq, flFreq); dsb->freq = flFreq; } diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index bfd632f3a00..5fa558f7c87 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1442,9 +1442,7 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0, -90, 22050, 22050); /* The Doppler shift does not depend on the frame of reference. */ - /* Wine TODO: The frequency is too low. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 90, 1, 0, 22050, 29400); - /* Wine TODO: The frequency is too low. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -90, 1, 0, 22050, 17640); IDirectSound3DListener_Release(listener);

1 0

Anton Baskanov : dsound/tests: Test that the Doppler shift is limited to +-0.5 speed of sound.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 8acc3b83e81e23ebe8c62c068ef6c934b6916e8c URL: https://gitlab.winehq.org/wine/wine/-/commit/8acc3b83e81e23ebe8c62c068ef6c9… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 09:14:07 2023 +0700 dsound/tests: Test that the Doppler shift is limited to +-0.5 speed of sound. --- dlls/dsound/tests/ds3d.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 5fa558f7c87..99a1f16cf8e 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1445,6 +1445,12 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 90, 1, 0, 22050, 29400); check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -90, 1, 0, 22050, 17640); + /* The Doppler shift is limited to +-0.5 speed of sound. */ + /* Wine TODO: The frequency is not limited. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -240, 22050, 44100); + /* Wine TODO: The frequency is not limited. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 240, 22050, 14700); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0