April 2019 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : uianimation: Add DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer stubs.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 10c51972e99f3a97b7e40ac28ec9c5cd55240c38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10c51972e99f3a97b7e40ac2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 1 23:37:19 2019 +0000 uianimation: Add DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 40 +++++++++++++++++++++++++++++++++++++++ dlls/uianimation/uianimation.spec | 8 ++++---- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 0fa9bfb..92d594f 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -23,6 +23,8 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" #include "uianimation.h" @@ -30,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(uianimation); +static HINSTANCE hinstance; + BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) { TRACE("(%p %d %p)\n", dll, reason, reserved); @@ -39,8 +43,44 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + hinstance = dll; DisableThreadLibraryCalls( dll ); break; } return TRUE; } + +/****************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) +{ + FIXME( "(%s %s %p)\n", debugstr_guid( clsid ), debugstr_guid( iid ), obj ); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow( void ) +{ + TRACE( "()\n" ); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer( void ) +{ + return __wine_register_resources( hinstance ); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer( void ) +{ + return __wine_unregister_resources( hinstance ); +} diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec index a43b12d..b16365d 100644 --- a/dlls/uianimation/uianimation.spec +++ b/dlls/uianimation/uianimation.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow() -@ stub DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer() -@ stub DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Alexandre Julliard : msvcp: Define _vsnprintf().
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 4f1f95b1b3e25d302c2a0c4118ca303c649cc9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1f95b1b3e25d302c2a0c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 16:47:01 2019 +0200 msvcp: Define _vsnprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 6 ++++++ dlls/vcruntime140/misc.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 7aef4cd..fbf4a79 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -136,6 +136,12 @@ int WINAPIV sprintf(char *buf, const char *fmt, ...) __ms_va_end(valist); return ret; } + +int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) +{ + return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, + buf, size, fmt, NULL, args ); +} #endif static void init_cxx_funcs(void) diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c index cc64175..028bde5 100644 --- a/dlls/vcruntime140/misc.c +++ b/dlls/vcruntime140/misc.c @@ -22,6 +22,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcruntime); +#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) +int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, + _locale_t locale, __ms_va_list valist); + int* CDECL __processing_throw(void); /********************************************************************* @@ -54,3 +58,9 @@ int __cdecl __uncaught_exceptions(void) { return *__processing_throw(); } + +int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) +{ + return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, + buf, size, fmt, NULL, args ); +}

1 0

Zebediah Figura : quartz/vmr9: Implement IVMRFilterConfig:: SetRenderingMode().
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: edf1e7696f36b650cddb76275d3a460c271a93ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=edf1e7696f36b650cddb7627… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:25 2019 -0500 quartz/vmr9: Implement IVMRFilterConfig::SetRenderingMode(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42372 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 20 ++++++++++---------- dlls/quartz/vmr9.c | 7 ++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index b420991..105e6b2 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -40,14 +40,14 @@ static void test_filter_config(void) ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ref = IVMRFilterConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -57,14 +57,14 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowed); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ref = IVMRFilterConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -74,14 +74,14 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Renderless); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(mode == VMRMode_Renderless, "Got mode %#x.\n", mode); + ok(mode == VMRMode_Renderless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ref = IVMRFilterConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -111,11 +111,11 @@ static void test_filter_config(void) /* Despite MSDN, you can still change the rendering mode after setting the * stream count. */ hr = IVMRFilterConfig_SetRenderingMode(config, VMRMode_Windowless); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); + ok(mode == VMRMode_Windowless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); todo_wine { diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 885fbe2..2a39d11 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1246,10 +1246,11 @@ static HRESULT WINAPI VMR7FilterConfig_GetRenderingPrefs(IVMRFilterConfig *iface static HRESULT WINAPI VMR7FilterConfig_SetRenderingMode(IVMRFilterConfig *iface, DWORD mode) { - struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface); + struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface); - FIXME("(%p/%p)->(%u) stub\n", iface, This, mode); - return E_NOTIMPL; + TRACE("iface %p, mode %#x.\n", iface, mode); + + return IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, mode); } static HRESULT WINAPI VMR7FilterConfig_GetRenderingMode(IVMRFilterConfig *iface, DWORD *mode)

1 0

Alexandre Julliard : msvcrt: Add MSVCRT_ prefix to the spawn() functions.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: ac38c175b5c39c23aff7047786d529220d77fc31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac38c175b5c39c23aff70477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 10:48:23 2019 +0200 msvcrt: Add MSVCRT_ prefix to the spawn() functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 24 ++++++++++++------------ dlls/msvcr110/msvcr110.spec | 24 ++++++++++++------------ dlls/msvcr120/msvcr120.spec | 24 ++++++++++++------------ dlls/msvcr70/msvcr70.spec | 24 ++++++++++++------------ dlls/msvcr71/msvcr71.spec | 24 ++++++++++++------------ dlls/msvcr80/msvcr80.spec | 24 ++++++++++++------------ dlls/msvcr90/msvcr90.spec | 24 ++++++++++++------------ dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ dlls/msvcrt/process.c | 24 ++++++++++++------------ dlls/msvcrtd/msvcrtd.spec | 24 ++++++++++++------------ dlls/ucrtbase/ucrtbase.spec | 24 ++++++++++++------------ 12 files changed, 138 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac38c175b5c39c23aff7…

1 0

Zebediah Figura : quartz/tests: Add some tests for video renderer media types.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: wine Branch: master Commit: 3f5ab4c06c21a6afcb20f0fe2485f6abbcd563e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f5ab4c06c21a6afcb20f0fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 1 21:38:21 2019 -0500 quartz/tests: Add some tests for video renderer media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 69 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c7f0df4..c7053e5 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -269,6 +269,74 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_video_renderer(); + AM_MEDIA_TYPE *mt, req_mt = {{0}}; + VIDEOINFOHEADER vih = + { + {0}, {0}, 0, 0, 0, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, BI_RGB} + }; + IEnumMediaTypes *enummt; + unsigned int i; + HRESULT hr; + ULONG ref; + IPin *pin; + + static const GUID *subtype_tests[] = + { + &MEDIASUBTYPE_RGB8, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + }; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.formattype = FORMAT_VideoInfo; + req_mt.cbFormat = sizeof(VIDEOINFOHEADER); + req_mt.pbFormat = (BYTE *)&vih; + + for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) + { + req_mt.subtype = *subtype_tests[i]; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x for subtype %s.\n", hr, wine_dbgstr_guid(subtype_tests[i])); + } + + req_mt.subtype = MEDIASUBTYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_RGB24; + + req_mt.majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Video; + + req_mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + req_mt.formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -333,6 +401,7 @@ START_TEST(videorenderer) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_basefilter(); CoUninitialize();

1 0

Józef Kucia : test: Test root CBV descriptor with big buffer.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: e88d6f4f2a7ad1b7d7b3b8ed9f5ab02c8b5ab018 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e88d6f4f2a7ad1b7d7b3b8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:54 2019 +0200 test: Test root CBV descriptor with big buffer. This test is for commit 22330b541446b62f10ef7d03dff709318420757a. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9a17a71..00005c4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10477,6 +10477,7 @@ static void test_immediate_constant_buffer(void) 0x0010000a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, 0x0100003e, }; + static const unsigned int MAX_CB_SIZE = D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT * sizeof(struct vec4); static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; static struct vec4 expected_result[] = { @@ -10501,7 +10502,7 @@ static void test_immediate_constant_buffer(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps, NULL); - cb = create_upload_buffer(context.device, sizeof(index), NULL); + cb = create_upload_buffer(context.device, 2 * MAX_CB_SIZE, NULL); for (i = 0; i < ARRAY_SIZE(expected_result); ++i) {

1 0

Józef Kucia : tests: Use vkd3d_optional_device_extensions_info.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: 0eb2817c226b2694ff1a07aba136a8664de8f47b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0eb2817c226b2694ff1a07a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:55 2019 +0200 tests: Use vkd3d_optional_device_extensions_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_crosstest.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 723659e..2103caf 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -455,29 +455,30 @@ static VkPhysicalDevice select_physical_device(struct vkd3d_instance *instance) static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { - struct vkd3d_device_create_info device_create_info; - VkPhysicalDevice vk_physical_device; - static const char * const device_extensions[] = { VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, }; + static const struct vkd3d_optional_device_extensions_info optional_extensions = + { + .type = VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, + .extensions = device_extensions, + .extension_count = ARRAY_SIZE(device_extensions), + }; + + struct vkd3d_device_create_info device_create_info; + VkPhysicalDevice vk_physical_device; if (!(vk_physical_device = select_physical_device(instance))) return E_INVALIDARG; memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.next = &optional_extensions; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; device_create_info.vk_physical_device = vk_physical_device; - if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) - { - device_create_info.device_extensions = device_extensions; - device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); - } - return vkd3d_create_device(&device_create_info, iid, device); }

1 0

Józef Kucia : tests: Add test for updating descriptor tables after changing root signature.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: ba1766fe307750a630e7241e2a9c2afc3bf21f69 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ba1766fe307750a630e7241… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:53 2019 +0200 tests: Add test for updating descriptor tables after changing root signature. This test is for commit 74fbfee61101901666069f1f7e868e0205266c10. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ba1766fe307750a630e…

1 0

Józef Kucia : vkd3d: Avoid copying empty ranges in d3d12_device_CopyDescriptors().
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: 91e88a820e708804614203c834e0acac8a62c4d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=91e88a820e708804614203c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:52 2019 +0200 vkd3d: Avoid copying empty ranges in d3d12_device_CopyDescriptors(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 34 ++++++++++++++++------------------ libs/vkd3d/resource.c | 2 ++ tests/d3d12.c | 34 ++++++++++++++++++++++++++++++---- 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8676434..9b18bc9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2306,29 +2306,27 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, } dst_range_idx = dst_idx = 0; - dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[0]); - dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[0] : 1; - for (src_range_idx = 0; src_range_idx < src_descriptor_range_count; ++src_range_idx) + src_range_idx = src_idx = 0; + while (dst_range_idx < dst_descriptor_range_count && src_range_idx < src_descriptor_range_count) { - src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); + dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; src_range_size = src_descriptor_range_sizes ? src_descriptor_range_sizes[src_range_idx] : 1; - for (src_idx = 0; src_idx < src_range_size; ++src_idx) - { - if (dst_idx >= dst_range_size) - { - dst_idx = 0; - ++dst_range_idx; - if (dst_range_idx >= dst_descriptor_range_count) - return; - - dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); - dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; - } + dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); + src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); - d3d12_desc_copy(dst++, src++, device); + while (dst_idx < dst_range_size && src_idx < src_range_size) + d3d12_desc_copy(&dst[dst_idx++], &src[src_idx++], device); - ++dst_idx; + if (dst_idx >= dst_range_size) + { + ++dst_range_idx; + dst_idx = 0; + } + if (src_idx >= src_range_size) + { + ++src_range_idx; + src_idx = 0; } } } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a6c22fd..8485585 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1600,6 +1600,8 @@ static void d3d12_desc_destroy(struct d3d12_desc *descriptor, void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) { + assert(dst != src); + d3d12_desc_destroy(dst, device); *dst = *src; diff --git a/tests/d3d12.c b/tests/d3d12.c index a9255b3..79bca28 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15168,12 +15168,16 @@ static void test_copy_descriptors(void) dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 9); dst_range_sizes[0] = 4; - dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 13); - dst_range_sizes[1] = 3; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 9); + dst_range_sizes[1] = 0; + dst_handles[2] = get_cpu_descriptor_handle(&context, heap, 13); + dst_range_sizes[2] = 3; + dst_handles[3] = get_cpu_descriptor_handle(&context, heap, 13); + dst_range_sizes[3] = 0; src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 10); - src_range_sizes[0] = 7; + src_range_sizes[0] = 8; /* t0-t6 */ - ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + ID3D12Device_CopyDescriptors(device, 4, dst_handles, dst_range_sizes, 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); /* copy 1 uninitialized descriptor (19) */ @@ -15195,6 +15199,28 @@ static void test_copy_descriptors(void) get_cpu_descriptor_handle(&context, cpu_heap, 22), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + /* range sizes equal to 0 */ + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[0] = 0; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[1] = 0; + src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[0] = 1; + src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[1] = 4; + ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[0] = 4; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[1] = 4; + src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[0] = 0; + src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[1] = 0; + ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); heaps[0] = sampler_heap; heaps[1] = heap; ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps);

1 0

Józef Kucia : vkd3d: Enable VK_EXT_descriptor_indexing.
by Alexandre Julliard April 2, 2019

April 2, 2019

Module: vkd3d Branch: master Commit: a1ec97ca2aaba36650870f847bf08781aeed6723 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a1ec97ca2aaba36650870f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:56 2019 +0200 vkd3d: Enable VK_EXT_descriptor_indexing. This extension brings dynamic indexing for all descriptor types and the update after bind feature. VK_KHR_maintenance3 is required by VK_EXT_descriptor_indexing. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 164 ++++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 2 + libs/vkd3d/vulkan_procs.h | 3 + 3 files changed, 168 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a1ec97ca2aaba366508…

1 0