wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Alexandre Julliard : wshom.ocx: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: df8f838928d6754365558503dcc39ab911e4adc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8f838928d6754365558503… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:44:17 2019 +0200 wshom.ocx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/Makefile.in | 2 ++ dlls/wshom.ocx/shell.c | 41 ++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index b1949ed..6cbec44 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,6 +1,8 @@ MODULE = wshom.ocx IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ shell.c \ wshom_main.c diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 57f1746..5d58ac7 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -25,7 +25,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -656,11 +655,11 @@ static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, } folder = V_BSTR(index); - if (!strcmpiW(folder, desktopW)) + if (!wcsicmp(folder, desktopW)) kind = CSIDL_DESKTOP; - else if (!strcmpiW(folder, allusersdesktopW)) + else if (!wcsicmp(folder, allusersdesktopW)) kind = CSIDL_COMMON_DESKTOPDIRECTORY; - else if (!strcmpiW(folder, allusersprogramsW)) + else if (!wcsicmp(folder, allusersprogramsW)) kind = CSIDL_COMMON_PROGRAMS; else { @@ -923,7 +922,7 @@ static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *Ic hr = IShellLinkW_GetIconLocation(This->link, buffW, ARRAY_SIZE(buffW), &icon); if (FAILED(hr)) return hr; - sprintfW(pathW, fmtW, buffW, icon); + swprintf(pathW, ARRAY_SIZE(pathW), fmtW, buffW, icon); *IconPath = SysAllocString(pathW); if (!*IconPath) return E_OUTOFMEMORY; @@ -941,7 +940,7 @@ static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR Ico TRACE("(%p)->(%s)\n", This, debugstr_w(IconPath)); /* scan for icon id */ - ptr = strrchrW(IconPath, ','); + ptr = wcsrchr(IconPath, ','); if (!ptr) { WARN("icon index not found\n"); @@ -951,10 +950,10 @@ static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR Ico path = SysAllocStringLen(IconPath, ptr-IconPath); /* skip spaces if any */ - while (isspaceW(*++ptr)) + while (iswspace(*++ptr)) ; - icon = atoiW(ptr); + icon = wcstol(ptr, NULL, 10); hr = IShellLinkW_SetIconLocation(This->link, path, icon); SysFreeString(path); @@ -1225,8 +1224,8 @@ static WCHAR *split_command( BSTR cmd, WCHAR **params ) WCHAR *ret, *ptr; BOOL in_quotes = FALSE; - if (!(ret = heap_alloc((strlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; - strcpyW( ret, cmd ); + if (!(ret = heap_alloc((lstrlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; + lstrcpyW( ret, cmd ); *params = NULL; for (ptr = ret; *ptr; ptr++) @@ -1429,9 +1428,9 @@ static HKEY get_root_key(const WCHAR *path) int i; for (i = 0; i < ARRAY_SIZE(rootkeys); i++) { - if (!strncmpW(path, rootkeys[i].full, strlenW(rootkeys[i].full))) + if (!wcsncmp(path, rootkeys[i].full, lstrlenW(rootkeys[i].full))) return rootkeys[i].hkey; - if (rootkeys[i].abbrev[0] && !strncmpW(path, rootkeys[i].abbrev, strlenW(rootkeys[i].abbrev))) + if (rootkeys[i].abbrev[0] && !wcsncmp(path, rootkeys[i].abbrev, lstrlenW(rootkeys[i].abbrev))) return rootkeys[i].hkey; } @@ -1444,17 +1443,17 @@ static HRESULT split_reg_path(const WCHAR *path, WCHAR **subkey, WCHAR **value) *value = NULL; /* at least one separator should be present */ - *subkey = strchrW(path, '\\'); + *subkey = wcschr(path, '\\'); if (!*subkey) return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); /* default value or not */ - if ((*subkey)[strlenW(*subkey)-1] == '\\') { + if ((*subkey)[lstrlenW(*subkey)-1] == '\\') { (*subkey)++; *value = NULL; } else { - *value = strrchrW(*subkey, '\\'); + *value = wcsrchr(*subkey, '\\'); if (*value - *subkey > 1) { unsigned int len = *value - *subkey - 1; WCHAR *ret; @@ -1566,7 +1565,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v bound.cElements = 0; while (*ptr) { bound.cElements++; - ptr += strlenW(ptr)+1; + ptr += lstrlenW(ptr)+1; } sa = SafeArrayCreate(VT_VARIANT, 1, &bound); @@ -1583,7 +1582,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v while (*ptr) { V_VT(v) = VT_BSTR; V_BSTR(v) = SysAllocString(ptr); - ptr += strlenW(ptr)+1; + ptr += lstrlenW(ptr)+1; v++; } @@ -1641,13 +1640,13 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * if (V_VT(type) != VT_BSTR) return E_INVALIDARG; - if (!strcmpW(V_BSTR(type), regszW)) + if (!wcscmp(V_BSTR(type), regszW)) regtype = REG_SZ; - else if (!strcmpW(V_BSTR(type), regdwordW)) + else if (!wcscmp(V_BSTR(type), regdwordW)) regtype = REG_DWORD; - else if (!strcmpW(V_BSTR(type), regexpandszW)) + else if (!wcscmp(V_BSTR(type), regexpandszW)) regtype = REG_EXPAND_SZ; - else if (!strcmpW(V_BSTR(type), regbinaryW)) + else if (!wcscmp(V_BSTR(type), regbinaryW)) regtype = REG_BINARY; else { FIXME("unrecognized value type %s\n", debugstr_w(V_BSTR(type)));

1 0

Alexandre Julliard : wsdapi: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: e005434d6e9c6f3f48f5f26db60ba46c10ba06af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e005434d6e9c6f3f48f5f26d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:43:58 2019 +0200 wsdapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index dd7b350..e63ea51 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -2,6 +2,8 @@ MODULE = wsdapi.dll IMPORTLIB = wsdapi IMPORTS = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ address.c \ discovery.c \

1 0

Alexandre Julliard : wpc: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: ff084c8b7ba6715e8489b4903dbbc2843ffda4fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff084c8b7ba6715e8489b490… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:43:03 2019 +0200 wpc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wpc/Makefile.in b/dlls/wpc/Makefile.in index 829a769..5d8ea2e 100644 --- a/dlls/wpc/Makefile.in +++ b/dlls/wpc/Makefile.in @@ -1,5 +1,7 @@ MODULE = wpc.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ wpc.c

1 0

Alexandre Julliard : wow32: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: ffd6a3ebdf8487dae07bb4af38a6b3cba8ad7a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd6a3ebdf8487dae07bb4af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:42:56 2019 +0200 wow32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in index 5f0e13a..db153da 100644 --- a/dlls/wow32/Makefile.in +++ b/dlls/wow32/Makefile.in @@ -2,4 +2,6 @@ MODULE = wow32.dll IMPORTLIB = wow32 IMPORTS = kernel +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = wow_main.c

1 0

Alexandre Julliard : wmvcore: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 3e9566a3fb776304d20b442c1d293a15097e60ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9566a3fb776304d20b442c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:42:45 2019 +0200 wmvcore: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 19d32f6..c0b5827 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -2,6 +2,8 @@ MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ reader.c \ wmvcore_main.c \

1 0

Józef Kucia : tests: Add bug_if() for VK_EXT_conditional_rendering radv bugs.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: vkd3d Branch: master Commit: 5243b8c3f61416b1a618cc8687307a6fb770f2b4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5243b8c3f61416b1a618cc8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:22 2019 +0200 tests: Add bug_if() for VK_EXT_conditional_rendering radv bugs. Radv executes vkCmdResolveImage() and clears conditionally. 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2e4daf5..5177607 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31010,6 +31010,7 @@ static void test_conditional_rendering(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + bug_if(is_radv_device(context.device)) todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); release_resource_readback(&rb); @@ -31244,6 +31245,7 @@ static void test_conditional_rendering(void) D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list); + bug_if(is_radv_device(context.device)) todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0); release_resource_readback(&rb);

1 0

Józef Kucia : tests: Add more tests for predicated rendering.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: vkd3d Branch: master Commit: aa341b42d76facbdc1f03b6a8f209e4f277e56ae URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aa341b42d76facbdc1f03b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:21 2019 +0200 tests: Add more tests for predicated rendering. 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 | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1eec922..2e4daf5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30883,6 +30883,7 @@ static void prepare_instanced_draw(struct test_context *context) static void test_conditional_rendering(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + ID3D12Resource *conditions, *upload_buffer; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; @@ -30895,7 +30896,6 @@ static void test_conditional_rendering(void) struct test_context context; ID3D12Resource *buffer, *cb; struct resource_readback rb; - ID3D12Resource *conditions; ID3D12CommandQueue *queue; unsigned int i; uint32_t value; @@ -30976,7 +30976,7 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, @@ -30992,6 +30992,8 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, + sizeof(uint64_t), D3D12_PREDICATION_OP_EQUAL_ZERO); check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); reset_command_list(command_list, context.allocator); @@ -31099,6 +31101,26 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* SetPredication() and upload buffer. */ + upload_buffer = create_upload_buffer(context.device, sizeof(predicate_args), predicate_args); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + /* Skip. */ + ID3D12GraphicsCommandList_SetPredication(command_list, upload_buffer, + 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetPredication(command_list, upload_buffer, + 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + 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, 0xffffffff, 0); + + 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); + /* ExecuteIndirect(). */ buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args); @@ -31300,6 +31322,7 @@ static void test_conditional_rendering(void) ID3D12Resource_Release(conditions); ID3D12Resource_Release(cb); ID3D12Resource_Release(buffer); + ID3D12Resource_Release(upload_buffer); ID3D12RootSignature_Release(root_signature); ID3D12PipelineState_Release(pipeline_state); destroy_test_context(&context);

1 0

Józef Kucia : tests: Remove tests for DXGI_FORMAT_B8G8R8A8_UNORM UAV support.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: vkd3d Branch: master Commit: 807315c20f9ff0d201f8f64c1cef64b0a5d84056 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=807315c20f9ff0d201f8f64… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:20 2019 +0200 tests: Remove tests for DXGI_FORMAT_B8G8R8A8_UNORM UAV support. UAV support for B8G8R8A8_UNORM appears to be present even on feature level 11_0 on newer Windows versions. 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 | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5a870d9..1eec922 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1184,8 +1184,6 @@ static void test_format_support(void) /* A recent version of WARP suppots B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ {{DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, - {{DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, - D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, }; if (!(device = create_device())) @@ -1797,26 +1795,6 @@ static void test_create_committed_resource(void) &IID_ID3D12Resource, (void **)&resource); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - /* DXGI_FORMAT_B8G8R8A8_UNORM does not support D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS. */ - heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; - resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; - resource_desc.Alignment = 0; - resource_desc.Width = 32; - resource_desc.Height = 32; - resource_desc.DepthOrArraySize = 1; - resource_desc.MipLevels = 1; - resource_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; - resource_desc.SampleDesc.Count = 1; - resource_desc.SampleDesc.Quality = 0; - resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; - resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; - hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, - &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, - &IID_ID3D12Resource, (void **)&resource); - todo ok(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12Resource_Release(resource); - heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD; resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;

1 0

Józef Kucia : tests: Add more tests for D3D12_FEATURE_FORMAT_INFO.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: vkd3d Branch: master Commit: 579abe987d1cc000c04b20d2f6e77646d993ec01 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=579abe987d1cc000c04b20d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:19 2019 +0200 tests: Add more tests for D3D12_FEATURE_FORMAT_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.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c3931b9..5a870d9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -975,8 +975,11 @@ static void test_check_feature_support(void) D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; D3D12_FEATURE_DATA_FORMAT_INFO format_info; + unsigned int expected_plane_count; ID3D12Device *device; + DXGI_FORMAT format; ULONG refcount; + bool is_todo; HRESULT hr; static const D3D_FEATURE_LEVEL all_feature_levels[] = @@ -1096,21 +1099,58 @@ static void test_check_feature_support(void) ok(format_info.Format == DXGI_FORMAT_UNKNOWN, "Got unexpected format %#x.\n", format_info.Format); ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); - memset(&format_info, 0, sizeof(format_info)); - format_info.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, - &format_info, sizeof(format_info)); - ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); - ok(format_info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected format %#x.\n", format_info.Format); - ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + vkd3d_test_set_context("format %#x", format); - memset(&format_info, 0, sizeof(format_info)); - format_info.Format = DXGI_FORMAT_R24G8_TYPELESS; - hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, - &format_info, sizeof(format_info)); - ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); - ok(format_info.Format == DXGI_FORMAT_R24G8_TYPELESS, "Got unexpected format %#x.\n", format_info.Format); - ok(format_info.PlaneCount == 2, "Got unexpected plane count %u.\n", format_info.PlaneCount); + switch (format) + { + case DXGI_FORMAT_R32G8X24_TYPELESS: + case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: + case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: + case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT: + case DXGI_FORMAT_D24_UNORM_S8_UINT: + case DXGI_FORMAT_R24G8_TYPELESS: + case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: + case DXGI_FORMAT_X24_TYPELESS_G8_UINT: + case DXGI_FORMAT_NV12: + case DXGI_FORMAT_P010: + case DXGI_FORMAT_P016: + case DXGI_FORMAT_NV11: + expected_plane_count = 2; + break; + default: + expected_plane_count = 1; + break; + } + + is_todo = format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP + || format == DXGI_FORMAT_R8G8_B8G8_UNORM + || format == DXGI_FORMAT_G8R8_G8B8_UNORM + || format == DXGI_FORMAT_B5G6R5_UNORM + || format == DXGI_FORMAT_B5G5R5A1_UNORM + || format == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM + || (DXGI_FORMAT_AYUV <= format && format <= DXGI_FORMAT_B4G4R4A4_UNORM); + + memset(&format_info, 0, sizeof(format_info)); + format_info.Format = format; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, + &format_info, sizeof(format_info)); + + if (format == DXGI_FORMAT_R1_UNORM) + { + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + continue; + } + + todo_if(is_todo) + ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); + ok(format_info.Format == format, "Got unexpected format %#x.\n", format_info.Format); + todo_if(is_todo) + ok(format_info.PlaneCount == expected_plane_count, + "Got plane count %u, expected %u.\n", format_info.PlaneCount, expected_plane_count); + } + vkd3d_test_set_context(NULL); /* GPU virtual address */ memset(&gpu_virtual_address, 0, sizeof(gpu_virtual_address));

1 0

Józef Kucia : vkd3d: Implement D3D12_FEATURE_FORMAT_INFO.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: vkd3d Branch: master Commit: 69e73a6a8f9d30c46be1f3a8cb2875e607796852 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=69e73a6a8f9d30c46be1f3a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:18 2019 +0200 vkd3d: Implement D3D12_FEATURE_FORMAT_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> --- libs/vkd3d/device.c | 31 ++++++++ libs/vkd3d/utils.c | 192 ++++++++++++++++++++++----------------------- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 12 +-- 4 files changed, 134 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=69e73a6a8f9d30c46be…

1 0

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 June 2019