wine-commits April 2024

wine-commits@winehq.org

1 participants
590 discussions

Alfred Agrell : quartz/tests: Test the new error codes.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: 56dfb5bbf4225c279a8cf0f5068d97eee8f129a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/56dfb5bbf4225c279a8cf0f5068d97… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Mar 28 23:36:24 2024 +0100 quartz/tests: Test the new error codes. --- dlls/quartz/tests/filtergraph.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b42e94bff92..df1db0cfed6 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5367,6 +5367,19 @@ static void test_add_source_filter(void) else skip("Not enough permission to register media types.\n"); + /* Test some failure cases. */ + + filter = (IBaseFilter *)0xdeadbeef; + hr = IFilterGraph2_AddSourceFilter(graph, L"", NULL, &filter); + /* the BURIKO visual novel engine requires this exact error code */ + ok(hr == VFW_E_NOT_FOUND, "Got hr %#lx.\n", hr); + ok(filter == (IBaseFilter *)0xdeadbeef, "Got %p.\n", filter); + + filter = (IBaseFilter *)0xdeadbeef; + hr = IFilterGraph2_AddSourceFilter(graph, L"doesnt_exist.mp3", NULL, &filter); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got hr %#lx.\n", hr); + ok(filter == (IBaseFilter *)0xdeadbeef, "Got %p.\n", filter); + ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %ld.\n", ref); }

1 0

Alfred Agrell : quartz: Fix error code on empty filename.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: 6a3bec8e3f3feaf372ed5778daa67f374780b51a URL: https://gitlab.winehq.org/wine/wine/-/commit/6a3bec8e3f3feaf372ed5778daa67f… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Mar 28 23:33:02 2024 +0100 quartz: Fix error code on empty filename. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56491 --- dlls/quartz/filtergraph.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f2c44498109..995c77d89b9 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1516,6 +1516,9 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, TRACE("graph %p, filename %s, filter_name %s, ret_filter %p.\n", graph, debugstr_w(filename), debugstr_w(filter_name), ret_filter); + if (!*filename) + return VFW_E_NOT_FOUND; + if (!get_media_type(filename, NULL, NULL, &clsid)) clsid = CLSID_AsyncReader; TRACE("Using source filter %s.\n", debugstr_guid(&clsid));

1 0

Alfred Agrell : quartz/tests: Test that compressed formats are offered for MPEGs.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: 16579ffb1d49dd2865b9cf58901a1de6d12492ae URL: https://gitlab.winehq.org/wine/wine/-/commit/16579ffb1d49dd2865b9cf58901a1d… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Mar 28 23:36:08 2024 +0100 quartz/tests: Test that compressed formats are offered for MPEGs. --- dlls/quartz/tests/filtergraph.c | 220 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 211 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 92baa0e74e8..b42e94bff92 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -817,6 +817,7 @@ static void test_render_with_multithread(void) struct testpin { IPin IPin_iface; + IMemInputPin IMemInputPin_iface; LONG ref; PIN_DIRECTION dir; struct testfilter *filter; @@ -836,6 +837,10 @@ struct testpin HRESULT Connect_hr; HRESULT EnumMediaTypes_hr; HRESULT QueryInternalConnections_hr; + + BYTE input[64]; + ULONG input_size; + HANDLE on_input_full; }; struct testfilter @@ -870,7 +875,6 @@ struct testfilter IReferenceClock IReferenceClock_iface; IFileSourceFilter IFileSourceFilter_iface; - WCHAR filename[MAX_PATH]; }; static inline struct testpin *impl_from_IEnumMediaTypes(IEnumMediaTypes *iface) @@ -955,6 +959,11 @@ static inline struct testpin *impl_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, struct testpin, IPin_iface); } +static inline struct testpin *impl_from_IMemInputPin(IMemInputPin *iface) +{ + return CONTAINING_RECORD(iface, struct testpin, IMemInputPin_iface); +} + static HRESULT WINAPI testpin_QueryInterface(IPin *iface, REFIID iid, void **out) { struct testpin *pin = impl_from_IPin(iface); @@ -966,6 +975,12 @@ static HRESULT WINAPI testpin_QueryInterface(IPin *iface, REFIID iid, void **out IPin_AddRef(*out); return S_OK; } + if (pin->IMemInputPin_iface.lpVtbl && IsEqualGUID(iid, &IID_IMemInputPin)) + { + *out = &pin->IMemInputPin_iface; + IMemInputPin_AddRef(*out); + return S_OK; + } *out = NULL; return E_NOINTERFACE; @@ -1045,7 +1060,7 @@ static HRESULT WINAPI testpin_QueryId(IPin *iface, WCHAR **id) { struct testpin *pin = impl_from_IPin(iface); if (winetest_debug > 1) trace("%p->QueryId()\n", iface); - *id = CoTaskMemAlloc(11); + *id = CoTaskMemAlloc(sizeof(WCHAR)*11); wcscpy(*id, pin->id); return S_OK; } @@ -1169,6 +1184,8 @@ static void testpin_init(struct testpin *pin, const IPinVtbl *vtbl, PIN_DIRECTIO pin->Connect_hr = S_OK; pin->EnumMediaTypes_hr = S_OK; pin->QueryInternalConnections_hr = E_NOTIMPL; + wsprintfW(pin->name, L"name%.4x", 0xFFFF&(intptr_t)pin); + wsprintfW(pin->id, L"id%.4x", 0xFFFF&(intptr_t)pin); } static void testsink_init(struct testpin *pin) @@ -1476,8 +1493,20 @@ static HRESULT WINAPI testfilter_EnumPins(IBaseFilter *iface, IEnumPins **out) static HRESULT WINAPI testfilter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **pin) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IBaseFilter(iface); + int i; + if (winetest_debug > 1) trace("%p->FindPin(%ls)\n", filter, id); + + for (i = 0; i < filter->pin_count; ++i) + { + if (!wcscmp(id, filter->pins[i].id)) + { + *pin = &filter->pins[i].IPin_iface; + IPin_AddRef(*pin); + return S_OK; + } + } + return VFW_E_NOT_FOUND; } static HRESULT WINAPI testfilter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *info) @@ -1970,11 +1999,7 @@ static ULONG WINAPI testfilesource_Release(IFileSourceFilter *iface) static HRESULT WINAPI testfilesource_Load(IFileSourceFilter *iface, const WCHAR *filename, const AM_MEDIA_TYPE *mt) { - struct testfilter *filter = impl_from_IFileSourceFilter(iface); - if (winetest_debug > 1) trace("%p->Load()\n", iface); - - wcscpy(filter->filename, filename); - + if (winetest_debug > 1) trace("%p->Load(%ls)\n", iface, filename); return S_OK; } @@ -4193,6 +4218,182 @@ static void test_ec_complete(void) ok(filter3.ref == 1, "Got outstanding refcount %ld.\n", filter3.ref); } +static HRESULT WINAPI mpegtestsink_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + struct testpin *pin = impl_from_IPin(iface); + if (winetest_debug > 1) trace("%p->ReceiveConnection(%p)\n", pin, peer); + + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) + return VFW_E_TYPE_NOT_ACCEPTED; + if (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1Payload)) + return VFW_E_TYPE_NOT_ACCEPTED; + if (!IsEqualGUID(&mt->formattype, &FORMAT_MPEGVideo)) + return VFW_E_TYPE_NOT_ACCEPTED; + + pin->peer = peer; + IPin_AddRef(peer); + return S_OK; +} + +static HRESULT WINAPI mpegtestpin_EndOfStream(IPin *iface) +{ + return S_OK; +} + +static HRESULT WINAPI mpegtestpin_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) +{ + return S_OK; +} + +static const IPinVtbl mpegtestsink_vtbl = +{ + testpin_QueryInterface, + testpin_AddRef, + testpin_Release, + no_Connect, + mpegtestsink_ReceiveConnection, + testpin_Disconnect, + testpin_ConnectedTo, + testpin_ConnectionMediaType, + testpin_QueryPinInfo, + testpin_QueryDirection, + testpin_QueryId, + testpin_QueryAccept, + testpin_EnumMediaTypes, + testpin_QueryInternalConnections, + mpegtestpin_EndOfStream, + testpin_BeginFlush, + testpin_EndFlush, + mpegtestpin_NewSegment +}; + +static HRESULT WINAPI meminput_QueryInterface(IMemInputPin *iface, REFIID iid, void **out) +{ + struct testpin *pin = impl_from_IMemInputPin(iface); + if (winetest_debug > 1) trace("%p->QueryInterface(%s)\n", pin, wine_dbgstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI meminput_AddRef(IMemInputPin *iface) +{ + struct testpin *pin = impl_from_IMemInputPin(iface); + return InterlockedIncrement(&pin->ref); +} + +static ULONG WINAPI meminput_Release(IMemInputPin *iface) +{ + struct testpin *pin = impl_from_IMemInputPin(iface); + return InterlockedDecrement(&pin->ref); +} + +static HRESULT STDMETHODCALLTYPE meminput_GetAllocator(IMemInputPin *iface, IMemAllocator **allocator) +{ + return VFW_E_NO_ALLOCATOR; +} + +static HRESULT STDMETHODCALLTYPE meminput_NotifyAllocator(IMemInputPin *iface, IMemAllocator *allocator, BOOL readonly) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE meminput_GetAllocatorRequirements(IMemInputPin *iface, ALLOCATOR_PROPERTIES *props) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE meminput_Receive(IMemInputPin *iface, IMediaSample *sample) +{ + struct testpin *pin = impl_from_IMemInputPin(iface); + size_t new_bytes; + HRESULT hr; + BYTE *ptr; + long len; + + len = IMediaSample_GetActualDataLength(sample); + hr = IMediaSample_GetPointer(sample, &ptr); + + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(len > 0, "Got %ld.\n", len); + + new_bytes = min(sizeof(pin->input) - pin->input_size, len); + if (new_bytes) + { + memcpy(pin->input + pin->input_size, ptr, new_bytes); + pin->input_size += new_bytes; + if (pin->input_size == sizeof(pin->input)) + SetEvent(pin->on_input_full); + } + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE meminput_ReceiveMultiple(IMemInputPin *iface, IMediaSample **samples, LONG n_samples, LONG *n_samples_processed) +{ + *n_samples_processed = 1; + return IMemInputPin_Receive(iface, samples[0]); +} + +static HRESULT STDMETHODCALLTYPE meminput_ReceiveCanBlock(IMemInputPin *iface) { return S_OK; } + +static const IMemInputPinVtbl mpegtestsink_meminput_vtbl = +{ + meminput_QueryInterface, + meminput_AddRef, + meminput_Release, + + meminput_GetAllocator, + meminput_NotifyAllocator, + meminput_GetAllocatorRequirements, + meminput_Receive, + meminput_ReceiveMultiple, + meminput_ReceiveCanBlock +}; + +static void test_renderfile_compressed(void) +{ + WCHAR *filename = load_resource(L"test.mpg"); + struct testpin sink_pin; + struct testfilter sink; + IMediaControl *control; + IFilterGraph2 *graph; + HRESULT hr; + DWORD ret; + + graph = create_graph(); + testpin_init(&sink_pin, &mpegtestsink_vtbl, PINDIR_INPUT); + sink_pin.IMemInputPin_iface.lpVtbl = &mpegtestsink_meminput_vtbl; + testfilter_init(&sink, &sink_pin, 1); + + hr = IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, L"sink"); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IFilterGraph2_RenderFile(graph, filename, NULL); + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "Got hr %#lx.\n", hr); + + ok(sink_pin.peer != NULL, "Expected connection.\n"); + + sink_pin.on_input_full = CreateEventW(NULL, FALSE, FALSE, NULL); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaControl_Pause(control); + ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); + + ret = WaitForSingleObject(sink_pin.on_input_full, 1000); + ok(ret == WAIT_OBJECT_0, "Got %#lx.\n", ret); + + ok(sink_pin.input[0] == 0x00, "Expected MPEG sequence header.\n"); + ok(sink_pin.input[1] == 0x00, "Expected MPEG sequence header.\n"); + ok(sink_pin.input[2] == 0x01, "Expected MPEG sequence header.\n"); + ok(sink_pin.input[3] == 0xB3, "Expected MPEG sequence header.\n"); + + IMediaControl_Stop(control); + IFilterGraph2_Release(graph); + DeleteFileW(filename); +} + static void test_renderfile_failure(void) { static const char bogus_data[20] = {0xde, 0xad, 0xbe, 0xef}; @@ -5751,6 +5952,7 @@ START_TEST(filtergraph) test_sync_source(); test_filter_state(); test_ec_complete(); + test_renderfile_compressed(); test_renderfile_failure(); test_graph_seeking(); test_default_sync_source();

1 0

Alfred Agrell : winegstreamer: Reduce CLSID_decodebin_parser merit, so the MPEG splitter is chosen instead for MPEGs.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: e870f31d773376f3824c7803b5451f7025c3e92b URL: https://gitlab.winehq.org/wine/wine/-/commit/e870f31d773376f3824c7803b5451f… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Apr 4 19:10:07 2024 +0200 winegstreamer: Reduce CLSID_decodebin_parser merit, so the MPEG splitter is chosen instead for MPEGs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56491 --- dlls/winegstreamer/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 87d3b9e4fa1..671d011424e 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -1059,7 +1059,7 @@ static const REGFILTERPINS2 reg_decodebin_parser_pins[3] = static const REGFILTER2 reg_decodebin_parser = { .dwVersion = 2, - .dwMerit = MERIT_PREFERRED, + .dwMerit = MERIT_NORMAL - 1, .u.s2.cPins2 = 3, .u.s2.rgPins2 = reg_decodebin_parser_pins, };

1 0

Alfred Agrell : winegstreamer: Delete now-meaningless wg_parser_type enum.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: d71846d09bd17e498e1b1ec887e1b7c2fe8d4027 URL: https://gitlab.winehq.org/wine/wine/-/commit/d71846d09bd17e498e1b1ec887e1b7… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Apr 4 18:57:18 2024 +0200 winegstreamer: Delete now-meaningless wg_parser_type enum. --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/main.c | 5 ++--- dlls/winegstreamer/media_source.c | 2 +- dlls/winegstreamer/quartz_parser.c | 12 ++++++------ dlls/winegstreamer/unixlib.h | 7 ------- dlls/winegstreamer/wg_parser.c | 14 +++----------- dlls/winegstreamer/wm_reader.c | 4 ++-- 7 files changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 2374fb6fddd..e03c779f750 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -49,7 +49,7 @@ HRESULT wg_sample_queue_create(struct wg_sample_queue **out); void wg_sample_queue_destroy(struct wg_sample_queue *queue); void wg_sample_queue_flush(struct wg_sample_queue *queue, bool all); -wg_parser_t wg_parser_create(enum wg_parser_type type, bool output_compressed); +wg_parser_t wg_parser_create(bool output_compressed); void wg_parser_destroy(wg_parser_t parser); HRESULT wg_parser_connect(wg_parser_t parser, uint64_t file_size); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index d4f5db04a15..87d3b9e4fa1 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -68,17 +68,16 @@ bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) return TRUE; } -wg_parser_t wg_parser_create(enum wg_parser_type type, bool output_compressed) +wg_parser_t wg_parser_create(bool output_compressed) { struct wg_parser_create_params params = { - .type = type, .output_compressed = output_compressed, .err_on = ERR_ON(quartz), .warn_on = WARN_ON(quartz), }; - TRACE("type %#x.\n", type); + TRACE("output_compressed %d.\n", output_compressed); if (WINE_UNIX_CALL(unix_wg_parser_create, &params)) return 0; diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3b5469932f3..8acfa75f335 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1643,7 +1643,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) goto fail; - if (!(parser = wg_parser_create(WG_PARSER_DECODEBIN, FALSE))) + if (!(parser = wg_parser_create(FALSE))) { hr = E_OUTOFMEMORY; goto fail; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 0b55d729df5..9b17b0afddd 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1650,14 +1650,14 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, return VFW_S_NO_MORE_ITEMS; } -static HRESULT parser_create(enum wg_parser_type type, BOOL output_compressed, struct parser **parser) +static HRESULT parser_create(BOOL output_compressed, struct parser **parser) { struct parser *object; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = wg_parser_create(type, output_compressed))) + if (!(object->wg_parser = wg_parser_create(output_compressed))) { free(object); return E_OUTOFMEMORY; @@ -1677,7 +1677,7 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) struct parser *object; HRESULT hr; - if (FAILED(hr = parser_create(WG_PARSER_DECODEBIN, FALSE, &object))) + if (FAILED(hr = parser_create(FALSE, &object))) return hr; strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); @@ -2251,7 +2251,7 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) struct parser *object; HRESULT hr; - if (FAILED(hr = parser_create(WG_PARSER_DECODEBIN, TRUE, &object))) + if (FAILED(hr = parser_create(TRUE, &object))) return hr; strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); @@ -2329,7 +2329,7 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) struct parser *object; HRESULT hr; - if (FAILED(hr = parser_create(WG_PARSER_DECODEBIN, TRUE, &object))) + if (FAILED(hr = parser_create(TRUE, &object))) return hr; strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); @@ -2446,7 +2446,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) struct parser *object; HRESULT hr; - if (FAILED(hr = parser_create(WG_PARSER_DECODEBIN, TRUE, &object))) + if (FAILED(hr = parser_create(TRUE, &object))) return hr; strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 56b910b9631..d77a0346d46 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -197,12 +197,6 @@ struct wg_parser_buffer }; C_ASSERT(sizeof(struct wg_parser_buffer) == 32); -typedef UINT32 wg_parser_type; -enum wg_parser_type -{ - WG_PARSER_DECODEBIN, -}; - typedef UINT64 wg_parser_t; typedef UINT64 wg_parser_stream_t; typedef UINT64 wg_transform_t; @@ -218,7 +212,6 @@ struct wg_init_gstreamer_params struct wg_parser_create_params { wg_parser_t parser; - wg_parser_type type; UINT8 output_compressed; UINT8 err_on; UINT8 warn_on; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5b391bbd7ab..31538624ef6 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -51,18 +51,16 @@ typedef enum struct wg_parser; -typedef BOOL (*init_gst_cb)(struct wg_parser *parser); - struct input_cache_chunk { guint64 position; uint8_t *data; }; +static BOOL decodebin_parser_init_gst(struct wg_parser *parser); + struct wg_parser { - init_gst_cb init_gst; - struct wg_parser_stream **streams; unsigned int stream_count; @@ -1576,7 +1574,7 @@ static NTSTATUS wg_parser_connect(void *args) parser->next_pull_offset = 0; parser->error = false; - if (!parser->init_gst(parser)) + if (!decodebin_parser_init_gst(parser)) goto out; gst_element_set_state(parser->container, GST_STATE_PAUSED); @@ -1787,11 +1785,6 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) static NTSTATUS wg_parser_create(void *args) { - static const init_gst_cb init_funcs[] = - { - [WG_PARSER_DECODEBIN] = decodebin_parser_init_gst, - }; - struct wg_parser_create_params *params = args; struct wg_parser *parser; @@ -1802,7 +1795,6 @@ static NTSTATUS wg_parser_create(void *args) pthread_cond_init(&parser->init_cond, NULL); pthread_cond_init(&parser->read_cond, NULL); pthread_cond_init(&parser->read_done_cond, NULL); - parser->init_gst = init_funcs[params->type]; parser->output_compressed = params->output_compressed; parser->err_on = params->err_on; parser->warn_on = params->warn_on; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index c96d053ccae..0cf0dd0ac9f 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1452,7 +1452,7 @@ static HRESULT init_stream(struct wm_reader *reader) HRESULT hr; WORD i; - if (!(wg_parser = wg_parser_create(WG_PARSER_DECODEBIN, FALSE))) + if (!(wg_parser = wg_parser_create(FALSE))) return E_OUTOFMEMORY; reader->wg_parser = wg_parser; @@ -1557,7 +1557,7 @@ static HRESULT reinit_stream(struct wm_reader *reader, bool read_compressed) wg_parser_destroy(reader->wg_parser); reader->wg_parser = 0; - if (!(wg_parser = wg_parser_create(WG_PARSER_DECODEBIN, read_compressed))) + if (!(wg_parser = wg_parser_create(read_compressed))) return E_OUTOFMEMORY; reader->wg_parser = wg_parser;

1 0

Alfred Agrell : winegstreamer: Use decodebin instead of wavparse.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: 460c28c45173d2e2225524ebfbf170ea2dec7cbd URL: https://gitlab.winehq.org/wine/wine/-/commit/460c28c45173d2e2225524ebfbf170… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Apr 4 18:53:01 2024 +0200 winegstreamer: Use decodebin instead of wavparse. --- dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/unixlib.h | 1 - dlls/winegstreamer/wg_parser.c | 25 ------------------------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 7a624d1dbfa..0b55d729df5 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -2251,7 +2251,7 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) struct parser *object; HRESULT hr; - if (FAILED(hr = parser_create(WG_PARSER_WAVPARSE, FALSE, &object))) + if (FAILED(hr = parser_create(WG_PARSER_DECODEBIN, TRUE, &object))) return hr; strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 6f7892b296d..56b910b9631 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -201,7 +201,6 @@ typedef UINT32 wg_parser_type; enum wg_parser_type { WG_PARSER_DECODEBIN, - WG_PARSER_WAVPARSE, }; typedef UINT64 wg_parser_t; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 9ea17d0c0c5..5b391bbd7ab 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1784,37 +1784,12 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) return TRUE; } -static BOOL wave_parser_init_gst(struct wg_parser *parser) -{ - struct wg_parser_stream *stream; - GstElement *element; - - if (!(element = create_element("wavparse", "good"))) - return FALSE; - - gst_bin_add(GST_BIN(parser->container), element); - - if (!link_src_to_element(parser->my_src, element)) - return FALSE; - - if (!(stream = create_stream(parser))) - return FALSE; - - if (!link_element_to_sink(element, stream->my_sink)) - return FALSE; - gst_pad_set_active(stream->my_sink, 1); - - parser->no_more_pads = true; - - return TRUE; -} static NTSTATUS wg_parser_create(void *args) { static const init_gst_cb init_funcs[] = { [WG_PARSER_DECODEBIN] = decodebin_parser_init_gst, - [WG_PARSER_WAVPARSE] = wave_parser_init_gst, }; struct wg_parser_create_params *params = args;

1 0

Alfred Agrell : winegstreamer: Create decodebin instead of avidemux.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: 5b24cc1afd8521a7fb6aadac421264cb278129d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b24cc1afd8521a7fb6aadac421264… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Apr 4 18:50:48 2024 +0200 winegstreamer: Create decodebin instead of avidemux. --- dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/unixlib.h | 1 - dlls/winegstreamer/wg_parser.c | 24 ------------------------ 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 2b36534727a..7a624d1dbfa 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -2329,7 +2329,7 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) struct parser *object; HRESULT hr; - if (FAILED(hr = parser_create(WG_PARSER_AVIDEMUX, FALSE, &object))) + if (FAILED(hr = parser_create(WG_PARSER_DECODEBIN, TRUE, &object))) return hr; strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 61a87a7092c..6f7892b296d 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -201,7 +201,6 @@ typedef UINT32 wg_parser_type; enum wg_parser_type { WG_PARSER_DECODEBIN, - WG_PARSER_AVIDEMUX, WG_PARSER_WAVPARSE, }; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index b0a344d5186..9ea17d0c0c5 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1784,29 +1784,6 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) return TRUE; } -static BOOL avi_parser_init_gst(struct wg_parser *parser) -{ - GstElement *element; - - if (!(element = create_element("avidemux", "good"))) - return FALSE; - - gst_bin_add(GST_BIN(parser->container), element); - - g_signal_connect(element, "pad-added", G_CALLBACK(pad_added_cb), parser); - g_signal_connect(element, "pad-removed", G_CALLBACK(pad_removed_cb), parser); - g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_cb), parser); - - pthread_mutex_lock(&parser->mutex); - parser->no_more_pads = false; - pthread_mutex_unlock(&parser->mutex); - - if (!link_src_to_element(parser->my_src, element)) - return FALSE; - - return TRUE; -} - static BOOL wave_parser_init_gst(struct wg_parser *parser) { struct wg_parser_stream *stream; @@ -1837,7 +1814,6 @@ static NTSTATUS wg_parser_create(void *args) static const init_gst_cb init_funcs[] = { [WG_PARSER_DECODEBIN] = decodebin_parser_init_gst, - [WG_PARSER_AVIDEMUX] = avi_parser_init_gst, [WG_PARSER_WAVPARSE] = wave_parser_init_gst, };

1 0

Zebediah Figura : wined3d: Use dynamic state for rasterizer state if possible.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: b85fff5acc2c85129455a8f8aa53f06d0ed20d7a URL: https://gitlab.winehq.org/wine/wine/-/commit/b85fff5acc2c85129455a8f8aa53f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 14 17:26:01 2023 -0500 wined3d: Use dynamic state for rasterizer state if possible. --- dlls/wined3d/adapter_vk.c | 4 ++++ dlls/wined3d/context_vk.c | 44 +++++++++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_vk.h | 8 +++++++- 3 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3d7b4fe1cc6..418b67de8b6 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2391,6 +2391,10 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ vk_info->dynamic_blend_state = dynamic_state3->extendedDynamicState3ColorBlendEnable && dynamic_state3->extendedDynamicState3ColorBlendEquation && dynamic_state3->extendedDynamicState3ColorWriteMask; + /* Rasterizer state needs EDS2, for rasterizer discard, and EDS1, for cull mode and front face. */ + vk_info->dynamic_rasterizer_state = dynamic_state3->extendedDynamicState3DepthClampEnable + && vk_info->dynamic_state2 + && adapter_vk->vk_info.supported[WINED3D_VK_EXT_EXTENDED_DYNAMIC_STATE]; } static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk *adapter_vk) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c91be5e82ed..dc793a839bb 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1913,6 +1913,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_invalidate_state(&context_vk->c, STATE_BLEND); context_invalidate_state(&context_vk->c, STATE_BLEND_FACTOR); context_invalidate_state(&context_vk->c, STATE_DEPTH_STENCIL); + context_invalidate_state(&context_vk->c, STATE_RASTERIZER); context_invalidate_state(&context_vk->c, STATE_STENCIL_REF); context_invalidate_state(&context_vk->c, STATE_VIEWPORT); context_invalidate_state(&context_vk->c, STATE_SCISSORRECT); @@ -2159,6 +2160,15 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_COLOR_BLEND_EQUATION_EXT; dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_COLOR_WRITE_MASK_EXT; } + if (vk_info->dynamic_rasterizer_state) + { + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_DEPTH_CLAMP_ENABLE_EXT; + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT; + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_CULL_MODE_EXT; + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_FRONT_FACE_EXT; + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT; + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_DEPTH_BIAS; + } key = &context_vk->graphics.pipeline_key_vk; memset(key, 0, sizeof(*key)); @@ -2222,11 +2232,9 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->pipeline_desc.basePipelineIndex = -1; } -static void wined3d_context_vk_update_rasterisation_state(const struct wined3d_context_vk *context_vk, - const struct wined3d_state *state, struct wined3d_graphics_pipeline_key_vk *key) +static void rasterizer_state_from_wined3d(VkPipelineRasterizationStateCreateInfo *desc, + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) { - const struct wined3d_d3d_info *d3d_info = context_vk->c.d3d_info; - VkPipelineRasterizationStateCreateInfo *desc = &key->rs_desc; const struct wined3d_rasterizer_state_desc *r; float scale_bias; union @@ -2291,6 +2299,24 @@ static void wined3d_context_vk_update_rasterisation_state(const struct wined3d_c desc->depthBiasClamp = r->depth_bias_clamp; } +static void wined3d_context_vk_set_dynamic_rasterizer_state(const struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer, const struct wined3d_vk_info *vk_info, const struct wined3d_state *state) +{ + VkPipelineRasterizationStateCreateInfo desc; + + rasterizer_state_from_wined3d(&desc, state, context_vk->c.d3d_info); + + VK_CALL(vkCmdSetRasterizerDiscardEnableEXT(vk_command_buffer, desc.rasterizerDiscardEnable)); + VK_CALL(vkCmdSetDepthClampEnableEXT(vk_command_buffer, desc.depthClampEnable)); + VK_CALL(vkCmdSetCullModeEXT(vk_command_buffer, desc.cullMode)); + VK_CALL(vkCmdSetFrontFaceEXT(vk_command_buffer, desc.frontFace)); + VK_CALL(vkCmdSetDepthBiasEnableEXT(vk_command_buffer, desc.depthBiasEnable)); + + if (desc.depthBiasEnable) + VK_CALL(vkCmdSetDepthBias(vk_command_buffer, desc.depthBiasConstantFactor, + desc.depthBiasClamp, desc.depthBiasSlopeFactor)); +} + static void blend_equation_from_wined3d(const struct wined3d_context_vk *context_vk, VkColorBlendEquationEXT *eq, const struct wined3d_rendertarget_blend_state_desc *rt, const struct wined3d_rendertarget_view *rtv) { @@ -2582,10 +2608,10 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER) - || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY))) + if (!vk_info->dynamic_rasterizer_state && (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY)))) { - wined3d_context_vk_update_rasterisation_state(context_vk, state, key); + rasterizer_state_from_wined3d(&key->rs_desc, state, d3d_info); update = true; } @@ -3955,6 +3981,10 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c context_vk->c.update_multisample_state = 0; } + if (vk_info->dynamic_rasterizer_state && (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY)))) + wined3d_context_vk_set_dynamic_rasterizer_state(context_vk, vk_command_buffer, vk_info, state); + if (vk_info->dynamic_blend_state && (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_BLEND) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER))) wined3d_context_vk_set_dynamic_blend_state(context_vk, vk_command_buffer, vk_info, state); diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 549245eb81f..94a6b6c0c5e 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -194,7 +194,12 @@ struct wined3d_device_vk; VK_DEVICE_EXT_PFN(vkCmdSetColorBlendEnableEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetColorBlendEquationEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetColorWriteMaskEXT) \ + VK_DEVICE_EXT_PFN(vkCmdSetCullModeEXT) \ + VK_DEVICE_EXT_PFN(vkCmdSetDepthBiasEnableEXT) \ + VK_DEVICE_EXT_PFN(vkCmdSetDepthClampEnableEXT) \ + VK_DEVICE_EXT_PFN(vkCmdSetFrontFaceEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetRasterizationSamplesEXT) \ + VK_DEVICE_EXT_PFN(vkCmdSetRasterizerDiscardEnableEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetSampleMaskEXT) \ /* VK_EXT_transform_feedback */ \ VK_DEVICE_EXT_PFN(vkCmdBeginQueryIndexedEXT) \ @@ -258,6 +263,7 @@ struct wined3d_vk_info bool dynamic_patch_vertex_count; bool dynamic_multisample_state; bool dynamic_blend_state; + bool dynamic_rasterizer_state; }; #define VK_CALL(f) (vk_info->vk_ops.f) @@ -580,7 +586,7 @@ struct wined3d_context_vk const struct wined3d_vk_info *vk_info; - VkDynamicState dynamic_states[20]; + VkDynamicState dynamic_states[27]; uint32_t update_compute_pipeline : 1; uint32_t update_stream_output : 1;

1 0

Zebediah Figura : wined3d: Use dynamic state for blend state if possible.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: 97048c5ffc17f9f7b52aa2c44218772f57c8167c URL: https://gitlab.winehq.org/wine/wine/-/commit/97048c5ffc17f9f7b52aa2c4421877… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 14 17:03:21 2023 -0500 wined3d: Use dynamic state for blend state if possible. --- dlls/wined3d/adapter_vk.c | 3 ++ dlls/wined3d/context_vk.c | 118 ++++++++++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_vk.h | 6 ++- 3 files changed, 97 insertions(+), 30 deletions(-)

1 0

Zebediah Figura : wined3d: Use dynamic state for multisample state if possible.
by Alexandre Julliard 16 Apr '24

16 Apr '24

Module: wine Branch: master Commit: a00efa12e27035a4a1afb961daefa69766e86b17 URL: https://gitlab.winehq.org/wine/wine/-/commit/a00efa12e27035a4a1afb961daefa6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 14 14:14:16 2023 -0500 wined3d: Use dynamic state for multisample state if possible. --- dlls/wined3d/adapter_vk.c | 6 ++++++ dlls/wined3d/context.c | 1 + dlls/wined3d/context_vk.c | 25 +++++++++++++++++++++++-- dlls/wined3d/cs.c | 9 ++++++--- dlls/wined3d/wined3d_private.h | 5 +++-- dlls/wined3d/wined3d_vk.h | 7 ++++++- 6 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b31e65cde58..32acfddf41f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2296,6 +2296,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_vk, uint32_t wined3d_creation_flags) { + const struct VkPhysicalDeviceExtendedDynamicState3FeaturesEXT *dynamic_state3; struct wined3d_d3d_info *d3d_info = &adapter_vk->a.d3d_info; struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; struct wined3d_physical_device_info device_info; @@ -2382,6 +2383,11 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ vk_info->multiple_viewports = device_info.features2.features.multiViewport; vk_info->dynamic_state2 = device_info.dynamic_state2_features.extendedDynamicState2; vk_info->dynamic_patch_vertex_count = device_info.dynamic_state2_features.extendedDynamicState2PatchControlPoints; + + dynamic_state3 = &device_info.dynamic_state3_features; + vk_info->dynamic_multisample_state = dynamic_state3->extendedDynamicState3RasterizationSamples + && dynamic_state3->extendedDynamicState3AlphaToCoverageEnable + && dynamic_state3->extendedDynamicState3SampleMask; } static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk *adapter_vk) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d0193237d25..b6c24c3d837 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -116,6 +116,7 @@ void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapch context->update_primitive_type = 1; context->update_patch_vertex_count = 1; + context->update_multisample_state = 1; } HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index e59069ab809..76fcde1d06b 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1907,6 +1907,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_vk->c.update_compute_unordered_access_view_bindings = 1; context_vk->c.update_primitive_type = 1; context_vk->c.update_patch_vertex_count = 1; + context_vk->c.update_multisample_state = 1; context_invalidate_state(&context_vk->c, STATE_STREAMSRC); context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); context_invalidate_state(&context_vk->c, STATE_BLEND_FACTOR); @@ -2145,6 +2146,12 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context } if (vk_info->dynamic_patch_vertex_count) dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT; + if (vk_info->dynamic_multisample_state) + { + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_ALPHA_TO_COVERAGE_ENABLE_EXT; + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_RASTERIZATION_SAMPLES_EXT; + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_SAMPLE_MASK_EXT; + } key = &context_vk->graphics.pipeline_key_vk; memset(key, 0, sizeof(*key)); @@ -2176,6 +2183,8 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->ms_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; key->ms_desc.pSampleMask = &key->sample_mask; + /* This has to be initialized to a nonzero value even if it's dynamic. */ + key->ms_desc.rasterizationSamples = 1; key->ds_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; key->ds_desc.maxDepthBounds = 1.0f; @@ -2526,8 +2535,9 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (key->ms_desc.rasterizationSamples != context_vk->sample_count - || isStateDirty(&context_vk->c, STATE_BLEND) || isStateDirty(&context_vk->c, STATE_SAMPLE_MASK)) + if (!vk_info->dynamic_multisample_state + && (key->ms_desc.rasterizationSamples != context_vk->sample_count + || isStateDirty(&context_vk->c, STATE_BLEND) || isStateDirty(&context_vk->c, STATE_SAMPLE_MASK))) { key->ms_desc.rasterizationSamples = context_vk->sample_count; key->ms_desc.alphaToCoverageEnable = state->blend_state && state->blend_state->desc.alpha_to_coverage; @@ -3878,6 +3888,17 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c context_vk->c.update_patch_vertex_count = 0; } + if (vk_info->dynamic_multisample_state && context_vk->c.update_multisample_state) + { + unsigned int sample_count = context_vk->sample_count; + + VK_CALL(vkCmdSetAlphaToCoverageEnableEXT(vk_command_buffer, + state->blend_state && state->blend_state->desc.alpha_to_coverage)); + VK_CALL(vkCmdSetRasterizationSamplesEXT(vk_command_buffer, sample_count)); + VK_CALL(vkCmdSetSampleMaskEXT(vk_command_buffer, sample_count, &state->sample_mask)); + context_vk->c.update_multisample_state = 0; + } + if (vk_info->supported[WINED3D_VK_EXT_EXTENDED_DYNAMIC_STATE] && (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_DEPTH_STENCIL) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER))) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3b1891321a4..5ee4c8d1538 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1758,17 +1758,20 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte static void wined3d_cs_exec_set_blend_state(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_blend_state *op = data; + struct wined3d_device *device = cs->c.device; struct wined3d_state *state = &cs->state; if (state->blend_state != op->state) { state->blend_state = op->state; - device_invalidate_state(cs->c.device, STATE_BLEND); + device_invalidate_state(device, STATE_BLEND); } state->blend_factor = op->factor; - device_invalidate_state(cs->c.device, STATE_BLEND_FACTOR); + device_invalidate_state(device, STATE_BLEND_FACTOR); state->sample_mask = op->sample_mask; - device_invalidate_state(cs->c.device, STATE_SAMPLE_MASK); + device_invalidate_state(device, STATE_SAMPLE_MASK); + for (unsigned int i = 0; i < device->context_count; ++i) + device->contexts[i]->update_multisample_state = 1; } void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f42d5d7d050..1ef99272b53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1967,7 +1967,8 @@ struct wined3d_context DWORD namedArraysLoaded : 1; DWORD update_primitive_type : 1; DWORD update_patch_vertex_count : 1; - DWORD padding : 3; + DWORD update_multisample_state : 1; + DWORD padding : 2; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ @@ -2912,7 +2913,7 @@ struct wined3d_state unsigned int render_states[WINEHIGHEST_RENDER_STATE + 1]; struct wined3d_blend_state *blend_state; struct wined3d_color blend_factor; - unsigned int sample_mask; + uint32_t sample_mask; struct wined3d_depth_stencil_state *depth_stencil_state; unsigned int stencil_ref; bool depth_bounds_enable; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index e995ef3c408..dfa876b8048 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -189,6 +189,10 @@ struct wined3d_device_vk; /* VK_EXT_extended_dynamic_state2 */ \ VK_DEVICE_EXT_PFN(vkCmdSetPatchControlPointsEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetPrimitiveRestartEnableEXT) \ + /* VK_EXT_extended_dynamic_state3 */ \ + VK_DEVICE_EXT_PFN(vkCmdSetAlphaToCoverageEnableEXT) \ + VK_DEVICE_EXT_PFN(vkCmdSetRasterizationSamplesEXT) \ + VK_DEVICE_EXT_PFN(vkCmdSetSampleMaskEXT) \ /* VK_EXT_transform_feedback */ \ VK_DEVICE_EXT_PFN(vkCmdBeginQueryIndexedEXT) \ VK_DEVICE_EXT_PFN(vkCmdBeginTransformFeedbackEXT) \ @@ -249,6 +253,7 @@ struct wined3d_vk_info bool multiple_viewports; bool dynamic_state2; bool dynamic_patch_vertex_count; + bool dynamic_multisample_state; }; #define VK_CALL(f) (vk_info->vk_ops.f) @@ -571,7 +576,7 @@ struct wined3d_context_vk const struct wined3d_vk_info *vk_info; - VkDynamicState dynamic_states[14]; + VkDynamicState dynamic_states[17]; uint32_t update_compute_pipeline : 1; uint32_t update_stream_output : 1;

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2024