July 2020 - Wine-commits - list.winehq.org

Gijs Vermeulen : amstream: Add AMMediaStream::JoinFilterGraph() tests.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 3572a7f44004a9ebd16e2b1e8164b3477f0d5227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3572a7f44004a9ebd16e2b1e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jul 13 19:08:44 2020 +0200 amstream: Add AMMediaStream::JoinFilterGraph() tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2d9f3e35f2..a0876d6242 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4328,6 +4328,89 @@ static void test_ammediastream_join_filter(void) check_ammediastream_join_filter(&CLSID_AMDirectDrawStream); } +static void check_ammediastream_join_filter_graph(const MSPID *id) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IGraphBuilder *builder, *builder2; + IMediaStreamFilter *filter; + IAMMediaStream *stream; + IFilterGraph *graph; + FILTER_INFO info; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, (IMediaStream **)&stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!builder, "Expected non-null graph.\n"); + EXPECT_REF(builder, 4); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + /* Crashes on native. */ + if (0) + { + hr = IAMMediaStream_JoinFilterGraph(stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + hr = IAMMediaStream_JoinFilterGraph(stream, graph); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(builder2 == builder, "Expected graph %p, got %p.\n", builder, builder2); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IGraphBuilder_Release(builder2); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + ref = IFilterGraph_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(builder); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ammediastream_join_filter_graph(void) +{ + check_ammediastream_join_filter_graph(&MSPID_PrimaryAudio); + check_ammediastream_join_filter_graph(&MSPID_PrimaryVideo); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5023,6 +5106,7 @@ START_TEST(amstream) test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); + test_ammediastream_join_filter_graph(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run();

1 0

Gijs Vermeulen : amstream: Implement AMMediaStream::JoinFilterGraph.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: c6b437284554a77c9510873c90cd1c7055e845f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b437284554a77c9510873c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jul 13 19:08:45 2020 +0200 amstream: Implement AMMediaStream::JoinFilterGraph. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 6 +++--- dlls/amstream/ddrawstream.c | 6 +++--- dlls/amstream/tests/amstream.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 60a2572b3b..112891eeb7 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -593,11 +593,11 @@ static HRESULT WINAPI audio_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMe static HRESULT WINAPI audio_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + TRACE("stream %p, filtergraph %p.\n", stream, filtergraph); - return S_FALSE; + return S_OK; } static const struct IAMMediaStreamVtbl audio_IAMMediaStream_vtbl = diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5530603f7a..9f74eaf91a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -261,11 +261,11 @@ static HRESULT WINAPI ddraw_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMe static HRESULT WINAPI ddraw_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + TRACE("stream %p, filtergraph %p.\n", stream, filtergraph); - return S_FALSE; + return S_OK; } static const struct IAMMediaStreamVtbl ddraw_IAMMediaStream_vtbl = diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a0876d6242..a81cdba3f3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4371,7 +4371,7 @@ static void check_ammediastream_join_filter_graph(const MSPID *id) } hr = IAMMediaStream_JoinFilterGraph(stream, graph); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); EXPECT_REF(builder, 4); EXPECT_REF(graph, 1);

1 0

Nikolay Sivov : evr/tests: Fix test crash on Windows 7.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: ea53b3c22e60a17c595cd2c463d3092ec123422d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea53b3c22e60a17c595cd2c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:40:57 2020 +0300 evr/tests: Fix test crash on Windows 7. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5e18494718..6a5d80df41 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1080,15 +1080,18 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); - /* Device manager wasn't set, sample get regular memory buffers. */ - hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + /* Device manager wasn't set, sample gets regular memory buffers. */ + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + } IMFMediaBuffer_Release(buffer); - IMFGetService_Release(gs); IMFSample_Release(sample); }

1 0

Nikolay Sivov : msxml3/tests: Remove traces.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 007df5deed60fc16689d9480e75fecaccdeb1d37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=007df5deed60fc16689d9480… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:47:48 2020 +0300 msxml3/tests: Remove traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ---- dlls/msxml3/tests/httpreq.c | 1 - 2 files changed, 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f45364058a..7f3b42d840 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13146,8 +13146,6 @@ static BOOL qi_list_contains_service(REFIID service, REFIID iid) static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID iid, void **ppv) { - trace("sp_QueryInterface: %s\n", wine_dbgstr_guid(iid)); - if (qi_count < ARRAY_SIZE(qi_list)) qi_list[qi_count++] = iid; else @@ -13177,8 +13175,6 @@ static ULONG WINAPI sp_Release(IServiceProvider *iface) static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, REFIID iid, void **ppv) { - trace("sp_QueryService: %s, %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(iid)); - if (IsEqualGUID(service, &SID_SContainerDispatch) || IsEqualGUID(service, &SID_SInternetHostSecurityManager)) { diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 8a2ed2c73a..74c302d5eb 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -235,7 +235,6 @@ static IHTMLElementCollection htmlecoll = { &TestHTMLECollectionVtbl }; /* test IHTMLDocument2 */ static HRESULT WINAPI htmldoc2_QueryInterface(IHTMLDocument2 *iface, REFIID riid, void **ppvObject) { - trace("\n"); *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Zebediah Figura : quartz: Use calloc() in filter_graph_common_create().
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 02485967d6b8e66a5321e419bf9d92763fd370a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02485967d6b8e66a5321e419… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:15 2020 -0500 quartz: Use calloc() in filter_graph_common_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 110 ++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 63 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a23e35d6a1..8c20678989 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -510,7 +510,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) CloseHandle(This->message_thread_ret); } DeleteCriticalSection(&This->cs); - CoTaskMemFree(This); + free(This); InterlockedDecrement(&object_locks); } @@ -5377,80 +5377,64 @@ static const IUnknownVtbl IInner_VTable = static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL threaded) { - IFilterGraphImpl *fimpl; + IFilterGraphImpl *object; HRESULT hr; *out = NULL; - fimpl = CoTaskMemAlloc(sizeof(*fimpl)); - fimpl->defaultclock = TRUE; - fimpl->IUnknown_inner.lpVtbl = &IInner_VTable; - fimpl->IFilterGraph2_iface.lpVtbl = &IFilterGraph2_VTable; - fimpl->IMediaControl_iface.lpVtbl = &IMediaControl_VTable; - fimpl->IMediaSeeking_iface.lpVtbl = &IMediaSeeking_VTable; - fimpl->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable; - fimpl->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable; - fimpl->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; - fimpl->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; - fimpl->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; - fimpl->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; - fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; - fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; - fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; - fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; - fimpl->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; - fimpl->ref = 1; - list_init(&fimpl->filters); - fimpl->name_index = 1; - fimpl->refClock = NULL; - fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); - fimpl->HandleEcComplete = TRUE; - fimpl->HandleEcRepaint = TRUE; - fimpl->HandleEcClockChanged = TRUE; - fimpl->notif.hWnd = 0; - fimpl->notif.disabled = FALSE; - fimpl->nRenderers = 0; - fimpl->EcCompleteCount = 0; - fimpl->refClockProvider = NULL; - fimpl->state = State_Stopped; - fimpl->pSite = NULL; - EventsQueue_Init(&fimpl->evqueue); - InitializeCriticalSection(&fimpl->cs); - fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); - fimpl->nItfCacheEntries = 0; - memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); - fimpl->stream_start = fimpl->stream_elapsed = 0; - fimpl->punkFilterMapper2 = NULL; - fimpl->version = 0; - fimpl->current_pos = 0; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - if (threaded) + object->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable; + object->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable; + object->IFilterGraph2_iface.lpVtbl = &IFilterGraph2_VTable; + object->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; + object->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; + object->IMediaControl_iface.lpVtbl = &IMediaControl_VTable; + object->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; + object->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; + object->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; + object->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; + object->IMediaSeeking_iface.lpVtbl = &IMediaSeeking_VTable; + object->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; + object->IUnknown_inner.lpVtbl = &IInner_VTable; + object->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; + object->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; + object->ref = 1; + object->outer_unk = outer ? outer : &object->IUnknown_inner; + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, object->outer_unk, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&object->punkFilterMapper2))) { - fimpl->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); - fimpl->message_thread = CreateThread(NULL, 0, message_thread_run, fimpl, 0, &fimpl->message_thread_id); - WaitForSingleObject(fimpl->message_thread_ret, INFINITE); + ERR("Failed to create filter mapper, hr %#x.\n", hr); + free(object); + return hr; } - else - fimpl->message_thread = NULL; - fimpl->outer_unk = outer ? outer : &fimpl->IUnknown_inner; + InitializeCriticalSection(&object->cs); + object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); - /* create Filtermapper aggregated. */ - hr = CoCreateInstance(&CLSID_FilterMapper2, fimpl->outer_unk, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&fimpl->punkFilterMapper2); + object->defaultclock = TRUE; + EventsQueue_Init(&object->evqueue); + list_init(&object->filters); + object->HandleEcClockChanged = TRUE; + object->HandleEcComplete = TRUE; + object->HandleEcRepaint = TRUE; + object->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); + object->name_index = 1; + object->timeformatseek = TIME_FORMAT_MEDIA_TIME; - if (FAILED(hr)) { - ERR("Unable to create filter mapper (%x)\n", hr); - if (fimpl->punkFilterMapper2) IUnknown_Release(fimpl->punkFilterMapper2); - CloseHandle(fimpl->hEventCompletion); - EventsQueue_Destroy(&fimpl->evqueue); - fimpl->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&fimpl->cs); - CoTaskMemFree(fimpl); - return hr; + if (threaded) + { + object->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); + object->message_thread = CreateThread(NULL, 0, message_thread_run, object, 0, &object->message_thread_id); + WaitForSingleObject(object->message_thread_ret, INFINITE); } + else + object->message_thread = NULL; - *out = &fimpl->IUnknown_inner; + TRACE("Created %sthreaded filter graph %p.\n", threaded ? "" : "non-", object); + *out = &object->IUnknown_inner; return S_OK; }

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_descriptor_range structure to vkd3d_shader_descriptor_range.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: vkd3d Branch: master Commit: de76e7c0b58d31284ce00771fa3332e7c4effcc2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=de76e7c0b58d31284ce0077… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:52 2020 +0430 vkd3d-shader: Rename the vkd3d_descriptor_range structure to vkd3d_shader_descriptor_range. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cc61dc5..d7711b0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -428,7 +428,7 @@ enum vkd3d_shader_descriptor_range_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE), }; -struct vkd3d_descriptor_range +struct vkd3d_shader_descriptor_range { enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; @@ -440,7 +440,7 @@ struct vkd3d_descriptor_range struct vkd3d_root_descriptor_table { unsigned int descriptor_range_count; - const struct vkd3d_descriptor_range *descriptor_ranges; + const struct vkd3d_shader_descriptor_range *descriptor_ranges; }; struct vkd3d_root_constants diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6035aee..7692880 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2223,7 +2223,7 @@ struct root_signature_parser_context }; static int shader_parse_descriptor_ranges(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_descriptor_range *ranges) + unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range *ranges) { const char *ptr; unsigned int i; @@ -2302,7 +2302,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context static int shader_parse_descriptor_table(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor_table *table) { - struct vkd3d_descriptor_range *ranges; + struct vkd3d_shader_descriptor_range *ranges; unsigned int count; const char *ptr; @@ -2809,7 +2809,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, const struct vkd3d_root_descriptor_table *table) { - const struct vkd3d_descriptor_range *ranges = table->descriptor_ranges; + const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i; for (i = 0; i < table->descriptor_range_count; ++i) @@ -3044,7 +3044,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_ta for (i = 0; i < descriptor_table->descriptor_range_count; ++i) { - const struct vkd3d_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; + const struct vkd3d_shader_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV @@ -3201,7 +3201,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { const struct vkd3d_descriptor_range1 *ranges1; - struct vkd3d_descriptor_range *ranges; + struct vkd3d_shader_descriptor_range *ranges; unsigned int i, j; int ret; @@ -3319,7 +3319,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, const struct vkd3d_root_parameter *src, unsigned int count) { - const struct vkd3d_descriptor_range *ranges; + const struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_descriptor_range1 *ranges1; unsigned int i, j; int ret;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_descriptor_range1 structure to vkd3d_shader_descriptor_range1.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: vkd3d Branch: master Commit: 6b0eb4671657ffb8a7c07d97d3906c26ea5e15cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b0eb4671657ffb8a7c07d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:53 2020 +0430 vkd3d-shader: Rename the vkd3d_descriptor_range1 structure to vkd3d_shader_descriptor_range1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d7711b0..ab670ec 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -522,7 +522,7 @@ enum vkd3d_shader_descriptor_range_flags VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS), }; -struct vkd3d_descriptor_range1 +struct vkd3d_shader_descriptor_range1 { enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; @@ -535,7 +535,7 @@ struct vkd3d_descriptor_range1 struct vkd3d_root_descriptor_table1 { unsigned int descriptor_range_count; - const struct vkd3d_descriptor_range1 *descriptor_ranges; + const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; }; struct vkd3d_root_descriptor1 diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7692880..76a6a47 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2253,7 +2253,7 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * return VKD3D_OK; } -static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) +static void shader_validate_descriptor_range1(const struct vkd3d_shader_descriptor_range1 *range) { unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE @@ -2266,7 +2266,7 @@ static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_rang } static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) + unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range1 *ranges) { const char *ptr; unsigned int i; @@ -2329,7 +2329,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor_table1 *table) { - struct vkd3d_descriptor_range1 *ranges; + struct vkd3d_shader_descriptor_range1 *ranges; unsigned int count; const char *ptr; @@ -2832,7 +2832,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, const struct vkd3d_root_descriptor_table1 *table) { - const struct vkd3d_descriptor_range1 *ranges = table->descriptor_ranges; + const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; unsigned int i; for (i = 0; i < table->descriptor_range_count; ++i) @@ -3080,7 +3080,7 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_ta for (i = 0; i < descriptor_table->descriptor_range_count; ++i) { - const struct vkd3d_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; + const struct vkd3d_shader_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV @@ -3200,7 +3200,7 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { - const struct vkd3d_descriptor_range1 *ranges1; + const struct vkd3d_shader_descriptor_range1 *ranges1; struct vkd3d_shader_descriptor_range *ranges; unsigned int i, j; int ret; @@ -3320,7 +3320,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, const struct vkd3d_root_parameter *src, unsigned int count) { const struct vkd3d_shader_descriptor_range *ranges; - struct vkd3d_descriptor_range1 *ranges1; + struct vkd3d_shader_descriptor_range1 *ranges1; unsigned int i, j; int ret;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor_flags enumeration to vkd3d_shader_root_descriptor_flags.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: vkd3d Branch: master Commit: de252f9b144de53a67577fe1fb42a7a0c770bed3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=de252f9b144de53a67577fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:54 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor_flags enumeration to vkd3d_shader_root_descriptor_flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/dxbc.c | 10 +++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ab670ec..b5bf13a 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -503,12 +503,14 @@ struct vkd3d_root_signature_desc }; /* root signature 1.1 */ -enum vkd3d_root_descriptor_flags +enum vkd3d_shader_root_descriptor_flags { - VKD3D_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAGS), }; enum vkd3d_shader_descriptor_range_flags @@ -542,7 +544,7 @@ struct vkd3d_root_descriptor1 { unsigned int shader_register; unsigned int register_space; - enum vkd3d_root_descriptor_flags flags; + enum vkd3d_shader_root_descriptor_flags flags; }; struct vkd3d_root_parameter1 diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 76a6a47..cad2556 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2211,7 +2211,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, } /* root signatures */ -#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE +#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) @@ -2398,10 +2398,10 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) { - unsigned int unknown_flags = descriptor->flags & ~(VKD3D_ROOT_DESCRIPTOR_FLAG_NONE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); + unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); if (unknown_flags) FIXME("Unknown root descriptor flags %#x.\n", unknown_flags);

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_parameter_type enumeration to vkd3d_shader_root_parameter_type.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: vkd3d Branch: master Commit: 8b397eec8890daf66b86f5c1e4445847db332e33 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b397eec8890daf66b86f5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:55 2020 +0430 vkd3d-shader: Rename the vkd3d_root_parameter_type enumeration to vkd3d_shader_root_parameter_type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 18 +++++------ libs/vkd3d-shader/dxbc.c | 60 +++++++++++++++++------------------ libs/vkd3d-shader/vkd3d_shader_main.c | 4 +-- 3 files changed, 41 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8b397eec8890daf66b8…

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_descriptor_range_flags enumeration to vkd3d_shader_descriptor_range_flags.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: vkd3d Branch: master Commit: 7c2120124bcce403a7800e9e198d1fb01c904051 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7c2120124bcce403a7800e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:51 2020 +0430 vkd3d-shader: Rename the vkd3d_descriptor_range_flags enumeration to vkd3d_shader_descriptor_range_flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 16 +++++++++------- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 50c64ca..cc61dc5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -511,13 +511,15 @@ enum vkd3d_root_descriptor_flags VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, }; -enum vkd3d_descriptor_range_flags +enum vkd3d_shader_descriptor_range_flags { - VKD3D_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, - VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, - VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, - VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, - VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS), }; struct vkd3d_descriptor_range1 @@ -526,7 +528,7 @@ struct vkd3d_descriptor_range1 unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; - enum vkd3d_descriptor_range_flags flags; + enum vkd3d_shader_descriptor_range_flags flags; unsigned int descriptor_table_offset; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a0f03cf..6035aee 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2214,7 +2214,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, #define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ - (VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) + (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) struct root_signature_parser_context { @@ -2255,11 +2255,11 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) { - unsigned int unknown_flags = range->flags & ~(VKD3D_DESCRIPTOR_RANGE_FLAG_NONE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); + unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); if (unknown_flags) FIXME("Unknown descriptor range flags %#x.\n", unknown_flags);

1 0