wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zebediah Figura : quartz/vmr9: Signal state change completion only after PresentImage() has been called.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: d3ef27f7561a8fa47c675c8d537ce153ba3bebd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ef27f7561a8fa47c675c8d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 17:49:08 2020 -0500 quartz/vmr9: Signal state change completion only after PresentImage() has been called. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 5 +++++ dlls/quartz/tests/vmr9.c | 5 +++++ dlls/quartz/videorenderer.c | 1 + dlls/quartz/vmr9.c | 1 + dlls/strmbase/renderer.c | 2 -- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index e703ea2430..c64d5e2987 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -38,6 +38,11 @@ static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_rendere static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { + struct null_renderer *filter = impl_from_strmbase_renderer(iface); + + if (filter->renderer.filter.state == State_Paused) + SetEvent(filter->renderer.state_event); + return S_OK; } diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index e630deb8d7..a2fd5b7686 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2943,6 +2943,11 @@ static void test_renderless_present(IFilterGraph2 *graph, IMemInputPin *input) thread = send_frame(input); hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Atelier Sophie uses the VMR in renderless mode, calls + * IMediaControl::Run() from a stopped state and expects that + * IMediaControl::GetState() returns S_OK only after PresentImage() has + * been called. */ + ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index eb6accf2d3..2ad479a630 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -111,6 +111,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->current_sample = pSample; + SetEvent(filter->renderer.state_event); LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); EnterCriticalSection(&filter->renderer.csRenderLock); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a3f5501106..00cd6bbce8 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -315,6 +315,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi if (filter->renderer.filter.state == State_Paused) { + SetEvent(filter->renderer.state_event); LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); EnterCriticalSection(&filter->renderer.csRenderLock); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b6d552b3b0..dde56b7a34 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -193,8 +193,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp } EnterCriticalSection(&filter->csRenderLock); - if (filter->filter.state == State_Paused) - SetEvent(filter->state_event); if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) {

1 0

Zebediah Figura : strmbase: Wait for presentation time after rendering the first sample.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 8803a81b33e0f17833226464b47ed13276b0a70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8803a81b33e0f17833226464… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 17:49:07 2020 -0500 strmbase: Wait for presentation time after rendering the first sample. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index bc2d0551fe..b6d552b3b0 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -170,13 +170,16 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp { struct strmbase_renderer *filter = impl_from_IPin(&pin->pin.IPin_iface); REFERENCE_TIME start, stop; + BOOL need_wait = FALSE; + FILTER_STATE state; + HRESULT hr = S_OK; AM_MEDIA_TYPE *mt; - HRESULT hr; if (filter->eos || filter->sink.flushing) return S_FALSE; - if (filter->filter.state == State_Stopped) + state = filter->filter.state; + if (state == State_Stopped) return VFW_E_WRONG_STATE; if (IMediaSample_GetMediaType(sample, &mt) == S_OK) @@ -194,12 +197,25 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp SetEvent(filter->state_event); if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) + { + strmbase_passthrough_update_time(&filter->passthrough, start); + need_wait = TRUE; + } + else + start = stop = -1; + + if (state == State_Paused) + { + QualityControlRender_BeginRender(&filter->qc, start, stop); + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + QualityControlRender_EndRender(&filter->qc); + } + + if (need_wait) { REFERENCE_TIME now; DWORD_PTR cookie; - strmbase_passthrough_update_time(&filter->passthrough, start); - IReferenceClock_GetTime(filter->filter.clock, &now); if (now - filter->stream_start - start <= -10000) @@ -224,12 +240,14 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp EnterCriticalSection(&filter->csRenderLock); } } - else - start = stop = -1; - QualityControlRender_BeginRender(&filter->qc, start, stop); - hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); - QualityControlRender_EndRender(&filter->qc); + if (state == State_Running) + { + QualityControlRender_BeginRender(&filter->qc, start, stop); + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + QualityControlRender_EndRender(&filter->qc); + } + QualityControlRender_DoQOS(&filter->qc); LeaveCriticalSection(&filter->csRenderLock);

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_Receive().
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: e4ebf09f4f5e1692b8e67a19c0c09fde59fc19d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4ebf09f4f5e1692b8e67a19… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 17:49:06 2020 -0500 strmbase: Get rid of BaseRendererImpl_Receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 142 ++++++++++++++++++++++------------------------- include/wine/strmbase.h | 2 - 2 files changed, 66 insertions(+), 78 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1f0a747a2c..bc2d0551fe 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -169,7 +169,72 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSample *sample) { struct strmbase_renderer *filter = impl_from_IPin(&pin->pin.IPin_iface); - return BaseRendererImpl_Receive(filter, sample); + REFERENCE_TIME start, stop; + AM_MEDIA_TYPE *mt; + HRESULT hr; + + if (filter->eos || filter->sink.flushing) + return S_FALSE; + + if (filter->filter.state == State_Stopped) + return VFW_E_WRONG_STATE; + + if (IMediaSample_GetMediaType(sample, &mt) == S_OK) + { + TRACE("Format change.\n"); + strmbase_dump_media_type(mt); + + if (FAILED(filter->pFuncsTable->pfnCheckMediaType(filter, mt))) + return VFW_E_TYPE_NOT_ACCEPTED; + DeleteMediaType(mt); + } + + EnterCriticalSection(&filter->csRenderLock); + if (filter->filter.state == State_Paused) + SetEvent(filter->state_event); + + if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) + { + REFERENCE_TIME now; + DWORD_PTR cookie; + + strmbase_passthrough_update_time(&filter->passthrough, start); + + IReferenceClock_GetTime(filter->filter.clock, &now); + + if (now - filter->stream_start - start <= -10000) + { + HANDLE handles[2] = {filter->advise_event, filter->flush_event}; + DWORD ret; + + IReferenceClock_AdviseTime(filter->filter.clock, filter->stream_start, + start, (HEVENT)filter->advise_event, &cookie); + + LeaveCriticalSection(&filter->csRenderLock); + + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + IReferenceClock_Unadvise(filter->filter.clock, cookie); + + if (ret == 1) + { + TRACE("Flush signaled; discarding current sample.\n"); + return S_OK; + } + + EnterCriticalSection(&filter->csRenderLock); + } + } + else + start = stop = -1; + + QualityControlRender_BeginRender(&filter->qc, start, stop); + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + QualityControlRender_EndRender(&filter->qc); + QualityControlRender_DoQOS(&filter->qc); + + LeaveCriticalSection(&filter->csRenderLock); + + return hr; } static HRESULT sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) @@ -267,81 +332,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) strmbase_filter_cleanup(&filter->filter); } -HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSample *pSample) -{ - REFERENCE_TIME start, stop; - AM_MEDIA_TYPE *pmt; - HRESULT hr; - - TRACE("(%p)->%p\n", This, pSample); - - if (This->eos || This->sink.flushing) - return S_FALSE; - - if (This->filter.state == State_Stopped) - return VFW_E_WRONG_STATE; - - if (IMediaSample_GetMediaType(pSample, &pmt) == S_OK) - { - TRACE("Format change.\n"); - strmbase_dump_media_type(pmt); - - if (FAILED(This->pFuncsTable->pfnCheckMediaType(This, pmt))) - { - return VFW_E_TYPE_NOT_ACCEPTED; - } - DeleteMediaType(pmt); - } - - EnterCriticalSection(&This->csRenderLock); - if (This->filter.state == State_Paused) - SetEvent(This->state_event); - - /* Wait for render Time */ - if (This->filter.clock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) - { - REFERENCE_TIME now; - DWORD_PTR cookie; - - strmbase_passthrough_update_time(&This->passthrough, start); - - IReferenceClock_GetTime(This->filter.clock, &now); - - if (now - This->stream_start - start <= -10000) - { - HANDLE handles[2] = {This->advise_event, This->flush_event}; - DWORD ret; - - IReferenceClock_AdviseTime(This->filter.clock, This->stream_start, - start, (HEVENT)This->advise_event, &cookie); - - LeaveCriticalSection(&This->csRenderLock); - - ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); - IReferenceClock_Unadvise(This->filter.clock, cookie); - - if (ret == 1) - { - TRACE("Flush signaled, discarding current sample.\n"); - return S_OK; - } - - EnterCriticalSection(&This->csRenderLock); - } - } - else - start = stop = -1; - - QualityControlRender_BeginRender(&This->qc, start, stop); - hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); - QualityControlRender_EndRender(&This->qc); - QualityControlRender_DoQOS(&This->qc); - - LeaveCriticalSection(&This->csRenderLock); - - return hr; -} - void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9e0d4e7d47..24bb97702b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -334,8 +334,6 @@ struct strmbase_renderer_ops HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); }; -HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); - void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops); void strmbase_renderer_cleanup(struct strmbase_renderer *filter);

1 0

Serge Gautherie : winapi_test: Add a blank line between common and specific headers.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: db11d6dcca89a6d10ad66976af8e84a633aff88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db11d6dcca89a6d10ad66976… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:35:19 2020 +0200 winapi_test: Add a blank line between common and specific headers. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index c53ea5da23..e6a09923af 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -11,6 +11,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + wingdi.h %include @@ -472,6 +473,7 @@ basetsd.h winnt.h windef.h winbase.h + timezoneapi.h %include @@ -1053,6 +1055,7 @@ winnt.h windef.h wtypes.h guiddef.h + shellapi.h shtypes.h shlobj.h @@ -1265,6 +1268,7 @@ Unit tests for data structure packing winnt.h windef.h guiddef.h + urlmon.h %include @@ -1322,6 +1326,7 @@ basetsd.h winnt.h windef.h winbase.h + wingdi.h winuser.h @@ -1737,6 +1742,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + mmsystem.h digitalv.h

1 0

Serge Gautherie : winapi_test: Remove useless winbase.h for wininet test.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 0c3fd2238e306b50c3672124a563e9aee83170bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3fd2238e306b50c3672124… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:34:57 2020 +0200 winapi_test: Remove useless winbase.h for wininet test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 2e344cd1eb..c53ea5da23 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1595,7 +1595,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h -winbase.h + wininet.h %include

1 0

Serge Gautherie : winapi_test: Remove useless common headers for shlwapi test.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: d67b1fe51c6cb397709c1f147b5c3c121eedc589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d67b1fe51c6cb397709c1f14… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:34:35 2020 +0200 winapi_test: Remove useless common headers for shlwapi test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 7741fe30f3..2e344cd1eb 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1229,10 +1229,8 @@ Unit tests for data structure packing %header -basetsd.h winnt.h -windef.h -wtypes.h + shlwapi.h %include

1 0

Serge Gautherie : winapi_test: Add common headers for rpcrt4 test.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 246e9e4358d23c434aa4564df7c8616b28c9de49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=246e9e4358d23c434aa4564d… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:34:13 2020 +0200 winapi_test: Add common headers for rpcrt4 test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index a0265af422..7741fe30f3 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -928,6 +928,10 @@ Unit tests for data structure packing %header +basetsd.h +winnt.h +windef.h + rpc.h rpcdce.h rpcdcep.h

1 0

Serge Gautherie : winapi_test: Fix a verifying loop on headers, which never finds any type name.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 181a114d44eb7003cdcebc83936bc828855e92ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=181a114d44eb7003cdcebc83… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Jul 17 06:14:44 2020 +0200 winapi_test: Fix a verifying loop on headers, which never finds any type name. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 8b7596f040..1061dd8157 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -871,8 +871,7 @@ foreach my $test_dir (@test_dirs) { foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { $output->prefix("$header: "); - $header =~ s%^include/%%; - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; + my $type_name2type = $file2types{$pointer_size}{$header}; foreach my $_type_name (sort(keys(%$type_name2type))) { my $type_name = $_type_name; @@ -886,10 +885,10 @@ $output->prefix("$winapi_dir/tests.dat: "); foreach my $type_name (sort(keys(%type_names_used))) { my $found = 0; foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; - if (exists($type_name2type{$type_name})) { - $found = 1; - } + if (exists($file2types{$pointer_size}{$header}{$type_name})) { + $found = 1; + last; + } } if (!$found) {

1 0

Serge Gautherie : winapi_test: Remove leftover PUUID_VECTOR from tests.dat.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 5c427685fbab7ac274260f8807c056519197281c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c427685fbab7ac274260f88… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Jul 17 05:59:27 2020 +0200 winapi_test: Remove leftover PUUID_VECTOR from tests.dat. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 57a65e1b22..a0265af422 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -999,7 +999,6 @@ PRPC_STUB_FUNCTION PRPC_SYNTAX_IDENTIFIER PSCONTEXT_QUEUE PXMIT_ROUTINE_QUINTUPLE -PUUID_VECTOR RPC_AUTH_IDENTITY_HANDLE RPC_AUTH_KEY_RETRIEVAL_FN RPC_AUTHZ_HANDLE

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_signature_desc structure to vkd3d_shader_root_signature_desc.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: vkd3d Branch: master Commit: 0f0f2b331e9a1c9ad4f2fd666cfc8fc2ecc27fba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f0f2b331e9a1c9ad4f2fd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 15:38:03 2020 +0430 vkd3d-shader: Rename the vkd3d_root_signature_desc structure to vkd3d_shader_root_signature_desc. 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 | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 24e2f24..a5a3498 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -493,7 +493,7 @@ enum vkd3d_shader_root_signature_flags VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_SIGNATURE_FLAGS), }; -struct vkd3d_root_signature_desc +struct vkd3d_shader_root_signature_desc { unsigned int parameter_count; const struct vkd3d_shader_root_parameter *parameters; @@ -581,7 +581,7 @@ struct vkd3d_versioned_root_signature_desc enum vkd3d_shader_root_signature_version version; union { - struct vkd3d_root_signature_desc v_1_0; + struct vkd3d_shader_root_signature_desc v_1_0; struct vkd3d_root_signature_desc1 v_1_1; } u; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e871963..1be733a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2563,7 +2563,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co static int shader_parse_root_signature(const char *data, unsigned int data_size, struct vkd3d_versioned_root_signature_desc *desc) { - struct vkd3d_root_signature_desc *v_1_0 = &desc->u.v_1_0; + struct vkd3d_shader_root_signature_desc *v_1_0 = &desc->u.v_1_0; struct root_signature_parser_context context; unsigned int count, offset, version; const char *ptr = data; @@ -3263,7 +3263,7 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_ const struct vkd3d_versioned_root_signature_desc *src) { const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; - struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_shader_root_signature_desc *dst_desc = &dst->u.v_1_0; struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter *parameters = NULL; int ret; @@ -3383,7 +3383,7 @@ fail: static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_desc *dst, const struct vkd3d_versioned_root_signature_desc *src) { - const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0; + const struct vkd3d_shader_root_signature_desc *src_desc = &src->u.v_1_0; struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter1 *parameters = NULL; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ff02eca..80dbda1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -478,7 +478,7 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) vkd3d_free((void *)shader_code->code); } -static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature) +static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_shader_root_signature_desc *root_signature) { unsigned int i; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 964c6f5..f9a6aa4 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -92,7 +92,7 @@ struct d3d12_root_signature_deserializer } desc; }; -STATIC_ASSERT(sizeof(D3D12_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_root_signature_desc)); +STATIC_ASSERT(sizeof(D3D12_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_shader_root_signature_desc)); static struct d3d12_root_signature_deserializer *impl_from_ID3D12RootSignatureDeserializer( ID3D12RootSignatureDeserializer *iface) @@ -564,7 +564,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, *error_blob = NULL; vkd3d_desc.version = VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0; - vkd3d_desc.u.v_1_0 = *(const struct vkd3d_root_signature_desc *)desc; + vkd3d_desc.u.v_1_0 = *(const struct vkd3d_shader_root_signature_desc *)desc; if ((ret = vkd3d_shader_serialize_root_signature(&vkd3d_desc, &dxbc)) < 0) { WARN("Failed to serialize root signature, vkd3d result %d.\n", ret);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
83
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 July 2020