June 2022 - Wine-Commits - list.winehq.org

Paul Gofman : ntdll: Cancel asyncs when thread is terminated.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 7c597313f801c093dce2a16c3770c4f989c5209e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c597313f801c093dce2a16c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 26 13:41:47 2022 -0500 ntdll: Cancel asyncs when thread is terminated. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/thread.c | 24 +++++++++++++----------- server/async.c | 16 ++++++++++++++++ server/file.h | 1 + server/thread.c | 1 + 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 15bb3be34b2..ad47a5fce74 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1610,20 +1610,22 @@ NTSTATUS WINAPI NtAlertThread( HANDLE handle ) NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code ) { NTSTATUS ret; - BOOL self = (handle == GetCurrentThread()); + BOOL self; - if (!self || exit_code) + SERVER_START_REQ( terminate_thread ) { - SERVER_START_REQ( terminate_thread ) - { - req->handle = wine_server_obj_handle( handle ); - req->exit_code = exit_code; - ret = wine_server_call( req ); - self = !ret && reply->self; - } - SERVER_END_REQ; + req->handle = wine_server_obj_handle( handle ); + req->exit_code = exit_code; + ret = wine_server_call( req ); + self = !ret && reply->self; + } + SERVER_END_REQ; + + if (self) + { + server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, NULL, NULL ); + exit_thread( exit_code ); } - if (self) exit_thread( exit_code ); return ret; } diff --git a/server/async.c b/server/async.c index a4fbeab555e..4832d69b7bf 100644 --- a/server/async.c +++ b/server/async.c @@ -593,6 +593,22 @@ void cancel_process_asyncs( struct process *process ) cancel_async( process, NULL, NULL, 0 ); } +void cancel_terminating_thread_asyncs( struct thread *thread ) +{ + struct async *async; + +restart: + LIST_FOR_EACH_ENTRY( async, &thread->process->asyncs, struct async, process_entry ) + { + if (async->thread != thread || async->terminated || async->canceled) continue; + if (async->completion && async->data.apc_context && !async->event) continue; + + async->canceled = 1; + fd_cancel_async( async->fd, async ); + goto restart; + } +} + /* wake up async operations on the queue */ void async_wake_up( struct async_queue *queue, unsigned int status ) { diff --git a/server/file.h b/server/file.h index 9f9d4cd4e1a..0ffe0e2c8dc 100644 --- a/server/file.h +++ b/server/file.h @@ -245,6 +245,7 @@ extern struct iosb *async_get_iosb( struct async *async ); extern struct thread *async_get_thread( struct async *async ); extern struct async *find_pending_async( struct async_queue *queue ); extern void cancel_process_asyncs( struct process *process ); +extern void cancel_terminating_thread_asyncs( struct thread *thread ); static inline void init_async_queue( struct async_queue *queue ) { diff --git a/server/thread.c b/server/thread.c index 467ccd1f0db..f49fbf40b78 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1462,6 +1462,7 @@ DECL_HANDLER(terminate_thread) thread->exit_code = req->exit_code; if (thread != current) kill_thread( thread, 1 ); else reply->self = 1; + cancel_terminating_thread_asyncs( thread ); release_object( thread ); } }

1 0

Derek Lesho : mfreadwrite: Update source reader MF_SOURCE_READER_ANY_STREAM behavior based on tests.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 474d1824c474fa731885c76481fefddb6899d0df URL: https://source.winehq.org/git/wine.git/?a=commit;h=474d1824c474fa731885c764… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Jun 8 13:15:39 2022 +0200 mfreadwrite: Update source reader MF_SOURCE_READER_ANY_STREAM behavior based on tests. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 34 +++++++++++++++++++++------------- dlls/mfreadwrite/tests/mfplat.c | 5 ++--- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index b1175479dec..76348458fac 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -92,6 +92,7 @@ struct media_stream unsigned int flags; unsigned int requests; unsigned int responses; + LONGLONG last_sample_ts; struct source_reader *reader; }; @@ -160,7 +161,6 @@ struct source_reader IUnknown *device_manager; unsigned int first_audio_stream_index; unsigned int first_video_stream_index; - unsigned int last_read_index; DWORD stream_count; unsigned int flags; DWORD queue; @@ -459,6 +459,8 @@ static HRESULT source_reader_queue_response(struct source_reader *reader, struct source_reader_response_ready(reader, response); + stream->last_sample_ts = timestamp; + return S_OK; } @@ -1101,10 +1103,11 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, DWORD *stream_index) { - unsigned int i, first_selected = ~0u, requests = ~0u; + unsigned int i, first_selected = ~0u; BOOL selected, stream_drained; + LONGLONG min_ts = MAXLONGLONG; - for (i = (reader->last_read_index + 1) % reader->stream_count; ; i = (i + 1) % reader->stream_count) + for (i = 0; i < reader->stream_count; ++i) { stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses; selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected; @@ -1114,24 +1117,20 @@ static HRESULT source_reader_get_next_selected_stream(struct source_reader *read if (first_selected == ~0u) first_selected = i; - /* Try to balance pending reads. */ - if (!stream_drained && reader->streams[i].requests < requests) + /* Pick the stream whose last sample had the lowest timestamp. */ + if (!stream_drained && reader->streams[i].last_sample_ts < min_ts) { - requests = reader->streams[i].requests; + min_ts = reader->streams[i].last_sample_ts; *stream_index = i; } } - - if (i == reader->last_read_index) - break; } /* If all selected streams reached EOS, use first selected. */ if (first_selected != ~0u) { - if (requests == ~0u) + if (min_ts == MAXLONGLONG) *stream_index = first_selected; - reader->last_read_index = *stream_index; } return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; @@ -1499,7 +1498,12 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR } if (selection_changed) - reader->last_read_index = reader->stream_count - 1; + { + for (i = 0; i < reader->stream_count; ++i) + { + reader->streams[i].last_sample_ts = 0; + } + } LeaveCriticalSection(&reader->cs); @@ -1911,6 +1915,11 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG if (SUCCEEDED(hr)) { + for (i = 0; i < reader->stream_count; ++i) + { + reader->streams[i].last_sample_ts = 0; + } + if (reader->async_callback) { if (SUCCEEDED(hr = source_reader_create_async_op(SOURCE_READER_ASYNC_SEEK, &command))) @@ -2357,7 +2366,6 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri /* At least one major type has to be set. */ object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video); - object->last_read_index = object->stream_count - 1; if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX && object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 2762e88281a..c36e1a7e04d 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -994,7 +994,7 @@ static void test_source_reader_from_media_source(void) /* Once the last read sample of all streams has the same timestamp value, the reader will continue reading from the first stream until its timestamp increases. */ - todo_wine ok(!actual_index, "%d: Unexpected stream index %lu.\n", TEST_SOURCE_NUM_STREAMS + 1, actual_index); + ok(!actual_index, "%d: Unexpected stream index %lu.\n", TEST_SOURCE_NUM_STREAMS + 1, actual_index); IMFSample_Release(sample); @@ -1231,8 +1231,7 @@ static void test_source_reader_from_media_source(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(!!sample, "Expected sample object.\n"); - todo_wine_if (actual_index != expected_sample_order[i]) - ok (actual_index == expected_sample_order[i], "Got sample %u from unexpected stream %lu, expected %lu.\n", + ok (actual_index == expected_sample_order[i], "Got sample %u from unexpected stream %lu, expected %lu.\n", i, actual_index, expected_sample_order[i]); IMFSample_Release(sample); }

1 0

Paul Gofman : ws2_32: Check for valid socket in WSAGetOverlappedResult().
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 5a8ccc15a2bc2b6e599e27356fba4b2a978fe75e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a8ccc15a2bc2b6e599e2735… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 7 14:06:54 2022 -0500 ws2_32: Check for valid socket in WSAGetOverlappedResult(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 6 ++++++ dlls/ws2_32/tests/sock.c | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6a93d00730a..964724b36e7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3626,6 +3626,12 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, return FALSE; } + if (!socket_list_find( s )) + { + SetLastError( WSAENOTSOCK ); + return FALSE; + } + status = lpOverlapped->Internal; if (status == STATUS_PENDING) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4a4a3a84e51..22e414e02ec 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11848,6 +11848,7 @@ static void test_WSAGetOverlappedResult(void) NTSTATUS status; unsigned int i; SOCKET s; + HANDLE h; BOOL ret; static const NTSTATUS ranges[][2] = @@ -11862,8 +11863,20 @@ static void test_WSAGetOverlappedResult(void) {0xd0070000, 0xd0080000}, }; + WSASetLastError(0xdeadbeef); + ret = WSAGetOverlappedResult(0xdeadbeef, &overlapped, &size, FALSE, &flags); + ok(!ret, "got %d.\n", ret); + ok(WSAGetLastError() == WSAENOTSOCK, "got %u.\n", WSAGetLastError()); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = DuplicateHandle(GetCurrentProcess(), (HANDLE)s, GetCurrentProcess(), &h, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(ret, "got %d.\n", ret); + ret = WSAGetOverlappedResult((SOCKET)h, &overlapped, &size, FALSE, &flags); + ok(!ret, "got %d.\n", ret); + ok(WSAGetLastError() == WSAENOTSOCK, "got %u.\n", WSAGetLastError()); + CloseHandle(h); + for (i = 0; i < ARRAY_SIZE(ranges); ++i) { for (status = ranges[i][0]; status < ranges[i][1]; ++status)

1 0

Rémi Bernon : winegstreamer: Rename mf_(create|destroy)_wg_sample helpers.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 4f242f09c006e96f8518092b746648b2fdbd43f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f242f09c006e96f8518092b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 7 10:19:17 2022 +0200 winegstreamer: Rename mf_(create|destroy)_wg_sample helpers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 4 ++-- dlls/winegstreamer/h264_decoder.c | 10 +++++----- dlls/winegstreamer/mfplat.c | 4 ++-- dlls/winegstreamer/wma_decoder.c | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index ca7396ad5cd..ab89942847a 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -120,8 +120,8 @@ extern HRESULT mfplat_DllRegisterServer(void); IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format); void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format); -HRESULT mf_create_wg_sample(IMFSample *sample, struct wg_sample **out); -void mf_destroy_wg_sample(struct wg_sample *wg_sample); +HRESULT wg_sample_create_mf(IMFSample *sample, struct wg_sample **out); +void wg_sample_release(struct wg_sample *wg_sample); HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *sample); HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *sample, diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 0ee9084e12e..8d3de4355bb 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -540,11 +540,11 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS if (!decoder->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = mf_create_wg_sample(sample, &wg_sample))) + if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) return hr; hr = wg_transform_push_mf(decoder->wg_transform, wg_sample); - mf_destroy_wg_sample(wg_sample); + wg_sample_release(wg_sample); return hr; } @@ -573,17 +573,17 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, samples[0].dwStatus = 0; if (!samples[0].pSample) return E_INVALIDARG; - if (FAILED(hr = mf_create_wg_sample(samples[0].pSample, &wg_sample))) + if (FAILED(hr = wg_sample_create_mf(samples[0].pSample, &wg_sample))) return hr; if (wg_sample->max_size < info.cbSize) { - mf_destroy_wg_sample(wg_sample); + wg_sample_release(wg_sample); return MF_E_BUFFERTOOSMALL; } hr = wg_transform_read_mf(decoder->wg_transform, wg_sample, &wg_format); - mf_destroy_wg_sample(wg_sample); + wg_sample_release(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) { diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 026237bdf5d..28a3fc20ead 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -965,7 +965,7 @@ struct mf_sample struct wg_sample wg_sample; }; -HRESULT mf_create_wg_sample(IMFSample *sample, struct wg_sample **out) +HRESULT wg_sample_create_mf(IMFSample *sample, struct wg_sample **out) { DWORD current_length, max_length; struct mf_sample *mf_sample; @@ -995,7 +995,7 @@ out: return hr; } -void mf_destroy_wg_sample(struct wg_sample *wg_sample) +void wg_sample_release(struct wg_sample *wg_sample) { struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index fdb68328c3a..81285f5ad44 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -534,18 +534,18 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) return hr; - if (FAILED(hr = mf_create_wg_sample(sample, &wg_sample))) + if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) return hr; /* WMA transform uses fixed size input samples and ignores samples with invalid sizes */ if (wg_sample->size % info.cbSize) { - mf_destroy_wg_sample(wg_sample); + wg_sample_release(wg_sample); return S_OK; } hr = wg_transform_push_mf(decoder->wg_transform, wg_sample); - mf_destroy_wg_sample(wg_sample); + wg_sample_release(wg_sample); return hr; } @@ -576,13 +576,13 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, return MF_E_TRANSFORM_NEED_MORE_INPUT; } - if (FAILED(hr = mf_create_wg_sample(samples[0].pSample, &wg_sample))) + if (FAILED(hr = wg_sample_create_mf(samples[0].pSample, &wg_sample))) return hr; wg_sample->size = 0; if (wg_sample->max_size < info.cbSize) { - mf_destroy_wg_sample(wg_sample); + wg_sample_release(wg_sample); return MF_E_BUFFERTOOSMALL; } @@ -592,7 +592,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_INCOMPLETE; } - mf_destroy_wg_sample(wg_sample); + wg_sample_release(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {

1 0

Rémi Bernon : winegstreamer: Introduce new wg_transform_(push|read)_mf helpers.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 240aff382def741f306783227d4d46d67e931a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=240aff382def741f30678322… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 6 17:06:32 2022 +0200 winegstreamer: Introduce new wg_transform_(push|read)_mf helpers. To read MF sample properties before pushing, and update them after sucessfully reading a sample. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 4 +++ dlls/winegstreamer/h264_decoder.c | 6 ++--- dlls/winegstreamer/mfplat.c | 55 ++++++++++++++++++++++++++------------- dlls/winegstreamer/wma_decoder.c | 4 +-- 4 files changed, 45 insertions(+), 24 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 159143d7e54..ca7396ad5cd 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -123,6 +123,10 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format); HRESULT mf_create_wg_sample(IMFSample *sample, struct wg_sample **out); void mf_destroy_wg_sample(struct wg_sample *wg_sample); +HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *sample); +HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *sample, + struct wg_format *format); + HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj); HRESULT h264_decoder_create(REFIID riid, void **ret); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 19a36a9a77a..0ee9084e12e 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -543,8 +543,7 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS if (FAILED(hr = mf_create_wg_sample(sample, &wg_sample))) return hr; - hr = wg_transform_push_data(decoder->wg_transform, wg_sample); - + hr = wg_transform_push_mf(decoder->wg_transform, wg_sample); mf_destroy_wg_sample(wg_sample); return hr; } @@ -583,8 +582,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, return MF_E_BUFFERTOOSMALL; } - hr = wg_transform_read_data(decoder->wg_transform, wg_sample, - &wg_format); + hr = wg_transform_read_mf(decoder->wg_transform, wg_sample, &wg_format); mf_destroy_wg_sample(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 0226e7a2e45..026237bdf5d 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -969,8 +969,6 @@ HRESULT mf_create_wg_sample(IMFSample *sample, struct wg_sample **out) { DWORD current_length, max_length; struct mf_sample *mf_sample; - LONGLONG time, duration; - UINT32 value; BYTE *buffer; HRESULT hr; @@ -981,19 +979,6 @@ HRESULT mf_create_wg_sample(IMFSample *sample, struct wg_sample **out) if (FAILED(hr = IMFMediaBuffer_Lock(mf_sample->media_buffer, &buffer, &max_length, &current_length))) goto out; - if (SUCCEEDED(IMFSample_GetSampleTime(sample, &time))) - { - mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_PTS; - mf_sample->wg_sample.pts = time; - } - if (SUCCEEDED(IMFSample_GetSampleDuration(sample, &duration))) - { - mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_DURATION; - mf_sample->wg_sample.duration = duration; - } - if (SUCCEEDED(IMFSample_GetUINT32(sample, &MFSampleExtension_CleanPoint, &value)) && value) - mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_SYNC_POINT; - IMFSample_AddRef((mf_sample->sample = sample)); mf_sample->wg_sample.data = buffer; mf_sample->wg_sample.size = current_length; @@ -1015,8 +1000,43 @@ void mf_destroy_wg_sample(struct wg_sample *wg_sample) struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); IMFMediaBuffer_Unlock(mf_sample->media_buffer); - IMFMediaBuffer_SetCurrentLength(mf_sample->media_buffer, wg_sample->size); IMFMediaBuffer_Release(mf_sample->media_buffer); + IMFSample_Release(mf_sample->sample); + free(mf_sample); +} + +HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *sample) +{ + struct mf_sample *mf_sample = CONTAINING_RECORD(sample, struct mf_sample, wg_sample); + LONGLONG time, duration; + UINT32 value; + + if (SUCCEEDED(IMFSample_GetSampleTime(mf_sample->sample, &time))) + { + mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_PTS; + mf_sample->wg_sample.pts = time; + } + if (SUCCEEDED(IMFSample_GetSampleDuration(mf_sample->sample, &duration))) + { + mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_DURATION; + mf_sample->wg_sample.duration = duration; + } + if (SUCCEEDED(IMFSample_GetUINT32(mf_sample->sample, &MFSampleExtension_CleanPoint, &value)) && value) + mf_sample->wg_sample.flags |= WG_SAMPLE_FLAG_SYNC_POINT; + + return wg_transform_push_data(transform, sample); +} + +HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *wg_sample, + struct wg_format *format) +{ + struct mf_sample *mf_sample = CONTAINING_RECORD(wg_sample, struct mf_sample, wg_sample); + HRESULT hr; + + if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format))) + return hr; + + IMFMediaBuffer_SetCurrentLength(mf_sample->media_buffer, wg_sample->size); if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_PTS) IMFSample_SetSampleTime(mf_sample->sample, wg_sample->pts); @@ -1025,6 +1045,5 @@ void mf_destroy_wg_sample(struct wg_sample *wg_sample) if (wg_sample->flags & WG_SAMPLE_FLAG_SYNC_POINT) IMFSample_SetUINT32(mf_sample->sample, &MFSampleExtension_CleanPoint, 1); - IMFSample_Release(mf_sample->sample); - free(mf_sample); + return S_OK; } diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 106d32adce9..fdb68328c3a 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -544,7 +544,7 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS return S_OK; } - hr = wg_transform_push_data(decoder->wg_transform, wg_sample); + hr = wg_transform_push_mf(decoder->wg_transform, wg_sample); mf_destroy_wg_sample(wg_sample); return hr; } @@ -586,7 +586,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, return MF_E_BUFFERTOOSMALL; } - if (SUCCEEDED(hr = wg_transform_read_data(decoder->wg_transform, wg_sample, NULL))) + if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, wg_sample, NULL))) { if (wg_sample->flags & WG_SAMPLE_FLAG_INCOMPLETE) samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_INCOMPLETE;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse the mul() intrinsic.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: vkd3d Branch: master Commit: 10917a7f479b02a1313bc2e94ee904ea15ad3106 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=10917a7f479b02a1313bc2e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 8 18:18:43 2022 -0500 vkd3d-shader/hlsl: Parse the mul() intrinsic. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 118 ++++++++++++++++++++++++++++++++ tests/hlsl-majority-pragma.shader_test | 2 +- tests/hlsl-majority-typedef.shader_test | 2 +- tests/hlsl-mul.shader_test | 36 +++++----- 4 files changed, 138 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2aee5153..df5fda47 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2046,6 +2046,123 @@ static bool intrinsic_min(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MIN, params->args[0], params->args[1], loc); } +static bool intrinsic_mul(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg1 = params->args[0], *arg2 = params->args[1], *cast1, *cast2; + enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); + struct hlsl_type *cast_type1 = arg1->data_type, *cast_type2 = arg2->data_type, *matrix_type, *ret_type; + unsigned int i, j, k, vect_count = 0; + struct vkd3d_string_buffer *name; + static unsigned int counter = 0; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + if (arg1->data_type->type == HLSL_CLASS_SCALAR || arg2->data_type->type == HLSL_CLASS_SCALAR) + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg1, arg2, loc); + + if (arg1->data_type->type == HLSL_CLASS_VECTOR) + { + vect_count++; + cast_type1 = hlsl_get_matrix_type(ctx, base, arg1->data_type->dimx, 1); + } + if (arg2->data_type->type == HLSL_CLASS_VECTOR) + { + vect_count++; + cast_type2 = hlsl_get_matrix_type(ctx, base, 1, arg2->data_type->dimx); + } + + matrix_type = hlsl_get_matrix_type(ctx, base, cast_type2->dimx, cast_type1->dimy); + + if (vect_count == 0) + { + ret_type = matrix_type; + } + else if (vect_count == 1) + { + assert(matrix_type->dimx == 1 || matrix_type->dimy == 1); + ret_type = hlsl_get_vector_type(ctx, base, matrix_type->dimx * matrix_type->dimy); + } + else + { + assert(matrix_type->dimx == 1 && matrix_type->dimy == 1); + ret_type = hlsl_get_scalar_type(ctx, base); + } + + if (!(cast1 = add_implicit_conversion(ctx, params->instrs, arg1, cast_type1, loc))) + return false; + + if (!(cast2 = add_implicit_conversion(ctx, params->instrs, arg2, cast_type2, loc))) + return false; + + name = vkd3d_string_buffer_get(&ctx->string_buffers); + vkd3d_string_buffer_printf(name, "<mul-%u>", counter++); + var = hlsl_new_synthetic_var(ctx, name->buffer, matrix_type, *loc); + vkd3d_string_buffer_release(&ctx->string_buffers, name); + if (!var) + return false; + + for (i = 0; i < matrix_type->dimx; ++i) + for (j = 0; j < matrix_type->dimy; ++j) + { + struct hlsl_ir_node *node = NULL; + struct hlsl_type *scalar_type; + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + unsigned int offset; + + for (k = 0; k < cast_type1->dimx && k < cast_type2->dimy; ++k) + { + struct hlsl_ir_load *value1, *value2; + struct hlsl_ir_node *mul; + + offset = hlsl_compute_component_offset(ctx, cast_type1, j * cast_type1->dimx + k, &scalar_type); + if (!(c = hlsl_new_uint_constant(ctx, offset, loc))) + return false; + list_add_tail(params->instrs, &c->node.entry); + + if (!(value1 = add_load(ctx, params->instrs, cast1, &c->node, scalar_type, *loc))) + return false; + + offset = hlsl_compute_component_offset(ctx, cast_type2, k * cast_type2->dimx + i, &scalar_type); + if (!(c = hlsl_new_uint_constant(ctx, offset, loc))) + return false; + list_add_tail(params->instrs, &c->node.entry); + + if (!(value2 = add_load(ctx, params->instrs, cast2, &c->node, scalar_type, *loc))) + return false; + + if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, &value1->node, &value2->node, loc))) + return false; + + if (node) + { + if (!(node = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, node, mul, loc))) + return false; + } + else + { + node = mul; + } + } + + offset = hlsl_compute_component_offset(ctx, matrix_type, j * matrix_type->dimx + i, &scalar_type); + if (!(c = hlsl_new_uint_constant(ctx, offset, loc))) + return false; + list_add_tail(params->instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, *loc))) + return false; + list_add_tail(params->instrs, &store->node.entry); + } + + if (!(load = hlsl_new_load(ctx, var, NULL, matrix_type, *loc))) + return false; + list_add_tail(params->instrs, &load->node.entry); + + return !!add_implicit_conversion(ctx, params->instrs, &load->node, ret_type, loc); +} + static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2106,6 +2223,7 @@ intrinsic_functions[] = {"floor", 1, true, intrinsic_floor}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, + {"mul", 2, true, intrinsic_mul}, {"pow", 2, true, intrinsic_pow}, {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test index a9f917ff..e7fc75cd 100644 --- a/tests/hlsl-majority-pragma.shader_test +++ b/tests/hlsl-majority-pragma.shader_test @@ -17,5 +17,5 @@ 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.1 0.3 0.0 0.0 uniform 12 float4 0.2 0.4 0.0 0.0 -todo draw quad +draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 diff --git a/tests/hlsl-majority-typedef.shader_test b/tests/hlsl-majority-typedef.shader_test index 192c96db..1460e9a0 100644 --- a/tests/hlsl-majority-typedef.shader_test +++ b/tests/hlsl-majority-typedef.shader_test @@ -18,5 +18,5 @@ 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.1 0.3 0.0 0.0 uniform 12 float4 0.2 0.4 0.0 0.0 -todo draw quad +draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl-mul.shader_test index 1d137e69..7b453187 100644 --- a/tests/hlsl-mul.shader_test +++ b/tests/hlsl-mul.shader_test @@ -12,7 +12,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (30.0, 70.0, 110.0, 150.0) [pixel shader] @@ -28,7 +28,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (90.0, 100.0, 110.0, 120.0) [pixel shader] @@ -44,7 +44,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (14.0, 38.0, 62.0, 86.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (38.0, 44.0, 50.0, 56.0) [pixel shader] @@ -75,7 +75,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (14.0, 32.0, 50.0, 0.0) [pixel shader] @@ -90,7 +90,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (30.0, 36.0, 42.0, 0.0) [pixel shader] @@ -106,7 +106,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (50.0, 60.0, 70.0, 80.0) [pixel shader] @@ -122,7 +122,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (50.0, 60.0, 70.0, 80.0) [pixel shader] @@ -138,7 +138,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.0, 20.0, 30.0, 40.0) [pixel shader] @@ -154,7 +154,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.0, 50.0, 90.0, 130.0) [pixel shader] @@ -170,7 +170,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.0, 20.0, 30.0, 40.0) [pixel shader] @@ -186,7 +186,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.0, 50.0, 90.0, 130.0) [pixel shader] @@ -202,7 +202,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (90.0, 100.0, 110.0, 120.0) [pixel shader] @@ -218,7 +218,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (5.0, 10.0, 15.0, 20.0) [pixel shader] @@ -234,7 +234,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -250,7 +250,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (30.0, 70.0, 110.0, 150.0) [pixel shader] @@ -268,7 +268,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (83.0, 98.0, 113.0, 128.0) [pixel shader] @@ -286,5 +286,5 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +draw quad probe all rgba (78.0, 96.0, 114.0, 0.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Split matrix operations.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: vkd3d Branch: master Commit: 62fa53f9b65486c90ca434c51a608e77ae154835 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=62fa53f9b65486c90ca434c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 8 18:18:42 2022 -0500 vkd3d-shader/hlsl: Split matrix operations. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 74 ++++++++++++++++++++++++++++++++++++++++++++ tests/hlsl-shape.shader_test | 30 +++++++++--------- 2 files changed, 89 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 687569e8..2aee5153 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1201,6 +1201,22 @@ static bool expr_common_shape(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct return true; } +static unsigned int minor_size(const struct hlsl_type *type) +{ + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimx; + else + return type->dimy; +} + +static unsigned int major_size(const struct hlsl_type *type) +{ + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimy; + else + return type->dimx; +} + static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], struct hlsl_type *type, const struct vkd3d_shader_location *loc) @@ -1208,6 +1224,64 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_expr *expr; unsigned int i; + if (type->type == HLSL_CLASS_MATRIX) + { + struct vkd3d_string_buffer *name; + static unsigned int counter = 0; + struct hlsl_type *vector_type; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + vector_type = hlsl_get_vector_type(ctx, type->base_type, minor_size(type)); + + name = vkd3d_string_buffer_get(&ctx->string_buffers); + vkd3d_string_buffer_printf(name, "<split_op-%u>", counter++); + var = hlsl_new_synthetic_var(ctx, name->buffer, type, *loc); + vkd3d_string_buffer_release(&ctx->string_buffers, name); + if (!var) + return NULL; + + for (i = 0; i < major_size(type); i++) + { + struct hlsl_ir_node *value, *vector_operands[HLSL_MAX_OPERANDS] = { NULL }; + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + unsigned int j; + + if (!(c = hlsl_new_uint_constant(ctx, 4 * i, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + + for (j = 0; j < HLSL_MAX_OPERANDS; j++) + { + if (operands[j]) + { + struct hlsl_type *vector_arg_type; + struct hlsl_ir_load *load; + + vector_arg_type = hlsl_get_vector_type(ctx, operands[j]->data_type->base_type, minor_size(type)); + + if (!(load = add_load(ctx, instrs, operands[j], &c->node, vector_arg_type, *loc))) + return NULL; + vector_operands[j] = &load->node; + } + } + + if (!(value = add_expr(ctx, instrs, op, vector_operands, vector_type, loc))) + return NULL; + + if (!(store = hlsl_new_store(ctx, var, &c->node, value, 0, *loc))) + return NULL; + list_add_tail(instrs, &store->node.entry); + } + + if (!(load = hlsl_new_load(ctx, var, NULL, type, *loc))) + return NULL; + list_add_tail(instrs, &load->node.entry); + + return &load->node; + } + if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) return NULL; init_node(&expr->node, HLSL_IR_EXPR, type, *loc); diff --git a/tests/hlsl-shape.shader_test b/tests/hlsl-shape.shader_test index 65cc322c..b96f0fd2 100644 --- a/tests/hlsl-shape.shader_test +++ b/tests/hlsl-shape.shader_test @@ -93,7 +93,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 7.0, 9.0) [pixel shader] @@ -107,7 +107,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 7.0, 9.0) [pixel shader] @@ -122,7 +122,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -137,7 +137,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -152,7 +152,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 7.0, 12.0, 17.0) [pixel shader] @@ -167,7 +167,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 7.0, 12.0, 17.0) [pixel shader] @@ -183,7 +183,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 0.0) [pixel shader] @@ -199,7 +199,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (9.0, 11.0, 13.0, 0.0) [pixel shader] @@ -223,7 +223,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -247,7 +247,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -273,7 +273,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -285,7 +285,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -297,7 +297,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -336,7 +336,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -351,5 +351,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (6.0, 7.0, 8.0, 9.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower matrix casts.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: vkd3d Branch: master Commit: 3a755cb0e2a48b2a2fd82e195dfe4ba079c7ff92 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a755cb0e2a48b2a2fd82e1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 8 18:18:41 2022 -0500 vkd3d-shader/hlsl: Lower matrix casts. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 93 ++++++++++++++++++++++- tests/hlsl-duplicate-modifiers.shader_test | 2 +- tests/hlsl-initializer-matrix.shader_test | 2 +- tests/hlsl-return-implicit-conversion.shader_test | 8 +- tests/hlsl-shape.shader_test | 10 +-- tests/matrix-semantics.shader_test | 12 +-- 6 files changed, 106 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cf0f51f2..687569e8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -266,6 +266,9 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ return false; } +static struct hlsl_ir_load *add_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_node, + struct hlsl_ir_node *offset, struct hlsl_type *data_type, const struct vkd3d_shader_location loc); + static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc) { @@ -275,10 +278,92 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, if (hlsl_types_are_equal(src_type, dst_type)) return node; - if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc))) - return NULL; - list_add_tail(instrs, &cast->node.entry); - return &cast->node; + if ((src_type->type == HLSL_CLASS_MATRIX || dst_type->type == HLSL_CLASS_MATRIX) + && src_type->type <= HLSL_CLASS_LAST_NUMERIC && dst_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + struct vkd3d_string_buffer *name; + static unsigned int counter = 0; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + unsigned int dst_idx; + bool broadcast; + + broadcast = src_type->dimx == 1 && src_type->dimy == 1; + assert(dst_type->dimx * dst_type->dimy <= src_type->dimx * src_type->dimy || broadcast); + if (src_type->type == HLSL_CLASS_MATRIX && dst_type->type == HLSL_CLASS_MATRIX && !broadcast) + { + assert(dst_type->dimx <= src_type->dimx); + assert(dst_type->dimy <= src_type->dimy); + } + + name = vkd3d_string_buffer_get(&ctx->string_buffers); + vkd3d_string_buffer_printf(name, "<cast-%u>", counter++); + var = hlsl_new_synthetic_var(ctx, name->buffer, dst_type, *loc); + vkd3d_string_buffer_release(&ctx->string_buffers, name); + if (!var) + return NULL; + + for (dst_idx = 0; dst_idx < dst_type->dimx * dst_type->dimy; ++dst_idx) + { + struct hlsl_type *src_scalar_type, *dst_scalar_type; + unsigned int src_idx, src_offset, dst_offset; + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + + if (broadcast) + { + src_idx = 0; + } + else + { + if (src_type->type == HLSL_CLASS_MATRIX && dst_type->type == HLSL_CLASS_MATRIX) + { + unsigned int x = dst_idx % dst_type->dimx, y = dst_idx / dst_type->dimx; + + src_idx = y * src_type->dimx + x; + } + else + { + src_idx = dst_idx; + } + } + + dst_offset = hlsl_compute_component_offset(ctx, dst_type, dst_idx, &dst_scalar_type); + src_offset = hlsl_compute_component_offset(ctx, src_type, src_idx, &src_scalar_type); + + if (!(c = hlsl_new_uint_constant(ctx, src_offset, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + + if (!(load = add_load(ctx, instrs, node, &c->node, src_scalar_type, *loc))) + return NULL; + + if (!(cast = hlsl_new_cast(ctx, &load->node, dst_scalar_type, loc))) + return NULL; + list_add_tail(instrs, &cast->node.entry); + + if (!(c = hlsl_new_uint_constant(ctx, dst_offset, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, &cast->node, 0, *loc))) + return NULL; + list_add_tail(instrs, &store->node.entry); + } + + if (!(load = hlsl_new_load(ctx, var, NULL, dst_type, *loc))) + return NULL; + list_add_tail(instrs, &load->node.entry); + + return &load->node; + } + else + { + if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc))) + return NULL; + list_add_tail(instrs, &cast->node.entry); + return &cast->node; + } } static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct list *instrs, diff --git a/tests/hlsl-duplicate-modifiers.shader_test b/tests/hlsl-duplicate-modifiers.shader_test index fcae12da..6491701a 100644 --- a/tests/hlsl-duplicate-modifiers.shader_test +++ b/tests/hlsl-duplicate-modifiers.shader_test @@ -7,5 +7,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-initializer-matrix.shader_test b/tests/hlsl-initializer-matrix.shader_test index ea9de9c0..7e12b0a0 100644 --- a/tests/hlsl-initializer-matrix.shader_test +++ b/tests/hlsl-initializer-matrix.shader_test @@ -55,7 +55,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (21, 22, 31, 32) diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test index bf99d9cb..545340eb 100644 --- a/tests/hlsl-return-implicit-conversion.shader_test +++ b/tests/hlsl-return-implicit-conversion.shader_test @@ -5,7 +5,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -15,7 +15,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -35,7 +35,7 @@ float4x1 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] diff --git a/tests/hlsl-shape.shader_test b/tests/hlsl-shape.shader_test index 57d59534..65cc322c 100644 --- a/tests/hlsl-shape.shader_test +++ b/tests/hlsl-shape.shader_test @@ -211,7 +211,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -235,7 +235,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -260,7 +260,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -309,7 +309,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] @@ -321,7 +321,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] diff --git a/tests/matrix-semantics.shader_test b/tests/matrix-semantics.shader_test index 1be50406..43f467ec 100644 --- a/tests/matrix-semantics.shader_test +++ b/tests/matrix-semantics.shader_test @@ -5,7 +5,7 @@ float4x1 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -15,7 +15,7 @@ row_major float1x4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) [require] @@ -44,7 +44,7 @@ row_major float4x1 main() : sv_target } [test] -todo draw quad +draw quad probe render target 0 all r (1.0) probe render target 1 all r (2.0) probe render target 2 all r (3.0) @@ -57,7 +57,7 @@ float1x4 main() : sv_target } [test] -todo draw quad +draw quad probe render target 0 all r (1.0) probe render target 1 all r (2.0) probe render target 2 all r (3.0) @@ -78,7 +78,7 @@ void main(out float1x2 x : sv_target0, out float1x2 y : sv_target2) } [test] -todo draw quad +draw quad probe render target 0 all r (1.0) probe render target 1 all r (2.0) probe render target 2 all r (5.0) @@ -96,7 +96,7 @@ void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1) } [test] -todo draw quad +draw quad probe render target 0 all rgba (1.0, 2.0, 3.0, 4.0) probe render target 1 all r (5.0) probe render target 2 all r (6.0)

1 0

Zebediah Figura : tests: Add a test for multiple render targets.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: vkd3d Branch: master Commit: f821a1b29a1f07c4e82e7fbcbb40645b18f6ed31 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f821a1b29a1f07c4e82e7fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 8 18:18:39 2022 -0500 tests: Add a test for multiple render targets. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/multiple-rt.shader_test | 19 +++++++++++++++++++ tests/shader_runner.c | 26 ++++++++++++++++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 400dc8aa..6e827175 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/math.shader_test \ + tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ diff --git a/tests/multiple-rt.shader_test b/tests/multiple-rt.shader_test new file mode 100644 index 00000000..59e4acbb --- /dev/null +++ b/tests/multiple-rt.shader_test @@ -0,0 +1,19 @@ +[render target 0] +format r32g32b32a32 float +size (640, 480) + +[render target 1] +format r32g32b32a32 float +size (640, 480) + +[pixel shader] +void main(out float4 o0 : sv_target0, out float4 o1 : sv_target1) +{ + o0 = float4(0.1, 0.2, 0.3, 0.4); + o1 = float4(0.5, 0.6, 0.7, 0.8); +} + +[test] +draw quad +probe render target 0 all rgba (0.1, 0.2, 0.3, 0.4) +probe render target 1 all rgba (0.5, 0.6, 0.7, 0.8) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index e2dc2dda..25986b31 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -468,7 +468,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) } else if (match_string(line, "probe", &line)) { - unsigned int left, top, right, bottom, ulps; + unsigned int left, top, right, bottom, ulps, slot; struct resource_readback *rb; struct resource *resource; int ret, len; @@ -479,7 +479,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (match_string(line, "uav", &line)) { - unsigned int slot = strtoul(line, &rest, 10); + slot = strtoul(line, &rest, 10); if (rest == line) fatal_error("Malformed UAV index '%s'.\n", line); @@ -487,6 +487,16 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) resource = get_resource(runner, RESOURCE_TYPE_UAV, slot); } + else if (match_string(line, "render target", &line)) + { + slot = strtoul(line, &rest, 10); + + if (rest == line) + fatal_error("Malformed render target index '%s'.\n", line); + line = rest; + + resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, slot); + } else { resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0); @@ -836,6 +846,18 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const current_sampler->v_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; current_sampler->w_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; } + else if (sscanf(line, "[render target %u]\n", &index)) + { + state = STATE_RESOURCE; + + memset(&current_resource, 0, sizeof(current_resource)); + + current_resource.slot = index; + current_resource.type = RESOURCE_TYPE_RENDER_TARGET; + current_resource.format = DXGI_FORMAT_R32G32B32A32_FLOAT; + current_resource.data_type = TEXTURE_DATA_FLOAT; + current_resource.texel_size = 16; + } else if (sscanf(line, "[texture %u]\n", &index)) { state = STATE_RESOURCE;

1 0

Zebediah Figura : tests: Add a basic shader test for UAVs.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: vkd3d Branch: master Commit: 08e2a8e9bbd11ef1af80accb094f7acac2a60e30 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=08e2a8e9bbd11ef1af80acc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 8 18:18:38 2022 -0500 tests: Add a basic shader test for UAVs. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/shader_runner.c | 22 ++++++++++++++--- tests/shader_runner_d3d12.c | 10 +++++--- tests/shader_runner_vulkan.c | 12 ++++++---- tests/uav.shader_test | 56 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index dd3ce1ff..400dc8aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,7 @@ vkd3d_shader_tests = \ tests/texture-load.shader_test \ tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test \ + tests/uav.shader_test \ tests/writemask-assignop-0.shader_test \ tests/writemask-assignop-1.shader_test \ tests/writemask-assignop-2.shader_test \ diff --git a/tests/shader_runner.c b/tests/shader_runner.c index f367027f..e2dc2dda 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -370,6 +370,8 @@ static void set_uniforms(struct shader_runner *runner, size_t offset, size_t cou static void parse_test_directive(struct shader_runner *runner, const char *line) { + char *rest; + runner->is_todo = false; if (match_string(line, "todo", &line)) @@ -475,19 +477,33 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (runner->last_render_failed) return; - resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0); + if (match_string(line, "uav", &line)) + { + unsigned int slot = strtoul(line, &rest, 10); + + if (rest == line) + fatal_error("Malformed UAV index '%s'.\n", line); + line = rest; + + resource = get_resource(runner, RESOURCE_TYPE_UAV, slot); + } + else + { + resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0); + } + rb = runner->ops->get_resource_readback(runner, resource); if (match_string(line, "all", &line)) { set_rect(&rect, 0, 0, resource->width, resource->height); } - else if (sscanf(line, "( %d , %d , %d , %d )%n", &left, &top, &right, &bottom, &len) == 4) + else if (sscanf(line, " ( %d , %d , %d , %d )%n", &left, &top, &right, &bottom, &len) == 4) { set_rect(&rect, left, top, right, bottom); line += len; } - else if (sscanf(line, "( %u , %u )%n", &left, &top, &len) == 2) + else if (sscanf(line, " ( %u , %u )%n", &left, &top, &len) == 2) { set_rect(&rect, left, top, left + 1, top + 1); line += len; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 79d5b8eb..871b5022 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -373,16 +373,20 @@ static struct resource_readback *d3d12_runner_get_resource_readback(struct shade struct test_context *test_context = &runner->test_context; struct d3d12_resource_readback *rb = malloc(sizeof(*rb)); struct d3d12_resource *resource = d3d12_resource(res); + D3D12_RESOURCE_STATES state; - assert(resource->r.type == RESOURCE_TYPE_RENDER_TARGET); + if (resource->r.type == RESOURCE_TYPE_RENDER_TARGET) + state = D3D12_RESOURCE_STATE_RENDER_TARGET; + else + state = D3D12_RESOURCE_STATE_UNORDERED_ACCESS; transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + state, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(resource->resource, 0, rb, test_context->queue, test_context->list); reset_command_list(test_context->list, test_context->allocator); transition_resource_state(test_context->list, resource->resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + D3D12_RESOURCE_STATE_COPY_SOURCE, state); return &rb->rb; } diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index adb69a7c..19044126 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -943,8 +943,12 @@ static struct resource_readback *vulkan_runner_get_resource_readback(struct shad struct vulkan_resource *resource = vulkan_resource(res); VkDevice device = runner->device; VkBufferImageCopy region = {0}; + VkImageLayout layout; - assert(resource->r.type == RESOURCE_TYPE_RENDER_TARGET); + if (resource->r.type == RESOURCE_TYPE_RENDER_TARGET) + layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + else + layout = VK_IMAGE_LAYOUT_GENERAL; rb->rb.width = resource->r.width; rb->rb.height = resource->r.height; @@ -957,8 +961,7 @@ static struct resource_readback *vulkan_runner_get_resource_readback(struct shad begin_command_buffer(runner); - transition_image_layout(runner, resource->image, - VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); + transition_image_layout(runner, resource->image, layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; region.imageSubresource.layerCount = 1; @@ -969,8 +972,7 @@ static struct resource_readback *vulkan_runner_get_resource_readback(struct shad VK_CALL(vkCmdCopyImageToBuffer(runner->cmd_buffer, resource->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, rb->buffer, 1, &region)); - transition_image_layout(runner, resource->image, - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); + transition_image_layout(runner, resource->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, layout); end_command_buffer(runner); diff --git a/tests/uav.shader_test b/tests/uav.shader_test new file mode 100644 index 00000000..09ca05ec --- /dev/null +++ b/tests/uav.shader_test @@ -0,0 +1,56 @@ +[require] +shader model >= 5.0 + +[pixel shader fail] +RWTexture2D<float4> u; + +float4 main() : sv_target +{ + /* All four components must be written in a single statement. */ + u[uint2(0, 0)].xy = float4(1, 2); + u[uint2(0, 0)].zw = float4(3, 4); + return 0; +} + +[pixel shader fail] +Texture2D<float4> u; + +float4 main() : sv_target +{ + /* SRVs are not writable. */ + u[uint2(0, 0)].xyzw = float4(1, 2, 3, 4); + return 0; +} + +[uav 1] +format r32 float +size (2, 2) + +0.1 0.2 +0.3 0.4 + +[uav 2] +size (1, 1) + +0.5 0.6 0.7 0.8 + +[pixel shader] +RWTexture2D<float> u; +RWTexture2D<float4> v; + +float4 main() : sv_target +{ + u[uint2(0, 0)] = 0.5; + u[uint2(0, 1)].x = 0.6; + u[uint2(1, 1)] = 0.7; + v[uint2(0, 0)].yxwz = float4(1, 2, 3, 4); + return 0; +} + +[test] +todo draw quad +probe uav 1 (0, 0) r (0.5) +probe uav 1 (0, 1) r (0.6) +probe uav 1 (1, 0) r (0.2) +probe uav 1 (1, 1) r (0.7) +probe uav 2 (0, 0) rgba (2.0, 1.0, 4.0, 3.0)

1 0