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

Alistair Leslie-Hughes : dinput: Return E_NOINTERFACE from IDirectInputDevice2 QueryInterface.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 9e6afc62b3b5eef1e3a83881345c1c67104b9988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e6afc62b3b5eef1e3a83881… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 4 05:30:47 2019 +0000 dinput: Return E_NOINTERFACE from IDirectInputDevice2 QueryInterface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6c44616..cfade08 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1203,7 +1203,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W ifa } WARN("Unsupported interface!\n"); - return E_FAIL; + return E_NOINTERFACE; } HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A iface, REFIID riid, LPVOID *ppobj)

1 0

Alistair Leslie-Hughes : dinput: Improve EnumDevice tracing.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: f3259ba66c6e9e0f2c13bb6b9ae7930e8534ca24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3259ba66c6e9e0f2c13bb6b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 4 05:30:50 2019 +0000 dinput: Improve EnumDevice tracing. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e32ccae..0929961 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -467,9 +467,10 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; + + TRACE(" Checking device %u ('%s')\n", i, dinput_devices[i]->name); for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j); if (r == S_OK) if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP)

1 0

Alistair Leslie-Hughes : dinput: Support DIDEVICEINSTANCE_DX3 for Mouse GetDeviceInfo.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 381fa00b6acb4bc74e065d355de29903a2d4110c URL: https://source.winehq.org/git/wine.git/?a=commit;h=381fa00b6acb4bc74e065d35… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 4 05:30:52 2019 +0000 dinput: Support DIDEVICEINSTANCE_DX3 for Mouse GetDeviceInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 5 ----- dlls/dinput/tests/mouse.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index f3ec8e4..58c78a5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -765,11 +765,6 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo( SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p)\n", This, pdidi); - if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) { - WARN(" dinput3 not supported yet...\n"); - return DI_OK; - } - fill_mouse_dideviceinstanceA(pdidi, This->base.dinput->dwVersion); return DI_OK; diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index c2d0226..c1a7ff7 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -198,6 +198,35 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DestroyWindow( hwnd2 ); } +static void test_GetDeviceInfo(IDirectInputA *pDI) +{ + HRESULT hr; + IDirectInputDeviceA *pMouse = NULL; + DIDEVICEINSTANCEA instA; + DIDEVICEINSTANCE_DX3A inst3A; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + instA.dwSize = sizeof(instA); + hr = IDirectInputDevice_GetDeviceInfo(pMouse, &instA); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + inst3A.dwSize = sizeof(inst3A); + hr = IDirectInputDevice_GetDeviceInfo(pMouse, (DIDEVICEINSTANCEA *)&inst3A); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + ok(instA.dwSize != inst3A.dwSize, "got %d, %d \n", instA.dwSize, inst3A.dwSize); + ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); + ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidProduct), wine_dbgstr_guid(&inst3A.guidProduct) ); + ok(instA.dwDevType == inst3A.dwDevType, "got %d, %d\n", instA.dwDevType, inst3A.dwDevType); + + if (pMouse) IUnknown_Release(pMouse); +} + static void mouse_tests(void) { HRESULT hr; @@ -224,6 +253,7 @@ static void mouse_tests(void) test_set_coop(pDI, hwnd); test_acquire(pDI, hwnd); + test_GetDeviceInfo(pDI); DestroyWindow(hwnd); }

1 0

Austin English : advapi32: In ReadEventLogA/W, return ERROR_HANDLE_EOF instead of ERROR_CALL_NOT_IMPLEMENTED.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 1a5ad9e65d241e40b85c424ac561249b97161576 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a5ad9e65d241e40b85c424a… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 5 02:22:35 2019 -0500 advapi32: In ReadEventLogA/W, return ERROR_HANDLE_EOF instead of ERROR_CALL_NOT_IMPLEMENTED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46905 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/eventlog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 32066c5..71108c9 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -603,7 +603,7 @@ BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOf FIXME("(%p,0x%08x,0x%08x,%p,0x%08x,%p,%p) stub\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_HANDLE_EOF); return FALSE; } @@ -618,7 +618,7 @@ BOOL WINAPI ReadEventLogW( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOf FIXME("(%p,0x%08x,0x%08x,%p,0x%08x,%p,%p) stub\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_HANDLE_EOF); return FALSE; }

1 0

Alexandre Julliard : services: Explicitly mark a qsort() callback funtion cdecl.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 4b69b6710a806a8234788b3c97a90a3104fbe27b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b69b6710a806a8234788b3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:40:48 2019 -0500 services: Explicitly mark a qsort() callback funtion cdecl. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47122 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 971be4d..0634c83 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -322,7 +322,7 @@ static void scmdatabase_remove_service(struct scmdatabase *db, struct service_en service->entry.next = service->entry.prev = NULL; } -static int compare_tags(const void *a, const void *b) +static int __cdecl compare_tags(const void *a, const void *b) { struct service_entry *service_a = *(struct service_entry **)a; struct service_entry *service_b = *(struct service_entry **)b;

1 0

Alexandre Julliard : winefile: Explicitly mark qsort() callback funtions cdecl.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 50af5c83371703016f759abfdc0dc654ae888b84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50af5c83371703016f759abf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:41:07 2019 -0500 winefile: Explicitly mark qsort() callback funtions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index d69cbcb..fa78237 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -855,7 +855,7 @@ static int compareType(const WIN32_FIND_DATAW* fd1, const WIN32_FIND_DATAW* fd2) } -static int compareName(const void* arg1, const void* arg2) +static int __cdecl compareName(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -867,7 +867,7 @@ static int compareName(const void* arg1, const void* arg2) return lstrcmpiW(fd1->cFileName, fd2->cFileName); } -static int compareExt(const void* arg1, const void* arg2) +static int __cdecl compareExt(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -900,7 +900,7 @@ static int compareExt(const void* arg1, const void* arg2) return lstrcmpiW(name1, name2); } -static int compareSize(const void* arg1, const void* arg2) +static int __cdecl compareSize(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -921,7 +921,7 @@ static int compareSize(const void* arg1, const void* arg2) return cmp<0? -1: cmp>0? 1: 0; } -static int compareDate(const void* arg1, const void* arg2) +static int __cdecl compareDate(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -934,7 +934,7 @@ static int compareDate(const void* arg1, const void* arg2) } -static int (*sortFunctions[])(const void* arg1, const void* arg2) = { +static int (CDECL *sortFunctions[])(const void* arg1, const void* arg2) = { compareName, /* SORT_NAME */ compareExt, /* SORT_EXT */ compareSize, /* SORT_SIZE */

1 0

Józef Kucia : include: Define TRACE_ON() for VKD3D_NO_TRACE_MESSAGES.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: vkd3d Branch: master Commit: 9babc0fb44f70c739b2d7cea7f8e43fe2690a89a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9babc0fb44f70c739b2d7ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:43 2019 +0200 include: Define TRACE_ON() for VKD3D_NO_TRACE_MESSAGES. 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> --- include/private/vkd3d_debug.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 7642dec..80c5781 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -26,6 +26,7 @@ #ifdef VKD3D_NO_TRACE_MESSAGES #define TRACE(args...) do { } while (0) +#define TRACE_ON() (false) #endif #ifdef VKD3D_NO_DEBUG_MESSAGES @@ -74,7 +75,9 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define ERR VKD3D_DBG_LOG(ERR) +#ifndef TRACE_ON #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) +#endif #define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name

1 0

Józef Kucia : vkd3d: Allow 0 vertex stride.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: vkd3d Branch: master Commit: 8a23ff13760ac05a5a0c4df14b3246ab5f93cfa8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8a23ff13760ac05a5a0c4df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:42 2019 +0200 vkd3d: Allow 0 vertex stride. 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/state.c | 3 - tests/d3d12.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6a7b6e5..054a9ae 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2744,9 +2744,6 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta b->stride = strides[binding]; b->inputRate = graphics->input_rates[binding]; - if (!b->stride) - FIXME("Invalid stride for input slot %u.\n", binding); - pipeline_key.strides[binding_count] = strides[binding]; ++binding_count; diff --git a/tests/d3d12.c b/tests/d3d12.c index 2c8c44b..d5f491e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21627,6 +21627,176 @@ static void test_dispatch_zero_thread_groups(void) destroy_test_context(&context); } +static void test_zero_vertex_stride(void) +{ + ID3D12PipelineState *instance_pipeline_state; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_VERTEX_BUFFER_VIEW vbv[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb[2]; + + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"sv_position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"color", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const D3D12_INPUT_ELEMENT_DESC instance_layout_desc[] = + { + {"sv_position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"color", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + struct vs_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + void main(in struct vs_data vs_input, out struct vs_data vs_output) + { + vs_output.pos = vs_input.pos; + vs_output.color = vs_input.color; + } +#endif + 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD ps_code[] = + { +#if 0 + struct ps_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + float4 main(struct ps_data ps_input) : SV_Target + { + return ps_input.color; + } +#endif + 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const struct vec4 positions[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, + }; + static const struct vec4 colors[] = + { + {0.0f, 1.0f, 0.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.5f, 0.5f, 0.5f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + input_layout.pInputElementDescs = instance_layout_desc; + input_layout.NumElements = ARRAY_SIZE(instance_layout_desc); + instance_pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + memset(vbv, 0, sizeof(vbv)); + vb[0] = create_upload_buffer(context.device, sizeof(positions), positions); + vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); + vbv[0].StrideInBytes = sizeof(*positions); + vbv[0].SizeInBytes = sizeof(positions); + + vb[1] = create_upload_buffer(context.device, sizeof(colors), colors); + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]) + 2 * sizeof(*colors); + vbv[1].StrideInBytes = 0; + vbv[1].SizeInBytes = sizeof(colors); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff808080, 2); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, instance_pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(vb[1]); + ID3D12Resource_Release(vb[0]); + ID3D12PipelineState_Release(instance_pipeline_state); + destroy_test_context(&context); +} + static void test_instance_id(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -28910,6 +29080,7 @@ START_TEST(d3d12) run_test(test_resolve_query_data_in_reordered_command_list); run_test(test_execute_indirect); run_test(test_dispatch_zero_thread_groups); + run_test(test_zero_vertex_stride); run_test(test_instance_id); run_test(test_vertex_id); run_test(test_copy_texture);

1 0

Józef Kucia : vkd3d: Validate resource flags.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: vkd3d Branch: master Commit: a2f7ae0d3243469f6f44c366c1580ade15e6b85e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a2f7ae0d3243469f6f44c36… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:38 2019 +0200 vkd3d: Validate resource flags. 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/resource.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 36e470b..aba850f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -549,6 +549,9 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, buffer_info.pQueueFamilyIndices = NULL; } + if (desc->Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) + FIXME("Unsupported resource flags %#x.\n", desc->Flags); + if ((vr = VK_CALL(vkCreateBuffer(device->vk_device, &buffer_info, NULL, vk_buffer))) < 0) { WARN("Failed to create Vulkan buffer, vr %d.\n", vr); @@ -672,6 +675,7 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, HRESULT hr; assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER); + assert(d3d12_resource_validate_desc(desc) == S_OK); if (!desc->MipLevels) { @@ -1190,6 +1194,22 @@ struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) return impl_from_ID3D12Resource(iface); } +static void d3d12_validate_resource_flags(D3D12_RESOURCE_FLAGS flags) +{ + unsigned int unknown_flags = flags & ~(D3D12_RESOURCE_FLAG_NONE + | D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET + | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL + | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS + | D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE + | D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER + | D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS); + + if (unknown_flags) + FIXME("Unknown resource flags %#x.\n", unknown_flags); + if (flags & D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER) + FIXME("Ignoring D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER.\n"); +} + HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) { switch (desc->Dimension) @@ -1228,6 +1248,8 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) return E_INVALIDARG; } + d3d12_validate_resource_flags(desc->Flags); + /* FIXME: Validate alignment for textures. */ return S_OK;

1 0

Józef Kucia : vkd3d: Handle integer overflow of sequence numbers.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: vkd3d Branch: master Commit: bce64bf67b73b7d69a97fc6c063144af3e8ee7ad URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bce64bf67b73b7d69a97fc6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:39 2019 +0200 vkd3d: Handle integer overflow of sequence numbers. 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/command.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index c8e23e1..53675d5 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -161,6 +161,21 @@ static void vkd3d_queue_update_sequence_number(struct vkd3d_queue *queue, pthread_mutex_unlock(&queue->mutex); } +static uint64_t vkd3d_queue_reset_sequence_number_locked(struct vkd3d_queue *queue) +{ + unsigned int i; + + WARN("Ressetting sequence number for queue %p.\n", queue); + + queue->completed_sequence_number = 0; + queue->submitted_sequence_number = 1; + + for (i = 0; i < queue->semaphore_count; ++i) + queue->semaphores[i].sequence_number = queue->submitted_sequence_number; + + return queue->submitted_sequence_number; +} + /* Fence worker thread */ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, VkFence vk_fence, struct d3d12_fence *fence, uint64_t value, @@ -5298,11 +5313,15 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * } if ((vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, vk_fence))) >= 0) + { sequence_number = ++vkd3d_queue->submitted_sequence_number; - vkd3d_queue_release(vkd3d_queue); + /* We don't expect to overrun the 64-bit counter, but we handle it gracefully anyway. */ + if (!sequence_number) + sequence_number = vkd3d_queue_reset_sequence_number_locked(vkd3d_queue); + } - assert(sequence_number != ~(uint64_t)0); + vkd3d_queue_release(vkd3d_queue); if (vr < 0) {

1 0