wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Zebediah Figura : strmbase/transform: Check whether the source is connected in TransformFilter_Input_Receive().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 8bfd6d3285d9c4e91f79445070ecfdbf792ffb9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bfd6d3285d9c4e91f794450… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:14:01 2019 -0600 strmbase/transform: Check whether the source is connected in TransformFilter_Input_Receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index e7d4d66164..29c385793a 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -59,6 +59,16 @@ static HRESULT WINAPI TransformFilter_Input_Receive(struct strmbase_sink *This, TRACE("%p\n", This); + /* We do not expect pin connection state to change while the filter is + * running. This guarantee is necessary, since otherwise we would have to + * take the filter lock, and we can't take the filter lock from a streaming + * thread. */ + if (!pTransform->source.pMemInputPin) + { + WARN("Source is not connected, returning VFW_E_NOT_CONNECTED.\n"); + return VFW_E_NOT_CONNECTED; + } + EnterCriticalSection(&pTransform->csReceive); if (pTransform->filter.state == State_Stopped) {

1 0

Zebediah Figura : strmbase: Simplify SendFurther().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: b0b56001fe89188b6b14ce62860a6a0a1cd58e56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b56001fe89188b6b14ce62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:14:00 2019 -0600 strmbase: Simplify SendFurther(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 87 ++++++++--------------------------------------------- 1 file changed, 12 insertions(+), 75 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 92a2fe55b9..4606c25a78 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -56,82 +56,18 @@ static HRESULT updatehres( HRESULT original, HRESULT new ) * If the pin given is an input pin, the message will be sent downstream to other input pins * If the pin given is an output pin, the message will be sent upstream to other output pins */ -static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPinFunc fnEnd ) +static HRESULT SendFurther(struct strmbase_sink *sink, SendPinFunc func, void *arg) { - PIN_INFO pin_info; - ULONG amount = 0; + struct strmbase_pin *pin; HRESULT hr = S_OK; - HRESULT hr_return = S_OK; - IEnumPins *enumpins = NULL; - BOOL foundend = TRUE; - PIN_DIRECTION from_dir; + unsigned int i; - IPin_QueryDirection( from, &from_dir ); - - hr = IPin_QueryInternalConnections( from, NULL, &amount ); - if (hr != E_NOTIMPL && amount) - FIXME("Use QueryInternalConnections!\n"); - - pin_info.pFilter = NULL; - hr = IPin_QueryPinInfo( from, &pin_info ); - if (FAILED(hr)) - goto out; - - hr = IBaseFilter_EnumPins( pin_info.pFilter, &enumpins ); - if (FAILED(hr)) - goto out; - - hr = IEnumPins_Reset( enumpins ); - while (hr == S_OK) { - IPin *pin = NULL; - hr = IEnumPins_Next( enumpins, 1, &pin, NULL ); - if (hr == VFW_E_ENUM_OUT_OF_SYNC) - { - hr = IEnumPins_Reset( enumpins ); - continue; - } - if (pin) - { - PIN_DIRECTION dir; - - IPin_QueryDirection( pin, &dir ); - if (dir != from_dir) - { - IPin *connected = NULL; - - foundend = FALSE; - IPin_ConnectedTo( pin, &connected ); - if (connected) - { - HRESULT hr_local; - - hr_local = fnMiddle( connected, arg ); - hr_return = updatehres( hr_return, hr_local ); - IPin_Release(connected); - } - } - IPin_Release( pin ); - } - else - { - hr = S_OK; - break; - } - } - - if (!foundend) - hr = hr_return; - else if (fnEnd) { - HRESULT hr_local; - - hr_local = fnEnd( from, arg ); - hr_return = updatehres( hr_return, hr_local ); + for (i = 0; (pin = sink->pin.filter->ops->filter_get_pin(sink->pin.filter, i)); ++i) + { + if (pin->dir == PINDIR_OUTPUT && pin->peer) + hr = updatehres(hr, func(pin->peer, arg)); } - IEnumPins_Release(enumpins); -out: - if (pin_info.pFilter) - IBaseFilter_Release( pin_info.pFilter ); return hr; } @@ -799,7 +735,7 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) LeaveCriticalSection(&This->pin.filter->csFilter); if (hr == S_OK) - hr = SendFurther( iface, deliver_endofstream, NULL, NULL ); + hr = SendFurther(This, deliver_endofstream, NULL); return hr; } @@ -817,7 +753,7 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); This->flushing = TRUE; - hr = SendFurther( iface, deliver_beginflush, NULL, NULL ); + hr = SendFurther(This, deliver_beginflush, NULL); LeaveCriticalSection(&This->pin.filter->csFilter); return hr; @@ -837,7 +773,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); This->flushing = This->end_of_stream = FALSE; - hr = SendFurther( iface, deliver_endflush, NULL, NULL ); + hr = SendFurther(This, deliver_endflush, NULL); LeaveCriticalSection(&This->pin.filter->csFilter); return hr; @@ -857,6 +793,7 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { + struct strmbase_sink *pin = impl_sink_from_IPin(iface); newsegmentargs args; TRACE("iface %p, start %s, stop %s, rate %.16e.\n", @@ -866,7 +803,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, R args.tStop = stop; args.rate = rate; - return SendFurther( iface, deliver_newsegment, &args, NULL ); + return SendFurther(pin, deliver_newsegment, &args); } /*** IMemInputPin implementation ***/

1 0

Zebediah Figura : strmbase: Return a strmbase_pin pointer from the filter_get_pin() callback.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: bd83b11a238addcf5605d8be4aad20ad4a884f87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd83b11a238addcf5605d8be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:13:59 2019 -0600 strmbase: Return a strmbase_pin pointer from the filter_get_pin() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avico.c | 6 +++--- dlls/qcap/avimux.c | 6 +++--- dlls/qcap/smartteefilter.c | 8 ++++---- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 6 +++--- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/strmbase/enumpins.c | 10 ++++------ dlls/strmbase/filter.c | 14 +++----------- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 6 +++--- dlls/winegstreamer/gstdemux.c | 6 +++--- dlls/wineqtdecoder/qtsplitter.c | 10 +++++----- include/wine/strmbase.h | 2 +- 17 files changed, 45 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd83b11a238addcf5605…

1 0

Alexandre Julliard : msvcrt: Fix range check in wsctoul().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: ad96d9195e4b524a7bf8ea7250aa384ee07bca0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad96d9195e4b524a7bf8ea72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 24 12:42:03 2019 +0100 msvcrt: Fix range check in wsctoul(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3e5bb512ff..1ae292423c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2487,7 +2487,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, MSVCRT_ulong __cdecl MSVCRT__wcstoul_l(const MSVCRT_wchar_t *s, MSVCRT_wchar_t **end, int base, MSVCRT__locale_t locale) { - __int64 ret = MSVCRT__wcstoui64_l(s, end, base, locale); + unsigned __int64 ret = MSVCRT__wcstoui64_l(s, end, base, locale); if(ret > MSVCRT_ULONG_MAX) { ret = MSVCRT_ULONG_MAX;

1 0

Alexandre Julliard : cmd: Environment variables contain signed numbers.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 5d48eac4562953e08136801908beba8f60f2fe9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d48eac4562953e081368019… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 20:47:23 2019 +0100 cmd: Environment variables contain signed numbers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a1952e8024..c6048eb5c1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3713,7 +3713,7 @@ static int WCMD_peeknumber(VARSTACK **varstack) { if (!thisvar->isnum) { WCHAR tmpstr[MAXSTRING]; if (GetEnvironmentVariableW(thisvar->variable, tmpstr, MAXSTRING)) { - result = wcstoul(tmpstr,NULL,0); + result = wcstol(tmpstr,NULL,0); } WINE_TRACE("Envvar %s converted to %d\n", wine_dbgstr_w(thisvar->variable), result); } else {

1 0

Alexandre Julliard : kernel32: Avoid forwarding to advapi32.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 69d0381b5af3a73745adda22cc7695ef71156def URL: https://source.winehq.org/git/wine.git/?a=commit;h=69d0381b5af3a73745adda22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 23 11:26:52 2019 +0100 kernel32: Avoid forwarding to advapi32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 78 ++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a26d65edf7..f6c40a9c42 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1200,48 +1200,48 @@ @ stdcall -import ReadFileScatter(long ptr long ptr ptr) @ stdcall -import ReadProcessMemory(long ptr ptr long ptr) # @ stub ReadThreadProfilingData -@ stdcall -private RegCloseKey(long) advapi32.RegCloseKey -@ stdcall -private RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA -@ stdcall -private RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW -@ stdcall -private RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA -@ stdcall -private RegDeleteKeyExW(long wstr long long) advapi32.RegDeleteKeyExW -@ stdcall -private RegDeleteTreeA(long str) advapi32.RegDeleteTreeA -@ stdcall -private RegDeleteTreeW(long wstr) advapi32.RegDeleteTreeW -@ stdcall -private RegDeleteValueA(long str) advapi32.RegDeleteValueA -@ stdcall -private RegDeleteValueW(long wstr) advapi32.RegDeleteValueW +@ stdcall -private -import RegCloseKey(long) +@ stdcall -private -import RegCreateKeyExA(long str long ptr long long ptr ptr ptr) +@ stdcall -private -import RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) +@ stdcall -private -import RegDeleteKeyExA(long str long long) +@ stdcall -private -import RegDeleteKeyExW(long wstr long long) +@ stdcall -private -import RegDeleteTreeA(long str) +@ stdcall -private -import RegDeleteTreeW(long wstr) +@ stdcall -private -import RegDeleteValueA(long str) +@ stdcall -private -import RegDeleteValueW(long wstr) # stub RegDisablePredefinedCacheEx -@ stdcall -private RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExA -@ stdcall -private RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW -@ stdcall -private RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueA -@ stdcall -private RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW -@ stdcall -private RegFlushKey(long) advapi32.RegFlushKey -@ stdcall -private RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity -@ stdcall -private RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA -@ stdcall -private RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +@ stdcall -private -import RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegFlushKey(long) +@ stdcall -private -import RegGetKeySecurity(long long ptr ptr) +@ stdcall -private -import RegGetValueA(long str str long ptr ptr ptr) +@ stdcall -private -import RegGetValueW(long wstr wstr long ptr ptr ptr) # stub RegKrnGetGlobalState # stub RegKrnInitialize -@ stdcall -private RegLoadKeyA(long str str) advapi32.RegLoadKeyA -@ stdcall -private RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW -@ stdcall -private RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA -@ stdcall -private RegLoadMUIStringW(long wstr wstr long ptr long wstr) advapi32.RegLoadMUIStringW -@ stdcall -private RegNotifyChangeKeyValue(long long long long long) advapi32.RegNotifyChangeKeyValue -@ stdcall -private RegOpenCurrentUser(long ptr) advapi32.RegOpenCurrentUser -@ stdcall -private RegOpenKeyExA(long str long long ptr) advapi32.RegOpenKeyExA -@ stdcall -private RegOpenKeyExW(long wstr long long ptr) advapi32.RegOpenKeyExW -@ stdcall -private RegOpenUserClassesRoot(ptr long long ptr) advapi32.RegOpenUserClassesRoot -@ stdcall -private RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyA -@ stdcall -private RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW -@ stdcall -private RegQueryValueExA(long str ptr ptr ptr ptr) advapi32.RegQueryValueExA -@ stdcall -private RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW -@ stdcall -private RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA -@ stdcall -private RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW -# stub RegSaveKeyExA -# stub RegSaveKeyExW -@ stdcall -private RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity -@ stdcall -private RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA -@ stdcall -private RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW -@ stdcall -private RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA -@ stdcall -private RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW +@ stdcall -private -import RegLoadKeyA(long str str) +@ stdcall -private -import RegLoadKeyW(long wstr wstr) +@ stdcall -private -import RegLoadMUIStringA(long str str long ptr long str) +@ stdcall -private -import RegLoadMUIStringW(long wstr wstr long ptr long wstr) +@ stdcall -private -import RegNotifyChangeKeyValue(long long long long long) +@ stdcall -private -import RegOpenCurrentUser(long ptr) +@ stdcall -private -import RegOpenKeyExA(long str long long ptr) +@ stdcall -private -import RegOpenKeyExW(long wstr long long ptr) +@ stdcall -private -import RegOpenUserClassesRoot(ptr long long ptr) +@ stdcall -private -import RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall -private -import RegQueryValueExA(long str ptr ptr ptr ptr) +@ stdcall -private -import RegQueryValueExW(long wstr ptr ptr ptr ptr) +@ stdcall -private -import RegRestoreKeyA(long str long) +@ stdcall -private -import RegRestoreKeyW(long wstr long) +@ stdcall -private -import RegSaveKeyExA(long str ptr long) +@ stdcall -private -import RegSaveKeyExW(long wstr ptr long) +@ stdcall -private -import RegSetKeySecurity(long long ptr) +@ stdcall -private -import RegSetValueExA(long str long long ptr long) +@ stdcall -private -import RegSetValueExW(long wstr long long ptr long) +@ stdcall -private -import RegUnLoadKeyA(long str) +@ stdcall -private -import RegUnLoadKeyW(long wstr) @ stdcall RegisterApplicationRecoveryCallback(ptr ptr long long) @ stdcall RegisterApplicationRestart(wstr long) @ stub RegisterConsoleIME

1 0

Conor McCarthy : vkd3d: Return valid node masks in external resource heap properties.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: e783784cace2fb2af7d9fb9fe3d8a1af07a8c8a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e783784cace2fb2af7d9fb9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 25 17:53:42 2019 +0330 vkd3d: Return valid node masks in external resource heap properties. Hitman 2 calls GetHeapProperties() for each swapchain buffer and checks if the creation node mask is 1. If not then it fails to store the resource pointers for later rendering. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 2 ++ tests/vkd3d_api.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 89733ce..f5cdf4a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1522,6 +1522,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetHeapProperties(ID3D12Resource { memset(heap_properties, 0, sizeof(*heap_properties)); heap_properties->Type = D3D12_HEAP_TYPE_DEFAULT; + heap_properties->CreationNodeMask = 1; + heap_properties->VisibleNodeMask = 1; } if (flags) *flags = D3D12_HEAP_FLAG_NONE; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 135782d..d4fe79a 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -907,8 +907,8 @@ static void test_external_resource_map(void) "Got unexpected CPU page property %#x.\n", heap_properties.CPUPageProperty); ok(heap_properties.MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN, "Got unexpected memory pool preference %#x.\n", heap_properties.MemoryPoolPreference); - todo ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); - todo ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); + ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); + ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); ID3D12Resource_Release(vk_resource); vk_device = vkd3d_get_vk_device(device);

1 0

Conor McCarthy : vkd3d: Add tests for external resource heap properties.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: 5366d405e9c3da30baef92f235721c872c856aa1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5366d405e9c3da30baef92f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 25 17:53:41 2019 +0330 vkd3d: Add tests for external resource heap properties. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/vkd3d_api.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index a9a7fc1..135782d 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -854,7 +854,9 @@ static VkDeviceMemory allocate_vulkan_image_memory(ID3D12Device *device, static void test_external_resource_map(void) { struct vkd3d_image_resource_create_info resource_create_info; + D3D12_HEAP_PROPERTIES heap_properties; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + D3D12_HEAP_FLAGS heap_flags; ID3D12Resource *vk_resource; VkDeviceMemory vk_memory; ID3D12Device *device; @@ -898,6 +900,16 @@ static void test_external_resource_map(void) gpu_address = ID3D12Resource_GetGPUVirtualAddress(vk_resource); ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + hr = ID3D12Resource_GetHeapProperties(vk_resource, &heap_properties, &heap_flags); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(heap_properties.Type == D3D12_HEAP_TYPE_DEFAULT, "Got unexpected heap type %#x.\n", heap_properties.Type); + ok(heap_properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_UNKNOWN, + "Got unexpected CPU page property %#x.\n", heap_properties.CPUPageProperty); + ok(heap_properties.MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN, + "Got unexpected memory pool preference %#x.\n", heap_properties.MemoryPoolPreference); + todo ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); + todo ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); + ID3D12Resource_Release(vk_resource); vk_device = vkd3d_get_vk_device(device); vkDestroyImage(vk_device, vk_image, NULL);

1 0

Philip Rebohle : vkd3d: Handle DXGI_FORMAT_R11G11B10_FLOAT in d3d12_command_list_ClearUnorderedAccessViewUint().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: a204a681a1878bee29cc7094b9265ac45d3ad949 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a204a681a1878bee29cc709… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 25 17:53:40 2019 +0330 vkd3d: Handle DXGI_FORMAT_R11G11B10_FLOAT in d3d12_command_list_ClearUnorderedAccessViewUint(). There is no bit-compatible UINT format, so we'll use DXGI_FORMAT_R32_UINT. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 19 ++++++++++++++++++- tests/d3d12.c | 8 ++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e3810e2..75af27d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4979,6 +4979,22 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, } } +static const struct vkd3d_format *vkd3d_fixup_clear_uav_uint_colour(struct d3d12_device *device, + DXGI_FORMAT dxgi_format, VkClearColorValue *colour) +{ + switch (dxgi_format) + { + case DXGI_FORMAT_R11G11B10_FLOAT: + colour->uint32[0] = (colour->uint32[0] & 0x7ff) + | ((colour->uint32[1] & 0x7ff) << 11) + | ((colour->uint32[2] & 0x3ff) << 22); + return vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); + + default: + return NULL; + } +} + static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList1 *iface, D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource, const UINT values[4], UINT rect_count, const D3D12_RECT *rects) @@ -5000,7 +5016,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID if (view->format->type != VKD3D_FORMAT_TYPE_UINT) { - if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format))) + if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format)) + && !(uint_format = vkd3d_fixup_clear_uav_uint_colour(device, view->format->dxgi_format, &colour))) { ERR("Unhandled format %#x.\n", view->format->dxgi_format); return; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5d549e2..52de007 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4839,11 +4839,11 @@ static void test_clear_unordered_access_view_buffer(void) {0x100, 0, 0, 0}, 0, false, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0, 0, 0, 0}, 0, false, true}, + {0, 0, 0, 0}, 0}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff, false, true}, + {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x7ff, 0, 0x3ff, 0}, 0xffc007ff, false, true}, + {0x7ff, 0, 0x3ff, 0}, 0xffc007ff}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0}, 0x801e0380, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, @@ -5011,7 +5011,7 @@ static void test_clear_unordered_access_view_image(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, - {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001, false, true}, + {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true},

1 0

Philip Rebohle : vkd3d: Re-implement d3d12_command_list_ClearUnorderedAccessViewUint().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: 207ca12725e073d896e6fabb6c2890ac29cbee7b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=207ca12725e073d896e6fab… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 25 17:53:39 2019 +0330 vkd3d: Re-implement d3d12_command_list_ClearUnorderedAccessViewUint(). Addresses the following limitations of the previous implementation: - Only R32_{UINT,TYPELESS} were supported for buffers. - Clearing an image UAV did not behave correctly for images with non-UINT formats. - Due to the use of transfer operations, extra memory barriers were needed. If necessary, this will create a temporary view with a bit-compatible UINT format for the resource in order to perform a bit-exact clear. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 116 ++++++++++++++++----------------------------- libs/vkd3d/resource.c | 20 ++------ libs/vkd3d/utils.c | 31 ++++++++++++ libs/vkd3d/vkd3d_private.h | 19 ++++++++ tests/d3d12.c | 22 ++++----- 5 files changed, 104 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=207ca12725e073d896e…

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
90
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 November 2019