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

Zebediah Figura : quartz/tests: Add some tests for end-of-stream notifications on the VMR9.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: b66d0ed6a3e367839e23d59ff68aedaba2c1a223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b66d0ed6a3e367839e23d59f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:46 2020 -0500 quartz/tests: Add some tests for end-of-stream notifications on the VMR9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 0e02de6452..cb04d0b4aa 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1228,6 +1228,145 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control ok(hr == S_OK, "Got hr %#x.\n", hr); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) +{ + IMediaEvent *eventsrc; + OAFilterState state; + HRESULT hr; + BOOL ret; + + IMediaControl_QueryInterface(control, &IID_IMediaEvent, (void **)&eventsrc); + + commit_allocator(input); + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* We do not receive an EC_COMPLETE notification until the last sample is + * done rendering. */ + + commit_allocator(input); + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ret = check_ec_complete(eventsrc, 1600); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS while flushing. */ + + commit_allocator(input); + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS and then flushing or stopping. */ + + commit_allocator(input); + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + IMediaEvent_Release(eventsrc); +} + static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *control) { OAFilterState state; @@ -1521,6 +1660,7 @@ static void test_connect_pin(void) test_filter_state(input, control); test_flushing(pin, input, control); + test_eos(pin, input, control); test_sample_time(pin, input, control); test_current_image(filter, input, control, &vih.bmiHeader);

1 0

Zebediah Figura : quartz/tests: Test current position caching.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 9733b821e050ab0f9867c47a50f8ae9ddc2f1d0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9733b821e050ab0f9867c47a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:47 2020 -0500 quartz/tests: Test current position caching. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 186 +++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 3722a6f9dd..90d1e01932 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -489,6 +489,7 @@ struct testfilter { struct strmbase_filter filter; struct strmbase_source source; + IMediaSeeking IMediaSeeking_iface; }; static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) @@ -517,6 +518,19 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; +static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_BaseFilter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &filter->IMediaSeeking_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -525,15 +539,172 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { + .base.pin_query_interface = testsource_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; +static struct testfilter *impl_from_IMediaSeeking(IMediaSeeking *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IMediaSeeking_iface); +} + +static HRESULT WINAPI testseek_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI testseek_AddRef(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI testseek_Release(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI testseek_GetCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_CheckCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsFormatSupported(IMediaSeeking *iface, const GUID *format) +{ + if (winetest_debug > 1) trace("IsFormatSupported()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_QueryPreferredFormat(IMediaSeeking *iface, GUID *format) +{ + if (winetest_debug > 1) trace("%p->QueryPreferredFormat()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetTimeFormat(IMediaSeeking *iface, GUID *format) +{ + if (winetest_debug > 1) trace("%p->GetTimeFormat()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsUsingTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetDuration(IMediaSeeking *iface, LONGLONG *duration) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) +{ + if (winetest_debug > 1) trace("GetStopPosition()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) +{ + if (winetest_debug > 1) trace("GetCurrentPosition()\n"); + return 0xdeadbeef; +} + +static HRESULT WINAPI testseek_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *target, + const GUID *target_format, LONGLONG source, const GUID *source_format) +{ + if (winetest_debug > 1) trace("ConvertTimeFormat()\n"); + ok(IsEqualGUID(source_format, &TIME_FORMAT_MEDIA_TIME), + "Got source format %s.\n", debugstr_guid(source_format)); + ok(!target_format, "Got target format %s.\n", debugstr_guid(target_format)); + *target = source; + return S_OK; +} + +static HRESULT WINAPI testseek_SetPositions(IMediaSeeking *iface, LONGLONG *current, + DWORD current_flags, LONGLONG *stop, DWORD stop_flags ) +{ + if (winetest_debug > 1) trace("SetPositions()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPositions(IMediaSeeking *iface, LONGLONG *current, LONGLONG *stop) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetAvailable(IMediaSeeking *iface, LONGLONG *earliest, LONGLONG *latest) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetRate(IMediaSeeking *iface, double rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetRate(IMediaSeeking *iface, double *rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPreroll(IMediaSeeking *iface, LONGLONG *preroll) +{ + if (winetest_debug > 1) trace("%p->GetPreroll()\n", iface); + return E_NOTIMPL; +} + +static const IMediaSeekingVtbl testseek_vtbl = +{ + testseek_QueryInterface, + testseek_AddRef, + testseek_Release, + testseek_GetCapabilities, + testseek_CheckCapabilities, + testseek_IsFormatSupported, + testseek_QueryPreferredFormat, + testseek_GetTimeFormat, + testseek_IsUsingTimeFormat, + testseek_SetTimeFormat, + testseek_GetDuration, + testseek_GetStopPosition, + testseek_GetCurrentPosition, + testseek_ConvertTimeFormat, + testseek_SetPositions, + testseek_GetPositions, + testseek_GetAvailable, + testseek_SetRate, + testseek_GetRate, + testseek_GetPreroll, +}; + static void testfilter_init(struct testfilter *filter) { static const GUID clsid = {0xabacab}; strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); + filter->IMediaSeeking_iface.lpVtbl = &testseek_vtbl; } static void test_allocator(IMemInputPin *input) @@ -852,14 +1023,17 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } -static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) { IMediaControl *control; + IMediaSeeking *seeking; + REFERENCE_TIME time; OAFilterState state; HANDLE thread; HRESULT hr; IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IBaseFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -867,11 +1041,18 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *grap hr = IMediaControl_GetState(control, 0, &state); ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); + ok(hr == 0xdeadbeef, "Got hr %#x.\n", hr); + thread = send_frame_time(input, 1, 0x11); /* dark blue */ hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 10000000, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); @@ -923,6 +1104,7 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *grap hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSeeking_Release(seeking); IMediaControl_Release(control); } @@ -1241,7 +1423,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); - test_sample_time(pin, input, graph); + test_sample_time(filter, pin, input, graph); test_eos(pin, input, graph); test_current_image(filter, input, graph, &vih.bmiHeader);

1 0

Piotr Caban : msvcrt: Avoid depending on signed variable overflow in parse_double.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 65642f4bb7d9c8bfb9f16f6f59d4c06271431f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65642f4bb7d9c8bfb9f16f6f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 1 11:58:11 2020 +0200 msvcrt: Avoid depending on signed variable overflow in parse_double. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b2bc3e9c2e..31ed4e2181 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -549,8 +549,10 @@ static double strtod16(MSVCRT_wchar_t get(void *ctx), void unget(void *ctx), } if(nch>='0' && nch<='9') { while(nch>='0' && nch<='9') { - if(e>INT_MAX/10 || (e=e*10+nch-'0')<0) + if(e>INT_MAX/10 || e*10>INT_MAX-nch+'0') e = INT_MAX; + else + e = e*10+nch-'0'; nch = get(ctx); } if((nch!=MSVCRT_WEOF) && (nch < '0' || nch > '9')) unget(ctx); @@ -827,8 +829,10 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(nch>='0' && nch<='9') { while(nch>='0' && nch<='9') { - if(e>INT_MAX/10 || (e=e*10+nch-'0')<0) + if(e>INT_MAX/10 || e*10>INT_MAX-nch+'0') e = INT_MAX; + else + e = e*10+nch-'0'; nch = get(ctx); } if(nch != MSVCRT_WEOF) unget(ctx);

1 0

Andrew Eikum : setupapi: Quiet down missing driver debug message.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 20a283e7e20a456ccb34730013e837571c884448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a283e7e20a456ccb347300… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 30 15:39:23 2020 -0500 setupapi: Quiet down missing driver debug message. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5bd2b88a02..fca60402a5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4739,7 +4739,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device if (!device->driver_count) { - ERR("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); + WARN("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); SetLastError(ERROR_NO_COMPAT_DRIVERS); return FALSE; }

1 0

Andrew Eikum : ntoskrnl: Quiet down failed class installer debug message.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 7ac5b7889f9e3e54941d1b4ad28ad488503b9428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac5b7889f9e3e54941d1b4a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 30 15:39:30 2020 -0500 ntoskrnl: Quiet down failed class installer debug message. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 75310f7b35..9e4c2c1416 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -298,7 +298,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN { if (!SetupDiCallClassInstaller(dif_list[i], set, sp_device) && GetLastError() != ERROR_DI_DO_DEFAULT) { - ERR("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); + WARN("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); return FALSE; } }

1 0

Henri Verbeet : wined3d: Create Vulkan samplers for samplers.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 385d06daa5f3ebba64b6958de26dc2a05c360c70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=385d06daa5f3ebba64b6958d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:20 2020 +0430 wined3d: Create Vulkan samplers for samplers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 23 +++++++-- dlls/wined3d/context_vk.c | 59 +++++++++++++++++++++ dlls/wined3d/sampler.c | 115 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 20 ++++++- 4 files changed, 210 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=385d06daa5f3ebba64b6…

1 0

Henri Verbeet : wined3d: Add a swizzle to the Vulkan format information for WINED3DFMT_A8_UNORM.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: a3874561cd68c8fec22c05a024ed23cbc17ddcb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3874561cd68c8fec22c05a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:21 2020 +0430 wined3d: Add a swizzle to the Vulkan format information for WINED3DFMT_A8_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 17 +++++++++++++---- dlls/wined3d/utils.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b8b90c95c5..49373eb58a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4509,6 +4509,7 @@ const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wi const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; VkImageViewCreateInfo create_info; + struct color_fixup_desc fixup; uint32_t flags = 0; VkResult vr; @@ -4529,10 +4530,18 @@ const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wi create_info.image = texture_vk->vk_image; create_info.viewType = vk_image_view_type_from_wined3d(texture_vk->t.resource.type, flags); create_info.format = format_vk->vk_format; - create_info.components.r = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.g = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.b = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; + fixup = format_vk->f.color_fixup; + if (is_identity_fixup(fixup) || !can_use_texture_swizzle(context_vk->c.d3d_info, &format_vk->f)) + { + create_info.components.r = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.g = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.b = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; + } + else + { + wined3d_vk_swizzle_from_color_fixup(&create_info.components, fixup); + } create_info.subresourceRange.aspectMask = vk_aspect_mask_from_format(&format_vk->f); create_info.subresourceRange.baseMipLevel = 0; create_info.subresourceRange.levelCount = texture_vk->t.level_count; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2108eb65ba..04e9300ee6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4135,6 +4135,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, { enum wined3d_format_id id; VkFormat vk_format; + const char *fixup; } vulkan_formats[] = { @@ -4182,7 +4183,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_R8_UINT, VK_FORMAT_R8_UINT, }, {WINED3DFMT_R8_SNORM, VK_FORMAT_R8_SNORM, }, {WINED3DFMT_R8_SINT, VK_FORMAT_R8_SINT, }, - {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, }, + {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, "000X"}, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, @@ -4211,6 +4212,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, VkFormatProperties properties; VkImageUsageFlags vk_usage; unsigned int flags; + const char *fixup; unsigned int i; VkResult vr; @@ -4219,6 +4221,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, if (vulkan_formats[i].id == format->f.id) { vk_format = vulkan_formats[i].vk_format; + fixup = vulkan_formats[i].fixup; break; } } @@ -4229,7 +4232,10 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, } format->vk_format = vk_format; - format->f.color_fixup = COLOR_FIXUP_IDENTITY; + if (fixup) + format->f.color_fixup = create_color_fixup_desc_from_string(fixup); + else + format->f.color_fixup = COLOR_FIXUP_IDENTITY; VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties));

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: f0adc5c0b52853d34f964f10b82319743c68ba6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0adc5c0b52853d34f964f10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:22 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 04e9300ee6..222b3bf92c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4186,6 +4186,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, "000X"}, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, + {WINED3DFMT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, "XYZ1"}, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, },

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM_SRGB.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 5beefc63bac65e6cb255924eec4888c4d03d7e26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5beefc63bac65e6cb255924e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:23 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM_SRGB. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 222b3bf92c..e7f04cbdf2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4187,6 +4187,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, {WINED3DFMT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, "XYZ1"}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, "XYZ1"}, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, },

1 0

Henri Verbeet : wined3d: Submit the current command buffer in adapter_vk_flush_context().
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 8319d154cc27ebb335801a39023c39d764525ec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8319d154cc27ebb335801a39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:24 2020 +0430 wined3d: Submit the current command buffer in adapter_vk_flush_context(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 65850ab4cc..f06cf30f27 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1493,7 +1493,11 @@ static void adapter_vk_destroy_query(struct wined3d_query *query) static void adapter_vk_flush_context(struct wined3d_context *context) { - TRACE("context %p.\n", context); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + + TRACE("context_vk %p.\n", context_vk); + + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); } static void adapter_vk_draw_primitive(struct wined3d_device *device,

1 0