- Wine-Commits - list.winehq.org

Rémi Bernon : winegstreamer: Pass optional GstVideoInfo to read_transform_output_video.
by Alexandre Julliard April 16, 2024

April 16, 2024

Module: wine Branch: master Commit: c4db5e23dd23d9f3bd0bd7a6f057bdfde98d1e69 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4db5e23dd23d9f3bd0bd7a6f057bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 9 10:39:44 2024 +0200 winegstreamer: Pass optional GstVideoInfo to read_transform_output_video. Instead of computing them in copy_video_buffer. --- dlls/winegstreamer/wg_transform.c | 59 ++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 78426161fa4..0d50518fa5b 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -716,25 +716,14 @@ NTSTATUS wg_transform_push_data(void *args) return STATUS_SUCCESS; } -static NTSTATUS copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_align, - struct wg_sample *sample, gsize *total_size) +static NTSTATUS copy_video_buffer(GstBuffer *buffer, const GstVideoInfo *src_video_info, + const GstVideoInfo *dst_video_info, struct wg_sample *sample, gsize *total_size) { NTSTATUS status = STATUS_UNSUCCESSFUL; GstVideoFrame src_frame, dst_frame; - GstVideoInfo src_info, dst_info; - GstVideoAlignment align; GstBuffer *dst_buffer; - if (!gst_video_info_from_caps(&src_info, caps)) - { - GST_ERROR("Failed to get video info from caps."); - return STATUS_UNSUCCESSFUL; - } - - dst_info = src_info; - align_video_info_planes(plane_align, &dst_info, &align); - - if (sample->max_size < dst_info.size) + if (sample->max_size < dst_video_info->size) { GST_ERROR("Output buffer is too small."); return STATUS_BUFFER_TOO_SMALL; @@ -746,14 +735,14 @@ static NTSTATUS copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_ GST_ERROR("Failed to wrap wg_sample into GstBuffer"); return STATUS_UNSUCCESSFUL; } - gst_buffer_set_size(dst_buffer, dst_info.size); - *total_size = sample->size = dst_info.size; + gst_buffer_set_size(dst_buffer, dst_video_info->size); + *total_size = sample->size = dst_video_info->size; - if (!gst_video_frame_map(&src_frame, &src_info, buffer, GST_MAP_READ)) + if (!gst_video_frame_map(&src_frame, src_video_info, buffer, GST_MAP_READ)) GST_ERROR("Failed to map source frame."); else { - if (!gst_video_frame_map(&dst_frame, &dst_info, dst_buffer, GST_MAP_WRITE)) + if (!gst_video_frame_map(&dst_frame, dst_video_info, dst_buffer, GST_MAP_WRITE)) GST_ERROR("Failed to map destination frame."); else { @@ -770,8 +759,7 @@ static NTSTATUS copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_ return status; } -static NTSTATUS copy_buffer(GstBuffer *buffer, struct wg_sample *sample, - gsize *total_size) +static NTSTATUS copy_buffer(GstBuffer *buffer, struct wg_sample *sample, gsize *total_size) { GstMapInfo info; @@ -840,7 +828,7 @@ static bool sample_needs_buffer_copy(struct wg_sample *sample, GstBuffer *buffer } static NTSTATUS read_transform_output_video(struct wg_sample *sample, GstBuffer *buffer, - GstCaps *caps, gsize plane_align) + const GstVideoInfo *src_video_info, const GstVideoInfo *dst_video_info) { gsize total_size; NTSTATUS status; @@ -849,7 +837,7 @@ static NTSTATUS read_transform_output_video(struct wg_sample *sample, GstBuffer if (!(needs_copy = sample_needs_buffer_copy(sample, buffer, &total_size))) status = STATUS_SUCCESS; else - status = copy_video_buffer(buffer, caps, plane_align, sample, &total_size); + status = copy_video_buffer(buffer, src_video_info, dst_video_info, sample, &total_size); if (status) { @@ -924,8 +912,10 @@ NTSTATUS wg_transform_read_data(void *args) { struct wg_transform_read_data_params *params = args; struct wg_transform *transform = get_transform(params->transform); + GstVideoInfo src_video_info, dst_video_info; struct wg_sample *sample = params->sample; struct wg_format *format = params->format; + GstVideoAlignment align = {0}; GstBuffer *output_buffer; GstCaps *output_caps; bool discard_data; @@ -943,6 +933,18 @@ NTSTATUS wg_transform_read_data(void *args) output_buffer = gst_sample_get_buffer(transform->output_sample); output_caps = gst_sample_get_caps(transform->output_sample); + if (stream_type_from_caps(output_caps) == GST_STREAM_TYPE_VIDEO) + { + gsize plane_align = transform->attrs.output_plane_align; + + if (!gst_video_info_from_caps(&src_video_info, output_caps)) + GST_ERROR("Failed to get video info from %"GST_PTR_FORMAT, output_caps); + dst_video_info = src_video_info; + + /* set the desired output buffer alignment on the dest video info */ + align_video_info_planes(plane_align, &dst_video_info, &align); + } + if (GST_MINI_OBJECT_FLAG_IS_SET(transform->output_sample, GST_SAMPLE_FLAG_WG_CAPS_CHANGED)) { GST_MINI_OBJECT_FLAG_UNSET(transform->output_sample, GST_SAMPLE_FLAG_WG_CAPS_CHANGED); @@ -951,17 +953,10 @@ NTSTATUS wg_transform_read_data(void *args) if (format) { - gsize plane_align = transform->attrs.output_plane_align; - GstVideoAlignment align; - GstVideoInfo info; - wg_format_from_caps(format, output_caps); - if (format->major_type == WG_MAJOR_TYPE_VIDEO - && gst_video_info_from_caps(&info, output_caps)) + if (format->major_type == WG_MAJOR_TYPE_VIDEO) { - align_video_info_planes(plane_align, &info, &align); - GST_INFO("Returning video alignment left %u, top %u, right %u, bottom %u.", align.padding_left, align.padding_top, align.padding_right, align.padding_bottom); @@ -983,8 +978,8 @@ NTSTATUS wg_transform_read_data(void *args) } if (stream_type_from_caps(output_caps) == GST_STREAM_TYPE_VIDEO) - status = read_transform_output_video(sample, output_buffer, output_caps, - transform->attrs.output_plane_align); + status = read_transform_output_video(sample, output_buffer, + &src_video_info, &dst_video_info); else status = read_transform_output(sample, output_buffer);

1 0

Paul Gofman : winegstreamer: Destroy wg_transform in video_decoder/transform_SetInputType().
by Alexandre Julliard April 16, 2024

April 16, 2024

Module: wine Branch: master Commit: 718642478f29338c92f6dadd6c75523088028fdc URL: https://gitlab.winehq.org/wine/wine/-/commit/718642478f29338c92f6dadd6c7552… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 3 20:07:38 2024 -0600 winegstreamer: Destroy wg_transform in video_decoder/transform_SetInputType(). --- dlls/mf/tests/h264data.bin | Bin 3465 -> 8659 bytes dlls/mf/tests/resource.rc | 2 +- dlls/mf/tests/transform.c | 51 ++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/video_decoder.c | 8 +++++- 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/h264data.bin b/dlls/mf/tests/h264data.bin index a97ed63f205..f552f277928 100644 Binary files a/dlls/mf/tests/h264data.bin and b/dlls/mf/tests/h264data.bin differ diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index d9595c68980..ab1fb7ecbb0 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -55,7 +55,7 @@ mp3encdata.bin RCDATA mp3encdata.bin mp3decdata.bin RCDATA mp3decdata.bin /* Generated with: - * gst-launch-1.0 videotestsrc num-buffers=120 pattern=smpte100 ! \ + * gst-launch-1.0 videotestsrc num-buffers=360 pattern=smpte100 ! \ * video/x-raw,format=I420,width=84,height=82,framerate=30000/1001 ! \ * videoflip method=clockwise ! videoconvert ! \ * x264enc ! filesink location=dlls/mf/tests/h264data.bin diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index e43b1627789..6a4653cccee 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4379,7 +4379,7 @@ static void test_h264_decoder(void) ok(hr == S_OK, "ProcessMessage returned %#lx\n", hr); } ok(i == 2, "got %lu iterations\n", i); - ok(h264_encoded_data_len == 2425, "got h264_encoded_data_len %lu\n", h264_encoded_data_len); + ok(h264_encoded_data_len == 7619, "got h264_encoded_data_len %lu\n", h264_encoded_data_len); ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#lx\n", hr); ok(output_status == MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE, "got output[0].dwStatus %#lx\n", output_status); hr = IMFSample_GetTotalLength(output_sample, &length); @@ -8368,6 +8368,7 @@ static void test_h264_with_dxgi_manager(void) .attributes = output_sample_attributes, .sample_time = 333667, .sample_duration = 333667, .buffer_count = 1, .buffers = &output_buffer_desc_nv12, + .todo_time = TRUE, /* _SetInputType() / _SetOutputType() type resets the output sample timestamp on Windows. */ }; IMFDXGIDeviceManager *manager = NULL; @@ -8522,6 +8523,54 @@ static void test_h264_with_dxgi_manager(void) ok(info.dwFlags == (MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE | MFT_OUTPUT_STREAM_PROVIDES_SAMPLES), "got %#lx.\n", info.dwFlags); + hr = get_next_h264_output_sample(transform, &input_sample, NULL, output, &data, &data_len); + ok(hr == S_OK, "got %#lx\n", hr); + ok(output[0].dwStatus == 0, "got %#lx.\n", status); + sample = output[0].pSample; + IMFSample_Release(sample); + + /* Set input and output type trying to change output frame size (results in MF_E_TRANSFORM_STREAM_CHANGE with + * frame size reset. */ + hr = MFCreateMediaType(&type); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IMFMediaType_SetGUID(type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MFVideoFormat_H264); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IMFMediaType_SetUINT64(type, &MF_MT_FRAME_SIZE, 1088 | (1920ull << 32)); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IMFTransform_SetInputType(transform, 0, type, 0); + ok(hr == S_OK, "got %#lx\n", hr); + IMFMediaType_Release(type); + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &type); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IMFMediaType_SetGUID(type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, &MFVideoFormat_NV12); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IMFMediaType_SetUINT64(type, &MF_MT_FRAME_SIZE, ((UINT64)1920) << 32 | 1088); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, type, 0); + ok(hr == S_OK, "got %#lx\n", hr); + IMFMediaType_Release(type); + + hr = get_next_h264_output_sample(transform, &input_sample, NULL, output, &data, &data_len); + ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "got %#lx\n", hr); + ok(!output[0].pSample, "got %p.\n", output[0].pSample); + + /* Need to set output type with matching size now, or that hangs on Windows. */ + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &type); + ok(hr == S_OK, "got %#lx\n", hr); + IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size); + ok(hr == S_OK, "got %#lx\n", hr); + width = frame_size >> 32; + height = frame_size & 0xffffffff; + ok(width == aligned_width, "got %u.\n", width); + ok(height == aligned_height, "got %u.\n", height); + hr = IMFTransform_SetOutputType(transform, 0, type, 0); + ok(hr == S_OK, "got %#lx\n", hr); + IMFMediaType_Release(type); + hr = get_next_h264_output_sample(transform, &input_sample, NULL, output, &data, &data_len); ok(hr == S_OK, "got %#lx\n", hr); ok(output[0].dwStatus == 0, "got %#lx.\n", status); diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 0837217e3a6..8cdab7cdb8b 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -457,9 +457,15 @@ 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); - return update_output_info_size(decoder, frame_size >> 32, frame_size); + if (FAILED(hr = update_output_info_size(decoder, frame_size >> 32, frame_size))) + return hr; } + if (decoder->wg_transform) + { + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = 0; + } return S_OK; }

1 0

Rémi Bernon : winegstreamer: Introduce a new sample_needs_buffer_copy helper.
by Alexandre Julliard April 16, 2024

April 16, 2024

Module: wine Branch: master Commit: 4a6a3b90d28e1d5d9c3969770e338c301e18027e URL: https://gitlab.winehq.org/wine/wine/-/commit/4a6a3b90d28e1d5d9c3969770e338c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 16 08:25:39 2024 +0100 winegstreamer: Introduce a new sample_needs_buffer_copy helper. --- dlls/winegstreamer/wg_transform.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0cc6abb232f..a67f491c006 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -821,13 +821,10 @@ static void set_sample_flags_from_buffer(struct wg_sample *sample, GstBuffer *bu sample->flags |= WG_SAMPLE_FLAG_DISCONTINUITY; } -static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsize plane_align, - struct wg_sample *sample) +static bool sample_needs_buffer_copy(struct wg_sample *sample, GstBuffer *buffer, gsize *total_size) { - gsize total_size; - bool needs_copy; - NTSTATUS status; GstMapInfo info; + bool needs_copy; if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) { @@ -836,10 +833,20 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi return STATUS_UNSUCCESSFUL; } needs_copy = info.data != wg_sample_data(sample); - total_size = sample->size = info.size; + *total_size = sample->size = info.size; gst_buffer_unmap(buffer, &info); - if (!needs_copy) + return needs_copy; +} + +static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsize plane_align, + struct wg_sample *sample) +{ + gsize total_size; + NTSTATUS status; + bool needs_copy; + + if (!(needs_copy = sample_needs_buffer_copy(sample, buffer, &total_size))) status = STATUS_SUCCESS; else if (stream_type_from_caps(caps) == GST_STREAM_TYPE_VIDEO) status = copy_video_buffer(buffer, caps, plane_align, sample, &total_size);

1 0

Rémi Bernon : winegstreamer: Introduce a new set_sample_flags_from_buffer helper.
by Alexandre Julliard April 16, 2024

April 16, 2024

Module: wine Branch: master Commit: b2ea55a0f047074f1305be8af05bda8ce3b2f90c URL: https://gitlab.winehq.org/wine/wine/-/commit/b2ea55a0f047074f1305be8af05bda… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 16 08:23:10 2024 +0100 winegstreamer: Introduce a new set_sample_flags_from_buffer helper. --- dlls/winegstreamer/wg_transform.c | 47 ++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index aabe618972d..0cc6abb232f 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -796,6 +796,31 @@ static NTSTATUS copy_buffer(GstBuffer *buffer, GstCaps *caps, struct wg_sample * return STATUS_SUCCESS; } +static void set_sample_flags_from_buffer(struct wg_sample *sample, GstBuffer *buffer, gsize total_size) +{ + if (GST_BUFFER_PTS_IS_VALID(buffer)) + { + sample->flags |= WG_SAMPLE_FLAG_HAS_PTS; + sample->pts = GST_BUFFER_PTS(buffer) / 100; + } + if (GST_BUFFER_DURATION_IS_VALID(buffer)) + { + GstClockTime duration = GST_BUFFER_DURATION(buffer) / 100; + + duration = (duration * sample->size) / total_size; + GST_BUFFER_DURATION(buffer) -= duration * 100; + if (GST_BUFFER_PTS_IS_VALID(buffer)) + GST_BUFFER_PTS(buffer) += duration * 100; + + sample->flags |= WG_SAMPLE_FLAG_HAS_DURATION; + sample->duration = duration; + } + if (!GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT)) + sample->flags |= WG_SAMPLE_FLAG_SYNC_POINT; + if (GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DISCONT)) + sample->flags |= WG_SAMPLE_FLAG_DISCONTINUITY; +} + static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsize plane_align, struct wg_sample *sample) { @@ -828,27 +853,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi return status; } - if (GST_BUFFER_PTS_IS_VALID(buffer)) - { - sample->flags |= WG_SAMPLE_FLAG_HAS_PTS; - sample->pts = GST_BUFFER_PTS(buffer) / 100; - } - if (GST_BUFFER_DURATION_IS_VALID(buffer)) - { - GstClockTime duration = GST_BUFFER_DURATION(buffer) / 100; - - duration = (duration * sample->size) / total_size; - GST_BUFFER_DURATION(buffer) -= duration * 100; - if (GST_BUFFER_PTS_IS_VALID(buffer)) - GST_BUFFER_PTS(buffer) += duration * 100; - - sample->flags |= WG_SAMPLE_FLAG_HAS_DURATION; - sample->duration = duration; - } - if (!GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT)) - sample->flags |= WG_SAMPLE_FLAG_SYNC_POINT; - if (GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DISCONT)) - sample->flags |= WG_SAMPLE_FLAG_DISCONTINUITY; + set_sample_flags_from_buffer(sample, buffer, total_size); if (needs_copy) {

1 0

Alex Henrie : explorer: Fix font handle leaks in virtual desktop.
by Alexandre Julliard April 16, 2024

April 16, 2024

Module: wine Branch: master Commit: 19e27e95b9583ff62c22f29010529f7565fd0df5 URL: https://gitlab.winehq.org/wine/wine/-/commit/19e27e95b9583ff62c22f29010529f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Apr 12 22:21:52 2024 -0600 explorer: Fix font handle leaks in virtual desktop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56133 --- programs/explorer/desktop.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 25bba7cb7cb..a18c9806d42 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -271,7 +271,8 @@ static void draw_launchers( HDC hdc, RECT update_rect ) DT_CENTER|DT_WORDBREAK|DT_EDITCONTROL|DT_END_ELLIPSIS ); } - SelectObject( hdc, font ); + font = SelectObject( hdc, font ); + DeleteObject( font ); SetTextColor( hdc, color ); SetBkMode( hdc, mode ); } @@ -433,7 +434,8 @@ static BOOL get_icon_text_metrics( HWND hwnd, TEXTMETRICW *tm ) SystemParametersInfoW( SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0 ); hfont = SelectObject( hdc, CreateFontIndirectW( &lf ) ); ret = GetTextMetricsW( hdc, tm ); - SelectObject( hdc, hfont ); + hfont = SelectObject( hdc, hfont ); + DeleteObject( hfont ); ReleaseDC( hwnd, hdc ); return ret; }

1 0

Alexandre Julliard : rpcrt4/tests: Add some more parameter passing tests.
by Alexandre Julliard April 16, 2024

April 16, 2024

Module: wine Branch: master Commit: 4fc1591fc6f78e5e2bb8ecd9ad0f89ffee6a8084 URL: https://gitlab.winehq.org/wine/wine/-/commit/4fc1591fc6f78e5e2bb8ecd9ad0f89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 15 11:43:16 2024 +0200 rpcrt4/tests: Add some more parameter passing tests. --- dlls/rpcrt4/tests/server.c | 131 +++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 37 ++++++++++++ 2 files changed, 168 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index f92ed401a69..baf00aee744 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -68,6 +68,20 @@ static hyper (__cdecl *sum_hyper)(hyper x, hyper y); static int (__cdecl *sum_hyper_int)(hyper x, hyper y); static int (__cdecl *sum_char_hyper)(signed char x, hyper y); static void (__cdecl *square_out)(int x, int *y); +static int (__cdecl *sum_chars)(int a, chars_t x, chars_t y); +static int (__cdecl *sum_ints)(int a, ints_t x, ints_t y); +static int (__cdecl *sum_flts)(int a, flts_t x, flts_t y); +static int (__cdecl *sum_dbls)(int a, dbls_t x, dbls_t y); +static int (__cdecl *sum_iiff)(int x0, int y0, float x1, float y1); +static int (__cdecl *sum_ifif)(int x0, float y0, int x1, float y1); +static int (__cdecl *sum_iidd)(int x0, int y0, double x1, double y1); +static int (__cdecl *sum_idid)(int x0, double y0, int x1, double y1); +static int (__cdecl *sum_ififififififif)(int x0, float y0, int x1, float y1, int x2, float y2, int x3, float y3, int x4, float y4, int x5, float y5, int x6, float y6); +static int (__cdecl *sum_ididididididid)(int x0, double y0, int x1, double y1, int x2, double y2, int x3, double y3, int x4, double y4, int x5, double y5, int x6, double y6); +static int (__cdecl *sum_idfdifdfifdfidifdidf)(int x0, double y0, float z0, double y1, int x1, float z1, double y2, float z2, int x2, float z3, double y3, float z4, int x3, double y4, int x4, float z5, double y5, int x5, double y6, float z6); +static int (__cdecl *sum_ididididididididididid)(int x0, double y0, int x1, double y1, int x2, double y2, int x3, double y3, int x4, double y4, int x5, double y5, int x6, double y6, int x7, double y7, int x8, double y8); +static int (__cdecl *sum_iidiidiidiidiidiidiidiidiidiidiid)(int x0, int x1, double y0, int x2, int x3, double y1, int x4, int x5, double y2, int x6, int x7, double y3, int x8, int x9, double y4, int x10, int x11, double y5, int x12, int x13, double y6, int x14, int x15, double y7, int x16, int x17, double y8); +static int (__cdecl *sum_iyiy)(int x0, hyper y0, int x1, hyper y1); static void (__cdecl *square_ref)(int *x); static int (__cdecl *str_length)(const char *s); static int (__cdecl *str_t_length)(str_t s); @@ -162,6 +176,20 @@ static void (__cdecl *test_I_RpcBindingInqLocalClientPID)(unsigned int protseq, X(sum_hyper) \ X(sum_hyper_int) \ X(sum_char_hyper) \ + X(sum_chars) \ + X(sum_ints) \ + X(sum_flts) \ + X(sum_dbls) \ + X(sum_iiff) \ + X(sum_ifif) \ + X(sum_iidd) \ + X(sum_idid) \ + X(sum_ififififififif) \ + X(sum_ididididididid) \ + X(sum_idfdifdfifdfidifdidf) \ + X(sum_ididididididididididid) \ + X(sum_iidiidiidiidiidiidiidiidiidiidiid) \ + X(sum_iyiy) \ X(square_out) \ X(square_ref) \ X(str_length) \ @@ -338,6 +366,76 @@ int __cdecl s_sum_char_hyper(signed char x, hyper y) return x + y; } +int __cdecl s_sum_chars(int a, chars_t x, chars_t y) +{ + return a * (x.a + x.b + x.c + x.d + x.e + y.a + y.b + y.c + y.d + y.e); +} + +int __cdecl s_sum_ints(int a, ints_t x, ints_t y) +{ + return a * (x.i + x.j + y.i + y.j); +} + +int __cdecl s_sum_flts(int a, flts_t x, flts_t y) +{ + return a * (x.i + x.f + y.i + y.f); +} + +int __cdecl s_sum_dbls(int a, dbls_t x, dbls_t y) +{ + return a * (x.i + x.d + y.i + y.d); +} + +int __cdecl s_sum_iiff(int x0, int y0, float x1, float y1) +{ + return x0 + y0 + x1 + y1; +} + +int __cdecl s_sum_ifif(int x0, float y0, int x1, float y1) +{ + return x0 + y0 + x1 + y1; +} + +int __cdecl s_sum_iidd(int x0, int y0, double x1, double y1) +{ + return x0 + y0 + x1 + y1; +} + +int __cdecl s_sum_idid(int x0, double y0, int x1, double y1) +{ + return x0 + y0 + x1 + y1; +} + +int __cdecl s_sum_ififififififif(int x0, float y0, int x1, float y1, int x2, float y2, int x3, float y3, int x4, float y4, int x5, float y5, int x6, float y6) +{ + return x0 + y0 + x1 + y1 + x2 + y2 + x3 + y3 + x4 + y4 + x5 + y5 + x6 + y6; +} + +int __cdecl s_sum_ididididididid(int x0, double y0, int x1, double y1, int x2, double y2, int x3, double y3, int x4, double y4, int x5, double y5, int x6, double y6) +{ + return x0 + y0 + x1 + y1 + x2 + y2 + x3 + y3 + x4 + y4 + x5 + y5 + x6 + y6; +} + +int __cdecl s_sum_idfdifdfifdfidifdidf(int x0, double y0, float z0, double y1, int x1, float z1, double y2, float z2, int x2, float z3, double y3, float z4, int x3, double y4, int x4, float z5, double y5, int x5, double y6, float z6) +{ + return x0 + y0 + z0 + x1 + y1 + z1 + x2 + y2 + z2 + x3 + y3 + z3 + x4 + y4 + z4 + x5 + y5 + z5 + y6 + z6; +} + +int __cdecl s_sum_ididididididididididid(int x0, double y0, int x1, double y1, int x2, double y2, int x3, double y3, int x4, double y4, int x5, double y5, int x6, double y6, int x7, double y7, int x8, double y8) +{ + return x0 + y0 + x1 + y1 + x2 + y2 + x3 + y3 + x4 + y4 + x5 + y5 + x6 + y6 + x7 + y7 + x8 + y8; +} + +int __cdecl s_sum_iidiidiidiidiidiidiidiidiidiidiid(int x0, int x1, double y0, int x2, int x3, double y1, int x4, int x5, double y2, int x6, int x7, double y3, int x8, int x9, double y4, int x10, int x11, double y5, int x12, int x13, double y6, int x14, int x15, double y7, int x16, int x17, double y8) +{ + return x0 + x1 + y0 + x2 + x3 + y1 + x4 + x5 + y2 + x6 + x7 + y3 + x8 + x9 + y4 + x10 + x11 + y5 + x12 + x13 + y6 + x14 + x15 + y7 + x16 + x17 + y8; +} + +int __cdecl s_sum_iyiy(int x0, hyper y0, int x1, hyper y1) +{ + return x0 + y0 + x1 + y1; +} + void __cdecl s_square_out(int x, int *y) { *y = s_square(x); @@ -1271,6 +1369,10 @@ basic_tests(void) str_t str; se_t se; renum_t re; + chars_t cs1 = { 2, 4, 6, 8, 10 }, cs2 = { -1, -2, -3, -4, -5 }; + ints_t is1 = { 2, 4 }, is2 = { 5, 8 }; + flts_t fs1 = { 3, 5.5 }, fs2 = { 8, 2.3 }; + dbls_t ds1 = { 9, -2.5 }, ds2 = { 2, -4.2 }; ok(int_return() == INT_CODE, "RPC int_return\n"); @@ -1291,6 +1393,35 @@ basic_tests(void) ok(x == 0x12120000, "RPC hyper_int got 0x%x\n", x); x = sum_char_hyper( 12, ((hyper)0x42424242 << 32) | 0x33334444 ); ok(x == 0x33334450, "RPC char_hyper got 0x%x\n", x); + x = sum_chars( 4, cs1, cs2 ); + ok(x == 60, "got %d\n", x); + x = sum_ints( 2, is1, is2 ); + ok(x == 38, "got %d\n", x); + x = sum_flts( 3, fs1, fs2 ); + ok(x == 56, "got %d\n", x); + x = sum_dbls( 7, ds1, ds2 ); + ok(x == 30, "got %d\n", x); + x = sum_iiff( 12, 23, 3.4, 4.7 ); + ok(x == 43, "got %d\n", x); + x = sum_ifif( 12, 11.2, 23, 34.5 ); + ok(x == 80, "got %d\n", x); + x = sum_iidd( 6, 5, 4.3, 2.1 ); + ok(x == 17, "got %d\n", x); + x = sum_idid( 55, 44.55, 33, 22.44 ); + ok(x == 154, "got %d\n", x); + x = sum_ififififififif( 1, 2.1, 3, 4.2, 5, 6.3, 7, 8.4, 9, 10.5, 11, 12.2, 13, 14.9 ); + ok(x == 107, "got %d\n", x); + x = sum_ididididididid( -1, -2.1, -3, -4, -5, -6.7, -8, -9.1, -11, -12.3, -13, -14.2, -15, -16.3 ); + ok(x == -120, "got %d\n", x); + x = sum_idfdifdfifdfidifdidf( 2, 1.2, 2.1, 2.3, 4, 3.2, 4.5, 5.5, -3, -2.2, -4.4, -5.5, 6, 6.4, -3, 8.1, 9.2, 7, -10.3, 12.4 ); + ok(x == 45, "got %d\n", x); + x = sum_ididididididididididid( 2, 3, 4, 5, 6, 7, 8, 9, -1, -2, -3, -4, -5, -6, -7, -8, -9, 5 ); + ok(x == 4, "got %d\n", x); + x = sum_iidiidiidiidiidiidiidiidiidiidiid( 11, 22, 33.1, 44, 55, 66.1, 77, 88, 99.1, 111, 222, 333.1, 444, + 555, 666.1, 777, 888, 999.1, 1, 2, 3.1, 4, 5, 6.1, 7, 8, 9.1 ); + ok(x == 5535, "got %d\n", x); + x = sum_iyiy( 1, 1234567890, 2, -1234567800 ); + ok(x == 93, "got %d\n", x); x = 0; square_out(11, &x); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 8de5dce5d4e..d8886ee2dd2 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -95,6 +95,29 @@ cpp_quote("#ifndef SKIP_TYPE_DECLS") int s; } sun_t; + + typedef struct + { + signed char a, b, c, d, e; + } chars_t; + + typedef struct + { + int i; + hyper j; + } ints_t; + + typedef struct + { + int i; + float f; + } flts_t; + + typedef struct + { + int i; + double d; + } dbls_t; cpp_quote("#endif") int int_return(void); @@ -107,6 +130,20 @@ cpp_quote("#endif") hyper sum_hyper(hyper x, hyper y); int sum_hyper_int(hyper x, hyper y); int sum_char_hyper(signed char x, hyper y); + int sum_ints(int a, ints_t x, ints_t y); + int sum_chars(int a, chars_t x, chars_t y); + int sum_flts(int a, flts_t x, flts_t y); + int sum_dbls(int a, dbls_t x, dbls_t y); + int sum_iiff(int x0, int y0, float x1, float y1); + int sum_ifif(int x0, float y0, int x1, float y1); + int sum_iidd(int x0, int y0, double x1, double y1); + int sum_idid(int x0, double y0, int x1, double y1); + int sum_ififififififif(int x0, float y0, int x1, float y1, int x2, float y2, int x3, float y3, int x4, float y4, int x5, float y5, int x6, float y6); + int sum_ididididididid(int x0, double y0, int x1, double y1, int x2, double y2, int x3, double y3, int x4, double y4, int x5, double y5, int x6, double y6); + int sum_idfdifdfifdfidifdidf(int x0, double y0, float z0, double y1, int x1, float z1, double y2, float z2, int x2, float z3, double y3, float z4, int x3, double y4, int x4, float z5, double y5, int x5, double y6, float z6); + int sum_ididididididididididid(int x0, double y0, int x1, double y1, int x2, double y2, int x3, double y3, int x4, double y4, int x5, double y5, int x6, double y6, int x7, double y7, int x8, double y8); + int sum_iidiidiidiidiidiidiidiidiidiidiid(int x0, int x1, double y0, int x2, int x3, double y1, int x4, int x5, double y2, int x6, int x7, double y3, int x8, int x9, double y4, int x10, int x11, double y5, int x12, int x13, double y6, int x14, int x15, double y7, int x16, int x17, double y8); + int sum_iyiy(int x0, hyper y0, int x1, hyper y1); void square_out(int x, [out] int *y); void square_ref([in, out] int *x); int str_length([string] const char *s);

1 0

Alexandre Julliard : widl: Clear RobustEarly flag also for data structure conformance.
by Alexandre Julliard April 16, 2024

April 16, 2024

Module: wine Branch: master Commit: 57b145e468e15af71236907b72cd471f08219acd URL: https://gitlab.winehq.org/wine/wine/-/commit/57b145e468e15af71236907b72cd47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 16 21:26:20 2024 +0200 widl: Clear RobustEarly flag also for data structure conformance. --- tools/widl/typegen.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6f362bc1d8d..d164317a666 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1987,6 +1987,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, break; } offset += size; + if (offset > baseoff) robust_flags &= ~RobustEarly; } }

1 0

Alexandre Julliard : widl: Output register parameter assignments on ARM platforms.
by Alexandre Julliard April 16, 2024

April 16, 2024

Module: wine Branch: master Commit: 235f76594e1aec4b37014ff2e37b5a487b1df33e URL: https://gitlab.winehq.org/wine/wine/-/commit/235f76594e1aec4b37014ff2e37b5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 16 18:09:52 2024 +0200 widl: Output register parameter assignments on ARM platforms. --- tools/widl/typegen.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 169 insertions(+), 8 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 063080bd9de..6f362bc1d8d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1372,6 +1372,129 @@ int is_interpreted_func( const type_t *iface, const var_t *func ) return interpreted_mode; } +/* replace consecutive params code by a repeat sequence: 0x9d code<1> repeat_count<2> */ +static unsigned int compress_params_array( unsigned char *params, unsigned int count ) +{ + unsigned int i, j; + + for (i = 0; i + 4 <= count; i++) + { + for (j = 1; i + j < count; j++) if (params[i + j] != params[i]) break; + if (j < 4) continue; + params[i] = 0x9d; + params[i + 2] = j & 0xff; + params[i + 3] = j >> 8; + memmove( params + i + 4, params + i + j, count - (i + j) ); + count -= j - 4; + i += 3; + } + return count; +} + +/* fill the parameters array for the procedure extra data on ARM platforms */ +static unsigned int fill_params_array( const type_t *iface, const var_t *func, + unsigned char *params, unsigned int count ) +{ + unsigned int reg_count = 0, float_count = 0, double_count = 0, stack_pos = 0, offset = 0; + var_list_t *args = type_function_get_args( func->declspec.type ); + enum type_basic_type type; + unsigned int size, pos, align; + var_t *var; + + memset( params, 0x9f /* padding */, count ); + + if (is_object( iface )) + { + params[0] = 0x80 + reg_count++; + offset += pointer_size; + } + + if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) + { + type = TYPE_BASIC_LONG; + if (type_get_type( var->declspec.type ) == TYPE_BASIC) + type = type_basic_get_type( var->declspec.type ); + + size = get_stack_size( var, &align, NULL ); + offset = ROUND_SIZE( offset, align ); + pos = offset / pointer_size; + + if (target.cpu == CPU_ARM64) + { + switch (type) + { + case TYPE_BASIC_FLOAT: + case TYPE_BASIC_DOUBLE: + if (double_count >= 8) break; + params[pos] = 0x88 + double_count++; + offset += size; + continue; + + default: + reg_count = ROUND_SIZE( reg_count, align / pointer_size ); + if (reg_count > 8 - size / pointer_size) break; + while (size) + { + params[pos++] = 0x80 + reg_count++; + offset += pointer_size; + size -= pointer_size; + } + continue; + } + } + else /* CPU_ARM */ + { + switch (type) + { + case TYPE_BASIC_FLOAT: + if (!(float_count % 2)) float_count = max( float_count, double_count * 2 ); + if (float_count >= 16) + { + stack_pos = ROUND_SIZE( stack_pos, align ); + params[pos] = 0x100 - (offset - stack_pos) / pointer_size; + stack_pos += size; + } + else + { + params[pos] = 0x84 + float_count++; + } + offset += size; + continue; + + case TYPE_BASIC_DOUBLE: + double_count = max( double_count, (float_count + 1) / 2 ); + if (double_count >= 8) break; + params[pos] = 0x84 + 2 * double_count; + params[pos + 1] = 0x84 + 2 * double_count + 1; + double_count++; + offset += size; + continue; + + default: + reg_count = ROUND_SIZE( reg_count, align / pointer_size ); + if (reg_count <= 4 - size / pointer_size || !stack_pos) + { + while (size && reg_count < 4) + { + params[pos++] = 0x80 + reg_count++; + offset += pointer_size; + size -= pointer_size; + } + } + break; + } + } + + stack_pos = ROUND_SIZE( stack_pos, align ); + memset( params + pos, 0x100 - (offset - stack_pos) / pointer_size, size / pointer_size ); + stack_pos += size; + offset += size; + } + + while (count && params[count - 1] == 0x9f) count--; + return count; +} + static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, const var_t *func, unsigned int *offset, unsigned short num_proc ) @@ -1390,6 +1513,7 @@ static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, unsigned int stack_size = 0; unsigned int stack_offset = 0; unsigned int stack_align; + unsigned int extra_size = 0; unsigned short param_num = 0; unsigned short handle_stack_offset = 0; unsigned short handle_param_num = 0; @@ -1477,16 +1601,21 @@ static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, print_file( file, indent, "NdrFcShort(0x%x),\t/* server buffer = %u */\n", size, size ); print_file( file, indent, "0x%02x,\n", oi2_flags ); print_file( file, indent, "0x%02x,\t/* %u params */\n", nb_args, nb_args ); - print_file( file, indent, "0x%02x,\n", pointer_size == 8 ? 10 : 8 ); - print_file( file, indent, "0x%02x,\n", ext_flags ); - print_file( file, indent, "NdrFcShort(0x0),\n" ); /* server corr hint */ - print_file( file, indent, "NdrFcShort(0x0),\n" ); /* client corr hint */ - print_file( file, indent, "NdrFcShort(0x0),\n" ); /* FIXME: notify index */ - *offset += 14; - if (pointer_size == 8) + *offset += 6; + extra_size = 8; + + switch (target.cpu) + { + case CPU_x86_64: { unsigned short pos = 0, fpu_mask = 0; + extra_size += 2; + print_file( file, indent, "0x%02x,\n", extra_size ); + print_file( file, indent, "0x%02x,\n", ext_flags ); + print_file( file, indent, "NdrFcShort(0x0),\n" ); /* server corr hint */ + print_file( file, indent, "NdrFcShort(0x0),\n" ); /* client corr hint */ + print_file( file, indent, "NdrFcShort(0x0),\n" ); /* FIXME: notify index */ if (is_object( iface )) pos += 2; if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) { @@ -1503,8 +1632,40 @@ static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, if (pos >= 16) break; } print_file( file, indent, "NdrFcShort(0x%x),\n", fpu_mask ); /* floating point mask */ - *offset += 2; + break; + } + case CPU_ARM: + case CPU_ARM64: + { + unsigned int i, len, count = stack_size / pointer_size; + unsigned char *params = xmalloc( count ); + + count = fill_params_array( iface, func, params, count ); + len = compress_params_array( params, count ); + + extra_size += 3 + len + !(len % 2); + print_file( file, indent, "0x%02x,\n", extra_size ); + print_file( file, indent, "0x%02x,\n", ext_flags ); + print_file( file, indent, "NdrFcShort(0x0),\n" ); /* server corr hint */ + print_file( file, indent, "NdrFcShort(0x0),\n" ); /* client corr hint */ + print_file( file, indent, "NdrFcShort(0x0),\n" ); /* FIXME: notify index */ + print_file( file, indent, "NdrFcShort(0x%02x),\n", count ); + print_file( file, indent, "0x%02x,\n", len ); + for (i = 0; i < len; i++) print_file( file, indent, "0x%02x,\n", params[i] ); + if (!(len % 2)) print_file( file, indent, "0x00,\n" ); + free( params ); + break; + } + case CPU_i386: + default: + print_file( file, indent, "0x%02x,\n", extra_size ); + print_file( file, indent, "0x%02x,\n", ext_flags ); + print_file( file, indent, "NdrFcShort(0x0),\n" ); /* server corr hint */ + print_file( file, indent, "NdrFcShort(0x0),\n" ); /* client corr hint */ + print_file( file, indent, "NdrFcShort(0x0),\n" ); /* FIXME: notify index */ + break; } + *offset += extra_size; /* emit argument data */ if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry )

1 0

Henri Verbeet : vkd3d: Implement creating compute pipeline states from shaders with embedded root signatures.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: 7d6f0f2592a8aedf749c2dff36ea330e9ccb49d1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d6f0f2592a8aedf749c2dff36ea3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 5 15:39:06 2023 +0200 vkd3d: Implement creating compute pipeline states from shaders with embedded root signatures. --- libs/vkd3d/state.c | 28 +++++++++++++++++++++++++--- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 5 ++--- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 08cc110e..b8328216 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2045,6 +2045,9 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); + if (state->implicit_root_signature) + d3d12_root_signature_Release(state->implicit_root_signature); + vkd3d_free(state); d3d12_device_release(device); @@ -2413,8 +2416,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_shader_interface_info shader_interface; struct vkd3d_shader_descriptor_offset_info offset_info; - const struct d3d12_root_signature *root_signature; struct vkd3d_shader_spirv_target_info target_info; + struct d3d12_root_signature *root_signature; VkPipelineLayout vk_pipeline_layout; HRESULT hr; @@ -2425,13 +2428,27 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->root_signature))) { - WARN("Root signature is NULL.\n"); - return E_INVALIDARG; + TRACE("Root signature is NULL, looking for an embedded signature.\n"); + if (FAILED(hr = d3d12_root_signature_create(device, + desc->cs.pShaderBytecode, desc->cs.BytecodeLength, &root_signature))) + { + WARN("Failed to find an embedded root signature, hr %s.\n", debugstr_hresult(hr)); + return hr; + } + state->implicit_root_signature = &root_signature->ID3D12RootSignature_iface; + } + else + { + state->implicit_root_signature = NULL; } if (FAILED(hr = d3d12_pipeline_state_find_and_init_uav_counters(state, device, root_signature, &desc->cs, VK_SHADER_STAGE_COMPUTE_BIT))) + { + if (state->implicit_root_signature) + d3d12_root_signature_Release(state->implicit_root_signature); return hr; + } memset(&target_info, 0, sizeof(target_info)); target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; @@ -2476,6 +2493,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st { WARN("Failed to create Vulkan compute pipeline, hr %s.\n", debugstr_hresult(hr)); d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); + if (state->implicit_root_signature) + d3d12_root_signature_Release(state->implicit_root_signature); return hr; } @@ -2483,6 +2502,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st { VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); + if (state->implicit_root_signature) + d3d12_root_signature_Release(state->implicit_root_signature); return hr; } @@ -3484,6 +3505,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; + state->implicit_root_signature = NULL; d3d12_device_add_ref(state->device = device); return S_OK; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 91ffa6e9..8de57a33 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1213,6 +1213,7 @@ struct d3d12_pipeline_state struct d3d12_pipeline_uav_counter_state uav_counters; + ID3D12RootSignature *implicit_root_signature; struct d3d12_device *device; struct vkd3d_private_store private_store; diff --git a/tests/d3d12.c b/tests/d3d12.c index e414ca36..31f57c40 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3135,9 +3135,8 @@ static void test_create_compute_pipeline_state(void) pipeline_state_desc.CS = shader_bytecode(cs_with_rs, sizeof(cs_with_rs)); hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, &IID_ID3D12PipelineState, (void **)&pipeline_state); - todo ok(hr == S_OK, "Got hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12PipelineState_Release(pipeline_state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);

1 0

Henri Verbeet : tests: Test creating compute pipeline states from shaders with embedded root signatures.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: 18986ddb5005293e224d9a2b6022ea7b3297cf62 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/18986ddb5005293e224d9a2b6022e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 11 20:04:28 2024 +0200 tests: Test creating compute pipeline states from shaders with embedded root signatures. --- tests/d3d12.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index aaea5e31..e414ca36 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3045,6 +3045,22 @@ static void test_create_compute_pipeline_state(void) ULONG refcount; HRESULT hr; + static const DWORD cs_with_rs[] = + { +#if 0 + [RootSignature("")] + [numthreads(1, 1, 1)] + void main() + { + } +#endif + 0x43425844, 0x215835dd, 0xdcf65f2e, 0x076d1ec0, 0xb1664d2b, 0x00000001, 0x00000098, 0x00000004, + 0x00000030, 0x00000040, 0x00000050, 0x00000078, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000020, 0x00050050, 0x00000008, + 0x0100086a, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x0100003e, 0x30535452, 0x00000018, + 0x00000001, 0x00000000, 0x00000018, 0x00000000, 0x00000018, 0x00000000, + }; + static const char shader_code[] = "[numthreads(1, 1, 1)]\n" "void main() { }\n"; @@ -3111,6 +3127,18 @@ static void test_create_compute_pipeline_state(void) refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + pipeline_state_desc.pRootSignature = NULL; + hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + pipeline_state_desc.CS = shader_bytecode(cs_with_rs, sizeof(cs_with_rs)); + hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + todo ok(hr == S_OK, "Got hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12PipelineState_Release(pipeline_state); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);

1 0