- Wine-Devel - list.winehq.org

[PATCH 0/1] MR381: mciqtz32: Fix thread handle leak if a second play.
by Akihiro Sagawa (＠sgwaki) July 5, 2022

July 5, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/381

2 2

[PATCH vkd3d v2 1/5] vkd3d-shader/hlsl: Write SM4 casts from bool.
by Giovanni Mascellani July 5, 2022

July 5, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Do not hardcode the bit pattern of 1.0f. * Make the mask a parameter to write_sm4_cast_from_bool(). --- libs/vkd3d-shader/hlsl_sm4.c | 33 +++++++++++++++++++++++++++--- tests/cast-to-float.shader_test | 2 +- tests/cast-to-int.shader_test | 4 ++-- tests/cast-to-uint.shader_test | 4 ++-- tests/hlsl-bool-cast.shader_test | 18 ++++++++++++++++ tests/logic-operations.shader_test | 6 +++--- 6 files changed, 56 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 79027169..1edc5818 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1459,9 +1459,36 @@ static bool type_is_float(const struct hlsl_type *type) return type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF; } +static void write_sm4_cast_from_bool(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr, + const struct hlsl_ir_node *arg, uint32_t mask) +{ + struct sm4_instruction instr; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_AND; + + sm4_dst_from_node(&instr.dsts[0], &expr->node); + instr.dst_count = 1; + + sm4_src_from_node(&instr.srcs[0], arg, instr.dsts[0].writemask); + instr.srcs[1].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + instr.srcs[1].reg.type = VKD3D_SM4_RT_IMMCONST; + instr.srcs[1].reg.dim = VKD3D_SM4_DIMENSION_SCALAR; + instr.srcs[1].reg.immconst_uint[0] = mask; + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) { + static const union + { + uint32_t u; + float f; + } one = { .f = 1.0 }; const struct hlsl_ir_node *arg1 = expr->operands[0].node; const struct hlsl_type *dst_type = expr->node.data_type; const struct hlsl_type *src_type = arg1->data_type; @@ -1488,7 +1515,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to float."); + write_sm4_cast_from_bool(ctx, buffer, expr, arg1, one.u); break; case HLSL_TYPE_DOUBLE: @@ -1514,7 +1541,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to int."); + write_sm4_cast_from_bool(ctx, buffer, expr, arg1, 1); break; case HLSL_TYPE_DOUBLE: @@ -1540,7 +1567,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint."); + write_sm4_cast_from_bool(ctx, buffer, expr, arg1, 1); break; case HLSL_TYPE_DOUBLE: diff --git a/tests/cast-to-float.shader_test b/tests/cast-to-float.shader_test index 1844b1f3..f0910020 100644 --- a/tests/cast-to-float.shader_test +++ b/tests/cast-to-float.shader_test @@ -12,7 +12,7 @@ uniform 0 int -1 uniform 1 uint 3 uniform 2 int -2 uniform 3 float 0.5 -todo draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/cast-to-int.shader_test b/tests/cast-to-int.shader_test index ce42827b..4c5d0e2f 100644 --- a/tests/cast-to-int.shader_test +++ b/tests/cast-to-int.shader_test @@ -19,8 +19,8 @@ uniform 0 float 2.6 uniform 1 int -2 uniform 2 int -2 uniform 3 float -3.6 -todo draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +draw quad +todo probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/cast-to-uint.shader_test b/tests/cast-to-uint.shader_test index 8b7964ff..66f7267e 100644 --- a/tests/cast-to-uint.shader_test +++ b/tests/cast-to-uint.shader_test @@ -19,8 +19,8 @@ uniform 0 float 2.6 uniform 1 int 2 uniform 2 int -2 uniform 3 float -3.6 -todo draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +draw quad +todo probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test index 8880b2f5..397cbcc0 100644 --- a/tests/hlsl-bool-cast.shader_test +++ b/tests/hlsl-bool-cast.shader_test @@ -12,3 +12,21 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (0.0, 0.0, 1.0, 1.0) + +[require] +shader model >= 4.0 + +[pixel shader] +uniform float4 x; +uniform int4 y; + +float4 main() : SV_TARGET +{ + return (float4)(bool4)x + 10.0 * (float4)(int4)(bool4)y; +} + +[test] +uniform 0 float4 0.0 0.0 2.0 4.0 +uniform 4 int4 0 1 0 10 +draw quad +probe all rgba (0.0, 10.0, 1.0, 11.0) diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index 9a5cec3f..f888e831 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -61,7 +61,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -114,7 +114,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] -- 2.36.1

3 14

[PATCH] d2d1/tests: Fix compilation with clang.
by Dmitry Timoshkov July 5, 2022

July 5, 2022

../wine.src/dlls/d2d1/tests/d2d1.c:11078:11: error: cannot combine with previous 'type-name' declaration specifier INT32 _int32; ^ ../wine.src/dlls/d2d1/tests/d2d1.c:11078:5: warning: declaration does not declare anything [-Wmissing-declarations] INT32 _int32; ^~~~~~~~~~~~ Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/tests/d2d1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 334e9f1adea..0236362e724 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11075,7 +11075,7 @@ static void test_effect_properties(BOOL d3d11) UINT32 count, data; WCHAR buffer[128]; float mat[20]; - INT32 _int32; + INT32 val; CLSID clsid; BOOL cached; HRESULT hr; @@ -11174,9 +11174,9 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"Int32Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); prop_type = ID2D1Effect_GetType(effect, index); ok(prop_type == D2D1_PROPERTY_TYPE_INT32, "Unexpected type %u.\n", prop_type); - hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_INT32, (BYTE *)&_int32, sizeof(_int32)); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_INT32, (BYTE *)&val, sizeof(val)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(_int32 == -2, "Unexpected value %d.\n", _int32); + ok(val == -2, "Unexpected value %d.\n", val); /* UInt32 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"UInt32Prop"); -- 2.36.1

3 3

Re: [PATCH v3 0/6] MR370: mciqtz32: Simplify video window management by creating default window.
by Akihiro Sagawa (＠sgwaki) July 5, 2022

July 5, 2022

In v2, I dropped the first patch -- mciqtz32: Fix thread handle leak if a second play. I'll send it latter with improved tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/370#note_3340

1 0

Re: [PATCH v2 0/8] MR343: scrrun: Implement MoveFolder().
by Robert Wilhelm (＠sloper42) July 5, 2022

July 5, 2022

Thanks for review. I found PathAppendW and _wsplitpath and use them to create a smaller patch. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/343#note_3338

1 0

[PATCH v9 0/9] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod
by Claire (＠ClearlyClaire) July 5, 2022

July 5, 2022

When `GetMixFormat` or `GetDevicePeriod` are used, return values specific to the selected device instead of those of the default one. This is especially useful when the audio devices features less channels than one specifically selected by the application. This patch is part of an attempt to get Sony's DualSense controllers to work with Windows games through Wine. This is not enough by itself, but getting the proper mix format is required for most of those games to correctly use the haptic feedback features of the DualSense (which go through an audio output with 4 audio devices). -- v9: winepulse.drv: don't probe default devices twice winepulse.drv: do not fallback to global periods in pulse_get_device_period winepulse.drv: do not fallback to global pulse_fmt in pulse_get_mix_format winepulse.drv: use stream-specific period in pulse_get_latency winepulse.drv: store and use device period on stream creation https://gitlab.winehq.org/wine/wine/-/merge_requests/337

3 10

[PATCH v3 0/4] MR369: mf: MFGetTopoNodeCurrentType fixes.
by Rémi Bernon July 5, 2022

July 5, 2022

-- v3: mf: Add error cases for MFGetTopoNodeCurrentType. mf/tests: Add more MFGetTopoNodeCurrentType tests. winegstreamer: Fix ColorConvert transform GetCurrent(Input|Output)Type. winegstreamer: Fix Resampler transform GetCurrent(Input|Output)Type. https://gitlab.winehq.org/wine/wine/-/merge_requests/369

2 8

[PATCH 0/1] MR371: wmic: Handle properly list for GET verb.
by Nikolay Sivov (＠nsivov) July 5, 2022

July 5, 2022

Instead of querying all properties and then matching to requested one, first check if all requested properties are supported by given class. Then select just that subset. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/371

3 2

[PATCH v2 0/7] MR374: win32u: scroll conversion
by Jacek Caban (＠jacek) July 5, 2022

July 5, 2022

-- v2: win32u: Move WM_NCCREATE scroll handling from user32. win32u: Move get_scroll_info_ptr implementation from user32. user32: Use GetScrollInfo for GetScrollRange implementation. https://gitlab.winehq.org/wine/wine/-/merge_requests/374

3 8

[PATCH 0/7] MR374: win32u: scroll conversion
by Jacek Caban (＠jacek) July 5, 2022

July 5, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/374

4 11