February 2024 - Wine-commits

Henri Verbeet : ci: Enable colour output for the tests.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: vkd3d Branch: master Commit: edc8e38bd9755361e9394703f0c3fd53661d2e83 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/edc8e38bd9755361e9394703f0c3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 12:01:04 2024 +0100 ci: Enable colour output for the tests. Autodetection doesn't work, but gitlab does in fact support colour output. Perhaps more importantly, the "Scroll to next failure" feature essentially scans the output for red text. --- gitlab/build-linux | 2 +- gitlab/build-mac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index a68a36b5..a060eadc 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -14,7 +14,7 @@ cd build export LD_LIBRARY_PATH=/usr/local/lib if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ make -j$(nproc) ; then - make -j$(nproc) check || \ + make -j$(nproc) AM_COLOR_TESTS=always check || \ touch ../tests_failed else touch ../build_failed diff --git a/gitlab/build-mac b/gitlab/build-mac index 3225c8a0..a3119686 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -13,7 +13,7 @@ mkdir build cd build if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Werror" && \ make -j$(sysctl -n hw.ncpu) ; then - make -j$(sysctl -n hw.ncpu) check || \ + make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \ touch ../tests_failed else touch ../build_failed

1 0

Henri Verbeet : vkd3d-shader/hlsl: Replace HLSL_MODIFIER_RASTERIZER_ORDERED with a hlsl_type.e.resource flag.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: vkd3d Branch: master Commit: d4223a03c854743c6be0b2839eb91e9a8bb3c709 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d4223a03c854743c6be0b2839eb91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 19 12:52:31 2024 +0100 vkd3d-shader/hlsl: Replace HLSL_MODIFIER_RASTERIZER_ORDERED with a hlsl_type.e.resource flag. --- libs/vkd3d-shader/hlsl.c | 11 ++++++++--- libs/vkd3d-shader/hlsl.h | 9 +++++---- libs/vkd3d-shader/hlsl.y | 4 ++-- libs/vkd3d-shader/tpf.c | 6 +++--- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 60ed77ab..353e34d2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -758,8 +758,8 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ return type; } -struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, - enum hlsl_sampler_dim dim, struct hlsl_type *format, uint32_t modifiers) +struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, + struct hlsl_type *format, bool rasteriser_ordered) { struct hlsl_type *type; @@ -770,8 +770,8 @@ struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, type->dimx = format->dimx; type->dimy = 1; type->sampler_dim = dim; - type->modifiers = modifiers; type->e.resource.format = format; + type->e.resource.rasteriser_ordered = rasteriser_ordered; hlsl_type_calculate_reg_size(ctx, type); list_add_tail(&ctx->types, &type->entry); return type; @@ -890,6 +890,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC && !hlsl_types_are_equal(t1->e.resource.format, t2->e.resource.format)) return false; + if (t1->base_type == HLSL_TYPE_UAV && t1->e.resource.rasteriser_ordered != t2->e.resource.rasteriser_ordered) + return false; } if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -1009,7 +1011,10 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, if (type->base_type == HLSL_TYPE_TECHNIQUE) type->e.version = old->e.version; if (old->base_type == HLSL_TYPE_TEXTURE || old->base_type == HLSL_TYPE_UAV) + { type->e.resource.format = old->e.resource.format; + type->e.resource.rasteriser_ordered = old->e.resource.rasteriser_ordered; + } break; default: diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 5deac632..5b73857b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -200,6 +200,8 @@ struct hlsl_type { /* Format of the data contained within the type. */ struct hlsl_type *format; + /* The type is a rasteriser-ordered view. */ + bool rasteriser_ordered; } resource; /* Additional field to distinguish object types. Currently used only for technique types. */ unsigned int version; @@ -370,11 +372,10 @@ struct hlsl_attribute #define HLSL_STORAGE_CENTROID 0x00004000 #define HLSL_STORAGE_NOPERSPECTIVE 0x00008000 #define HLSL_STORAGE_LINEAR 0x00010000 -#define HLSL_MODIFIER_RASTERIZER_ORDERED 0x00020000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ - HLSL_MODIFIER_COLUMN_MAJOR | HLSL_MODIFIER_RASTERIZER_ORDERED) + HLSL_MODIFIER_COLUMN_MAJOR) #define HLSL_INTERPOLATION_MODIFIERS_MASK (HLSL_STORAGE_NOINTERPOLATION | HLSL_STORAGE_CENTROID | \ HLSL_STORAGE_NOPERSPECTIVE | HLSL_STORAGE_LINEAR) @@ -1282,8 +1283,8 @@ struct hlsl_ir_var *hlsl_new_synthetic_var_named(struct hlsl_ctx *ctx, const cha struct hlsl_type *type, const struct vkd3d_shader_location *loc, bool dummy_scope); struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format, unsigned int sample_count); -struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, - enum hlsl_sampler_dim dim, struct hlsl_type *format, uint32_t modifiers); +struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, + struct hlsl_type *format, bool rasteriser_ordered); struct hlsl_ir_node *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location *loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5a5f77ed..dc7b4c1b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6263,12 +6263,12 @@ type_no_void: | uav_type '<' type '>' { validate_uav_type(ctx, $1, $3, &@3); - $$ = hlsl_new_uav_type(ctx, $1, $3, 0); + $$ = hlsl_new_uav_type(ctx, $1, $3, false); } | rov_type '<' type '>' { validate_uav_type(ctx, $1, $3, &@3); - $$ = hlsl_new_uav_type(ctx, $1, $3, HLSL_MODIFIER_RASTERIZER_ORDERED); + $$ = hlsl_new_uav_type(ctx, $1, $3, true); } | TYPE_IDENTIFIER { diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 6561f1fb..10dde985 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4259,6 +4259,9 @@ static void write_sm4_dcl_textures(const struct tpf_writer *tpf, const struct ex instr.opcode = VKD3D_SM5_OP_DCL_UAV_TYPED; break; } + + if (resource->data_type->e.resource.rasteriser_ordered) + instr.opcode |= VKD3DSUF_RASTERISER_ORDERED_VIEW << VKD3D_SM5_UAV_FLAGS_SHIFT; } else { @@ -4272,9 +4275,6 @@ static void write_sm4_dcl_textures(const struct tpf_writer *tpf, const struct ex instr.extra_bits |= component_type->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; } - if (resource->data_type->modifiers & HLSL_MODIFIER_RASTERIZER_ORDERED) - instr.opcode |= VKD3DSUF_RASTERISER_ORDERED_VIEW << VKD3D_SM5_UAV_FLAGS_SHIFT; - write_sm4_instruction(tpf, &instr); } }

1 0

Henri Verbeet : vkd3d-shader/hlsl: Introduce hlsl_type.e.resource.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: vkd3d Branch: master Commit: 49d14613a50d02abb9a03cc68c77409cc4d84ff2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/49d14613a50d02abb9a03cc68c774… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 19 13:57:54 2024 +0100 vkd3d-shader/hlsl: Introduce hlsl_type.e.resource. --- libs/vkd3d-shader/hlsl.c | 16 ++++++++-------- libs/vkd3d-shader/hlsl.h | 10 +++++++--- libs/vkd3d-shader/hlsl.y | 16 ++++++++-------- libs/vkd3d-shader/hlsl_codegen.c | 2 +- libs/vkd3d-shader/tpf.c | 6 +++--- 5 files changed, 27 insertions(+), 23 deletions(-)

1 0

Paul Gofman : dwrite: Force debug info in critical sections.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: wine Branch: master Commit: 6fda28d030602e2404d7b1359d838709353b1334 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fda28d030602e2404d7b1359d8387… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 20 17:54:33 2024 -0600 dwrite: Force debug info in critical sections. --- dlls/dwrite/font.c | 2 +- dlls/dwrite/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2028440ca8e..83a293e57fe 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5993,7 +5993,7 @@ void init_local_fontfile_loader(void) local_fontfile_loader.IDWriteLocalFontFileLoader_iface.lpVtbl = &localfontfileloadervtbl; local_fontfile_loader.refcount = 1; list_init(&local_fontfile_loader.streams); - InitializeCriticalSection(&local_fontfile_loader.cs); + InitializeCriticalSectionEx(&local_fontfile_loader.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); local_fontfile_loader.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": localfileloader.lock"); } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 6776b1ce974..e8765f0672e 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -2097,7 +2097,7 @@ static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYP list_init(&factory->file_loaders); list_init(&factory->localfontfaces); - InitializeCriticalSection(&factory->cs); + InitializeCriticalSectionEx(&factory->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); factory->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": dwritefactory.lock"); }

1 0

Paul Gofman : inetcomm: Force debug info in critical sections.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: wine Branch: master Commit: 39e5926760d36fc0b0c031118c60754b017dcaa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/39e5926760d36fc0b0c031118c6075… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 20 17:55:17 2024 -0600 inetcomm: Force debug info in critical sections. --- dlls/inetcomm/mimeintl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 1e5b1a0ce90..9a4c610d996 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -526,7 +526,7 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat)); global_internat->IMimeInternational_iface.lpVtbl = &mime_internat_vtbl; global_internat->refs = 0; - InitializeCriticalSection(&global_internat->cs); + InitializeCriticalSectionEx(&global_internat->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); global_internat->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": global_internat.cs"); list_init(&global_internat->charsets);

1 0

Rémi Bernon : winegstreamer: Use MFCalculateImageSize to compute output info size.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: wine Branch: master Commit: 9a591bf4fee2a4eec098c0d1b2cb10d3cec8ddcd URL: https://gitlab.winehq.org/wine/wine/-/commit/9a591bf4fee2a4eec098c0d1b2cb10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 20 11:13:45 2024 +0100 winegstreamer: Use MFCalculateImageSize to compute output info size. --- dlls/winegstreamer/h264_decoder.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index fae4ede3b54..bc46936555a 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -397,6 +397,23 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR return create_output_media_type(decoder, decoder->output_types[index], NULL, type); } +static HRESULT update_output_info_size(struct h264_decoder *decoder, UINT32 width, UINT32 height) +{ + HRESULT hr = E_FAIL; + UINT32 i, size; + + decoder->output_info.cbSize = 0; + + for (i = 0; i < decoder->output_type_count; ++i) + { + if (FAILED(hr = MFCalculateImageSize(decoder->output_types[i], width, height, &size))) + return hr; + decoder->output_info.cbSize = max(size, decoder->output_info.cbSize); + } + + return hr; +} + static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { struct h264_decoder *decoder = impl_from_IMFTransform(iface); @@ -436,7 +453,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM { if (FAILED(hr = IMFMediaType_SetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, frame_size))) WARN("Failed to update stream type frame size, hr %#lx\n", hr); - decoder->output_info.cbSize = (frame_size >> 32) * (UINT32)frame_size * 2; + return update_output_info_size(decoder, frame_size >> 32, frame_size); } return S_OK; @@ -654,7 +671,8 @@ static HRESULT handle_stream_type_change(struct h264_decoder *decoder, const str if (FAILED(hr = IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, &frame_size))) return hr; - decoder->output_info.cbSize = (frame_size >> 32) * (UINT32)frame_size * 2; + if (FAILED(hr = update_output_info_size(decoder, frame_size >> 32, frame_size))) + return hr; uninit_allocator(decoder); return MF_E_TRANSFORM_STREAM_CHANGE;

1 0

Rémi Bernon : ir50_32: Use the proper hr value for stream format change.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: wine Branch: master Commit: e1b21bf1e9e673526c6b2ad036ef2cc059191422 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1b21bf1e9e673526c6b2ad036ef2c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 17 00:08:42 2023 +0100 ir50_32: Use the proper hr value for stream format change. --- dlls/ir50_32/ir50.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ir50_32/ir50.c b/dlls/ir50_32/ir50.c index 65c93f7fe5e..69700359e99 100644 --- a/dlls/ir50_32/ir50.c +++ b/dlls/ir50_32/ir50.c @@ -252,7 +252,7 @@ static LRESULT IV50_Decompress( IMFTransform *decoder, ICDECOMPRESS *icd, DWORD mft_buf.pSample = out_sample; hr = IMFTransform_ProcessOutput( decoder, 0, 1, &mft_buf, &mft_status ); - if ( SUCCEEDED(hr) && (mft_status & MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE) ) + if ( hr == MF_E_TRANSFORM_STREAM_CHANGE ) hr = IMFTransform_ProcessOutput( decoder, 0, 1, &mft_buf, &mft_status ); if ( SUCCEEDED(hr) )

1 0

Rémi Bernon : winegstreamer: Use the H264 decoder to implement the IV50 decoder.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: wine Branch: master Commit: ae584ac620e01d6519883a973efc64ae6b22ae29 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae584ac620e01d6519883a973efc64… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 12:11:54 2024 +0100 winegstreamer: Use the H264 decoder to implement the IV50 decoder. --- MAINTAINERS | 1 - dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/h264_decoder.c | 35 ++- dlls/winegstreamer/video_decoder.c | 502 ------------------------------------- 4 files changed, 34 insertions(+), 505 deletions(-)

1 0

Rémi Bernon : winegstreamer: Rename struct h264_decoder to struct video_decoder.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: wine Branch: master Commit: 437d304c7249f55329c14b3d30533e98daa62291 URL: https://gitlab.winehq.org/wine/wine/-/commit/437d304c7249f55329c14b3d30533e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 12:14:03 2024 +0100 winegstreamer: Rename struct h264_decoder to struct video_decoder. --- MAINTAINERS | 2 +- dlls/winegstreamer/Makefile.in | 2 +- .../{h264_decoder.c => video_decoder.c} | 56 +++++++++++----------- 3 files changed, 30 insertions(+), 30 deletions(-)

1 0

Ivo Ivanov : hidclass.sys: Use HID_DEVICE in the mfg_section to match the recent changes.
by Alexandre Julliard 21 Feb '24

21 Feb '24

Module: wine Branch: master Commit: e24cf32f810b73556bbf7c51584de45224721d3e URL: https://gitlab.winehq.org/wine/wine/-/commit/e24cf32f810b73556bbf7c51584de4… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Wed Feb 21 13:09:52 2024 +0200 hidclass.sys: Use HID_DEVICE in the mfg_section to match the recent changes. --- dlls/hidclass.sys/input.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/input.inf b/dlls/hidclass.sys/input.inf index d9222b13672..8be8335edad 100644 --- a/dlls/hidclass.sys/input.inf +++ b/dlls/hidclass.sys/input.inf @@ -7,7 +7,7 @@ Class=HIDClass Wine=mfg_section [mfg_section] -Wine HID device=device_section,HID\ +Wine HID device=device_section,HID_DEVICE [device_section.Services] AddService = ,0x2

1 0