March 2022 - Wine-commits - list.winehq.org

Brendan Shanks : win32u: Remove workaround for Mac OS X 10.4 and 10.5.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: b6b0f7411c8bc561c424f47c419fb4fa39a16661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b0f7411c8bc561c424f47c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Mar 17 20:07:20 2022 -0700 win32u: Remove workaround for Mac OS X 10.4 and 10.5. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/freetype.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 77f4ef8eab3..b6063a14570 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1773,35 +1773,7 @@ static void load_mac_fonts(void) CFStringRef path; desc = CFArrayGetValueAtIndex(descs, i); - -#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 url = CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute); -#else - /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6, so - we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */ - { - CTFontRef font; - ATSFontRef atsFont; - OSStatus status; - FSRef fsref; - - font = CTFontCreateWithFontDescriptor(desc, 0, NULL); - if (!font) continue; - - atsFont = CTFontGetPlatformFont(font, NULL); - if (!atsFont) - { - CFRelease(font); - continue; - } - - status = ATSFontGetFileReference(atsFont, &fsref); - CFRelease(font); - if (status != noErr) continue; - - url = CFURLCreateFromFSRef(NULL, &fsref); - } -#endif if (!url) continue; ext = CFURLCopyPathExtension(url);

1 0

Rémi Bernon : windows.gaming.input: Fix vector InsertAt / RemoveAt copy sizes.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: d99101977d93f772ceb6ab8d05d2b33c00078788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99101977d93f772ceb6ab8d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 18 10:22:27 2022 +0100 windows.gaming.input: Fix vector InsertAt / RemoveAt copy sizes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/vector.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index c98c89195d1..db1a9057682 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -515,7 +515,7 @@ static HRESULT WINAPI vector_InsertAt( IVector_IInspectable *iface, UINT32 index } } - memmove( impl->elements + index + 1, impl->elements + index, impl->size++ * sizeof(*impl->elements) ); + memmove( impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements) ); IInspectable_AddRef( (impl->elements[index] = value) ); return S_OK; } @@ -528,7 +528,7 @@ static HRESULT WINAPI vector_RemoveAt( IVector_IInspectable *iface, UINT32 index if (index >= impl->size) return E_BOUNDS; IInspectable_Release( impl->elements[index] ); - memmove( impl->elements + index, impl->elements + index + 1, --impl->size * sizeof(*impl->elements) ); + memmove( impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements) ); return S_OK; }

1 0

Rémi Bernon : dinput: Allow setting DIPROP_AUTOCENTER when exclusively acquired.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 62d40eb0c852bbf66f68bd3e4f22965119b70dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d40eb0c852bbf66f68bd3e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 18 10:23:03 2022 +0100 dinput: Allow setting DIPROP_AUTOCENTER when exclusively acquired. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 ++ dlls/dinput/tests/force_feedback.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6cc190ee7fb..d881669c06f 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1009,6 +1009,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_AUTOCENTER: + if (impl->status == STATUS_ACQUIRED && !is_exclusively_acquired( impl )) return DIERR_ACQUIRED; + break; case (DWORD_PTR)DIPROP_AXISMODE: case (DWORD_PTR)DIPROP_BUFFERSIZE: case (DWORD_PTR)DIPROP_PHYSICALRANGE: diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 97aed4c993b..ce460147f9d 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -2924,6 +2924,9 @@ static BOOL test_force_feedback_joystick( DWORD version ) ok( hr == DI_OK, "Unacquire returned: %#lx\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr ); + prop_dword.dwData = DIPROPAUTOCENTER_ON; + hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); + ok( hr == DI_OK, "SetProperty DIPROP_AUTOCENTER returned %#lx\n", hr ); set_hid_expect( file, expect_acquire, sizeof(expect_acquire) ); hr = IDirectInputDevice8_Acquire( device );

1 0

Rémi Bernon : winebus.sys: Assume SDL device effects are running by default.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 338438ecef6d48d5df6d465863fdc1272cf4f508 URL: https://source.winehq.org/git/wine.git/?a=commit;h=338438ecef6d48d5df6d4658… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 18 10:23:29 2022 +0100 winebus.sys: Assume SDL device effects are running by default. If we cannot read their status with SDL_HapticGetEffectStatus. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 07fdd9d3fa2..a1e7942fe59 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -752,12 +752,13 @@ static void check_device_effects_state(struct sdl_device *impl) unsigned int i, ret; if (!impl->sdl_haptic) return; - if (!(impl->effect_support & SDL_HAPTIC_STATUS)) return; + if (!(impl->effect_support & EFFECT_SUPPORT_PHYSICAL)) return; for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) { if (impl->effect_ids[i] == -1) continue; - ret = pSDL_HapticGetEffectStatus(impl->sdl_haptic, impl->effect_ids[i]); + if (!(impl->effect_support & SDL_HAPTIC_STATUS)) ret = 1; + else ret = pSDL_HapticGetEffectStatus(impl->sdl_haptic, impl->effect_ids[i]); if (impl->effect_state[i] == ret) continue; impl->effect_state[i] = ret; hid_device_set_effect_state(iface, i, effect_flags | (ret == 1 ? EFFECT_STATE_EFFECT_PLAYING : 0));

1 0

Jacek Caban : user32: Move MDI child coordinates fixup out of WIN_FixCoordinates.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: f2f07d5ba7950c377da392c5ca840a3fca1894e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2f07d5ba7950c377da392c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 18 14:27:19 2022 +0100 user32: Move MDI child coordinates fixup out of WIN_FixCoordinates. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 22227c23280..db5158c0b6f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -716,35 +716,10 @@ other_process: static void WIN_FixCoordinates( CREATESTRUCTW *cs, INT *sw) { #define IS_DEFAULT(x) ((x) == CW_USEDEFAULT || (x) == (SHORT)0x8000) - POINT pos[2]; - - if (cs->dwExStyle & WS_EX_MDICHILD) - { - UINT id = 0; - - MDI_CalcDefaultChildPos(cs->hwndParent, -1, pos, 0, &id); - if (!(cs->style & WS_POPUP)) cs->hMenu = ULongToHandle(id); - - TRACE("MDI child id %04x\n", id); - } - if (cs->style & (WS_CHILD | WS_POPUP)) { - if (cs->dwExStyle & WS_EX_MDICHILD) - { - if (IS_DEFAULT(cs->x)) - { - cs->x = pos[0].x; - cs->y = pos[0].y; - } - if (IS_DEFAULT(cs->cx) || !cs->cx) cs->cx = pos[1].x; - if (IS_DEFAULT(cs->cy) || !cs->cy) cs->cy = pos[1].y; - } - else - { - if (IS_DEFAULT(cs->x)) cs->x = cs->y = 0; - if (IS_DEFAULT(cs->cx)) cs->cx = cs->cy = 0; - } + if (IS_DEFAULT(cs->x)) cs->x = cs->y = 0; + if (IS_DEFAULT(cs->cx)) cs->cx = cs->cy = 0; } else /* overlapped window */ { @@ -905,6 +880,11 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) #undef DUMPED_EX_STYLES } +static BOOL is_default_coord( int x ) +{ + return x == CW_USEDEFAULT || x == 0x8000; +} + /*********************************************************************** * map_dpi_create_struct */ @@ -971,6 +951,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* Fix the styles for MDI children */ if (cs->dwExStyle & WS_EX_MDICHILD) { + POINT pos[2]; + UINT id = 0; + if (!(win_get_flags( cs->hwndParent ) & WIN_ISMDICLIENT)) { WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", cs->hwndParent); @@ -1029,6 +1012,22 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, else NtUserShowWindow( top_child, SW_SHOWNORMAL ); } } + + MDI_CalcDefaultChildPos( cs->hwndParent, -1, pos, 0, &id ); + if (!(cs->style & WS_POPUP)) cs->hMenu = ULongToHandle(id); + + TRACE( "MDI child id %04x\n", id ); + + if (cs->style & (WS_CHILD | WS_POPUP)) + { + if (is_default_coord( cs->x )) + { + cs->x = pos[0].x; + cs->y = pos[0].y; + } + if (is_default_coord( cs->cx ) || !cs->cx) cs->cx = pos[1].x; + if (is_default_coord( cs->cy ) || !cs->cy) cs->cy = pos[1].y; + } } /* Find the parent window */

1 0

Conor McCarthy : vkd3d: Back descriptor heaps with Vulkan descriptor sets if descriptor indexing is available.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 2b71ea406f494e9068c110a99b4ff655b667fc1e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b71ea406f494e9068c110a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:18:59 2022 +1000 vkd3d: Back descriptor heaps with Vulkan descriptor sets if descriptor indexing is available. The existing implementation using virtual descriptor heaps, where Vk descriptor sets are created for the bindings in the root descriptor tables, is inefficient when multiple command lists are used with large descriptor heaps. It also cannot support updating a descriptor set after it is bound. This patch creates Vk sets for each D3D12 heap. Because D3D12 heaps can contain CBV, SRV and UAV descriptors in the same heap, multiple Vk sets are needed for each heap, however the total number of populated descriptors is never more than (heap size + UAV counter count). A new 'virtual_heaps' config option is introduced to make the old implementation available when needed. It's not always possible to determine if this is necessary when the device is created. Up to nine Vk descriptor sets may be used. It's theoretically possible to reduce this to eight by placing immutable samplers in the push descriptor set layout, but contradictions in earlier versions of the Vulkan spec made driver support inconsistent. The documentation was corrected in version 1.2.203. This patch also adds support for UAV counter descriptor arrays. It's not practical to add this in a separate patch due to complications with combining the old UAV counter implementation with the new descriptor heap implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47713 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47154 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 3 + include/private/vkd3d_common.h | 4 + include/vkd3d_windows.h | 1 + libs/vkd3d/command.c | 151 +++++++++++++++++++++++++++- libs/vkd3d/device.c | 159 ++++++++++++++++++++++++++++- libs/vkd3d/resource.c | 197 ++++++++++++++++++++++++++++++++++++ libs/vkd3d/state.c | 222 +++++++++++++++++++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 56 +++++++++++ tests/d3d12.c | 13 ++- 9 files changed, 787 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2b71ea406f494e9068c…

1 0

Conor McCarthy : vkd3d: Optimise descriptor copying for Vulkan-backed heaps.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 5e4f1e1eadf2a9c5810dcae054bd5b170a6e5b46 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e4f1e1eadf2a9c5810dcae… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:19:00 2022 +1000 vkd3d: Optimise descriptor copying for Vulkan-backed heaps. Source descriptors are copied to separate arrays to facilitate use of pre-initialised Vulkan structures, and allow arrayed writes where possible. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 144 ++++++++++++++++++++++++++++++++++ libs/vkd3d/resource.c | 190 ++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 24 +++++- 3 files changed, 329 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=5e4f1e1eadf2a9c5810…

1 0

Conor McCarthy : vkd3d: Do not copy descriptors having identical views.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 2b0fd2a055a4ad4a865a3314963cabd4a48f7249 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b0fd2a055a4ad4a865a331… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:19:01 2022 +1000 vkd3d: Do not copy descriptors having identical views. Improves performance in Control, which copies large numbers of descriptors per frame where often only ~10% are not identical. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 8 +++--- libs/vkd3d/device.c | 11 ++++++-- libs/vkd3d/resource.c | 63 +++++++++++++++++++++++++++------------------- libs/vkd3d/vkd3d_private.h | 11 +++++++- 4 files changed, 60 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2b0fd2a055a4ad4a865…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Correctly calculate offsets for array elements.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: ee764359d0fb2b9febb202de661a19234b8e293a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee764359d0fb2b9febb202d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 17 21:58:35 2022 +0100 vkd3d-shader/hlsl: Correctly calculate offsets for array elements. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- libs/vkd3d-shader/hlsl.c | 7 +++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 2 +- tests/hlsl-struct-array.shader_test | 19 +++++++++++++++++++ 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79aacfcd..f2c8440c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,7 @@ vkd3d_shader_tests = \ tests/hlsl-state-block-syntax.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ + tests/hlsl-struct-array.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -339,7 +340,6 @@ XFAIL_TESTS = \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-mul.shader_test \ - tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ea5e35d2..d88b0b6d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -202,6 +202,13 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } } +/* Returns the size of a type, considered as part of an array of that type. + * As such it includes padding after the type. */ +unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type) +{ + return align(type->reg_size, 4); +} + static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 243ed72b..2e8ba4af 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -783,6 +783,7 @@ bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type); struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, unsigned int default_majority, unsigned int modifiers); unsigned int hlsl_type_component_count(struct hlsl_type *type); +unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type); unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset); bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 92dcb3f2..521ca0a7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -607,7 +607,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in return NULL; } - if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size, loc))) + if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), loc))) return NULL; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 62dbce5e..ca3acba0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -621,7 +621,7 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (type->type != HLSL_CLASS_ARRAY) return false; element_type = type->e.array.type; - element_size = element_type->reg_size; + element_size = hlsl_type_get_array_element_reg_size(element_type); for (i = 0; i < type->e.array.elements_count; ++i) { diff --git a/tests/hlsl-struct-array.shader_test b/tests/hlsl-struct-array.shader_test new file mode 100644 index 00000000..a5df9cdb --- /dev/null +++ b/tests/hlsl-struct-array.shader_test @@ -0,0 +1,19 @@ +% In SM4, array elements are always aligned to the next vec4, although structs are not. + +[pixel shader] +uniform struct +{ + float p, q; +} colours[3]; + +float4 main() : sv_target +{ + return float4(colours[0].q, colours[1].p, colours[2].q, colours[2].p); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +uniform 8 float4 0.5 0.6 0.0 0.0 +draw quad +probe all rgba (0.2, 0.3, 0.6, 0.5)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 84059d61c32950b634e44cac491ea8173705cc4d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=84059d61c32950b634e44ca… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 10 12:14:05 2022 -0300 vkd3d-shader/hlsl: Allow offsets for scalar and vector variables. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl_codegen.c | 22 +++++----------------- libs/vkd3d-shader/hlsl_sm1.c | 4 ++-- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++----- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2e8ba4af..0543e144 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -794,8 +794,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type); +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ca3acba0..98be3aeb 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl return 0; } -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type) +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref) { const struct hlsl_ir_var *var = deref->var; struct hlsl_reg ret = var->reg; @@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) - { - assert(!offset); - ret.writemask = var->reg.writemask; - } - else - { - assert(type_is_single_reg(type)); - ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); - } + ret.writemask = 0xf & (0xf << (offset % 4)); + if (var->reg.writemask) + ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask); + return ret; } diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 90ec6058..f661dbc2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, @@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { const struct hlsl_ir_store *store = hlsl_ir_store(instr); const struct hlsl_ir_node *rhs = store->rhs.node; - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..802db3c1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_INPUT; @@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->dim = VKD3D_SM4_DIMENSION_SCALAR; else reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_OUTPUT; @@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_TEMP;

1 0