July 2021 - Wine-devel - list.winehq.org

[PATCH] shell32: Implement SHBindToObject.
by Dmitry Timoshkov 15 Jul '21

15 Jul '21

Based on SHBindToParent implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/pidl.c | 35 +++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 36 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e2746deb483..c831b6da6f7 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1333,6 +1333,41 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI return hr; } +HRESULT WINAPI SHBindToObject(IShellFolder *psf, LPCITEMIDLIST pidl, IBindCtx *pbc, REFIID riid, void **ppv) +{ + IShellFolder *psfDesktop = NULL; + HRESULT hr; + + TRACE_(shell)("%p,%p,%p,%s,%p\n", psf, pidl, pbc, debugstr_guid(riid), ppv); + pdump(pidl); + + if (!ppv) + return E_INVALIDARG; + + *ppv = NULL; + + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } + + if (_ILIsPidlSimple(pidl)) + /* we are on desktop level */ + hr = IShellFolder_QueryInterface(psf, riid, ppv); + else + hr = IShellFolder_BindToObject(psf, pidl, pbc, riid, ppv); + + if (psfDesktop) + IShellFolder_Release(psfDesktop); + + TRACE_(shell)("-- ppv=%p ret=0x%08x\n", *ppv, hr); + return hr; +} + + /************************************************************************* * SHParseDisplayName [SHELL32.@] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index d4571212cee..f8bf8f246e8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -332,6 +332,7 @@ @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) @ stdcall SHAssocEnumHandlers(wstr long ptr) +@ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) -- 2.31.1

1 0

[PATCH 00/10] Beefing up tests for dbghelp (v2)
by Eric Pouech 15 Jul '21

15 Jul '21

The following series beefs up the tests about dbghelp DLL and fixes a couple of bugs in dbghelp. The idea is to have a set of files to get debug info from (debuggee*.*). This is supported in two different ways: A) to be compiled directly inside dbghelp_test: the default tools and options used in Wine will be covered (now: cross compile + dwarf version 2 debug format) B) but also the ability to run the same tests on an external process + image (made mainly out of the debuggee*.* only files). The idea is of course to use different compilers, debug format, options, 32/64bit targets... Those alternate images **ARE NOT** part (for now) of winetest. Unfortunately, with Winetest Bot, the A) won't work under windows: debug format of dbghelp_test.exe is dwarf2, while native dbghelp doesn't support it. So the tests are skipped. Anyway, most of the Windows setup:s don't have native dbghelp.dll installed <g>, so that shouldn't change much. I locally test every patch with: - A) on 32bit Wine (mingw + dwarf2) - A) on 64bit Wine (mingw + dwarf2) - A) on Windows10 as PE64 (msc + pdb) - B) image: mingw + dwarf2 + target=PE64bit + option -O1 on 64bit Wine - B) image: mingw + dwarf2 + target=PE32bit + option -O1 on 32bit Wine - B) image: ms compiler + pdb + target=PE64bit + option /O1 on 64 bit Wine This serie will be continued with: 1) more tests (and more fixes) (around 20+ patches to come) 2) support of dwarf3 and 4 (around 70+ patches to come) I also plan to add more local tests (dwarf3 and dwarf4; WoW; PE32 + pdb on Wine, cross 32/64 bit between tester and debuggee, other options O2). Changes introduced in v2: - make sure that dbghelp_test.exe embedded as resource inside winetest.exe isn't stripped, so that on can access its debug information. tools/makedep.c is fixed accordingly. This should fix all the TestBot failures. - the existing tests (before this series) for dbghelp, could somehow work when no debug information is available. Make sure we don't change this behavior (v1 was skipping those tests when no debug info is avail) A+ --- Eric Pouech (10): tools/makedep: added support for not stripping some test modules dbghelp/tests: Added dedicated structure to control the debuggee dbghelp/tests: Added ability to launch an external process instead of debugging self dbghelp/tests: Now properly getting base of main module inside debuggee structure dbghelp/tests: Added two new compilation units (debuggee1.c and debuggee2.c) dbghelp/tests: now building inside each debuggee a manifest dbghelp/tests: StackWalk64 testing now support external process dbghelp/tests: Added tests about getting symbol information dbghelp: returns name of compiland in SymGetTypeInfo dbghelp: handling of complex location in dwarf dlls/dbghelp/dwarf.c | 1 - dlls/dbghelp/tests/Makefile.in | 4 +- dlls/dbghelp/tests/dbghelp.c | 547 +++++++++++++++++++++++++++++++-- dlls/dbghelp/tests/debuggee.h | 30 ++ dlls/dbghelp/tests/debuggee1.c | 115 +++++++ dlls/dbghelp/tests/debuggee2.c | 7 + dlls/dbghelp/type.c | 3 +- tools/makedep.c | 11 +- 8 files changed, 673 insertions(+), 45 deletions(-) create mode 100644 dlls/dbghelp/tests/debuggee.h create mode 100644 dlls/dbghelp/tests/debuggee1.c create mode 100644 dlls/dbghelp/tests/debuggee2.c

1 10

[PATCH v2] include: Updated _IMAGEHLP_MODULEW64 stucture
by Alistair Leslie-Hughes 15 Jul '21

15 Jul '21

This aligns the structure to the be the same found in the 10.0.19041.0 SDK. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 1b234899195..303c0109d1f 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -280,6 +280,8 @@ typedef struct _IMAGEHLP_MODULE64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; typedef struct _IMAGEHLP_MODULEW64 @@ -307,6 +309,8 @@ typedef struct _IMAGEHLP_MODULEW64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; #if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) -- 2.30.2

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Find bindings for descriptor arrays.
by Conor McCarthy 15 Jul '21

15 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 51 +++++++++++++++++++++++++++------------ tests/d3d12.c | 1 + 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bd231124..61f0d903 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2460,15 +2460,28 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_dxbc_compiler_error(struct vkd3d_dxbc_ compiler->failed = true; } +#define RANGE_STRING_SIZE 24 + +static void register_range_format_string(char range_str[RANGE_STRING_SIZE], + const struct vkd3d_shader_register_range *range) +{ + if (range->last != ~0u) + sprintf(range_str, "[%u:%u]", range->first, range->last); + else + sprintf(range_str, "[%u:*]", range->first); +} + static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor_binding( struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, - bool is_uav_counter) + bool is_uav_counter, unsigned int *binding_base_idx) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; + unsigned int register_last = (range->last == ~0u) ? range->first : range->last; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; + char range_str[RANGE_STRING_SIZE]; unsigned int i; if (reg->type == VKD3DSPR_CONSTBUFFER) @@ -2519,6 +2532,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor range->first, range->space, current->binding.count); } + *binding_base_idx = current->register_index; return current->binding; } if (shader_interface->uav_counter_count) @@ -2541,31 +2555,26 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor continue; if (current->type != descriptor_type || current->register_space != range->space - || current->register_index != range->first) + || current->register_index > range->first + || current->binding.count <= register_last - current->register_index) continue; - if (current->binding.count != 1) - { - FIXME("Descriptor arrays are not supported.\n"); - vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING, - "Descriptor binding for type %#x, space %u, register %u, " - "shader type %#x has unsupported ‘count’ %u.", - descriptor_type, range->space, range->first, compiler->shader_type, current->binding.count); - } - + *binding_base_idx = current->register_index; return current->binding; } if (shader_interface->binding_count) { - FIXME("Could not find binding for type %#x, space %u, register %u, shader type %#x.\n", - descriptor_type, range->space, range->first, compiler->shader_type); + register_range_format_string(range_str, range); + FIXME("Could not find descriptor binding for type %#x, space %u, registers %s, shader type %#x.\n", + descriptor_type, range->space, range_str, compiler->shader_type); vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND, - "Could not find descriptor binding for type %#x, space %u, register %u, shader type %#x.", - descriptor_type, range->space, range->first, compiler->shader_type); + "Could not find descriptor binding for type %#x, space %u, registers %s, shader type %#x.", + descriptor_type, range->space, range_str, compiler->shader_type); } } done: + *binding_base_idx = range->first; binding.set = 0; binding.count = 1; binding.binding = compiler->binding_idx++; @@ -2586,8 +2595,18 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxb enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) { struct vkd3d_shader_descriptor_binding binding; + unsigned int binding_base_idx; - binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range, resource_type, is_uav_counter); + binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range, + resource_type, is_uav_counter, &binding_base_idx); + if (binding_base_idx != range->first) + { + FIXME("Descriptor arrays are not supported.\n"); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING, + "Descriptor binding for type %#x, space %u, register %u, " + "shader type %#x has unsupported base index %u.", + reg->type, range->space, range->first, compiler->shader_type, binding_base_idx); + } vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 4397c063..424a57cf 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33996,6 +33996,7 @@ static void test_resource_arrays(void) get_cpu_descriptor_handle(&context, heap, ARRAY_SIZE(input_buffers) + i)); } + todo context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, shader_bytecode(cs_code, sizeof(cs_code))); if (!context.pipeline_state) -- 2.31.1

3 9

[PATCH] include: Updated _IMAGEHLP_MODULEW64 stucture
by Alistair Leslie-Hughes 15 Jul '21

15 Jul '21

This aligns the structure to the be the same found in the 10.0.19041.0 SDK. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 1b234899195..5c1492b260a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -307,6 +307,8 @@ typedef struct _IMAGEHLP_MODULEW64 BOOL TypeInfo; BOOL SourceIndexed; BOOL Publics; + DWORD MachineType; + DWORD Reserved; } IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; #if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) -- 2.30.2

1 0

[PATCH] ntdll: Fix locale detection on Mac.
by Brendan Shanks 14 Jul '21

14 Jul '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Currently on Mac, WINELOCALE is set to a string like 'de_DE', but locale_to_lcid() in kernelbase expects a Windows locale like 'de-DE', and a fallback English locale is used. Alternately, unix_to_win_locale() could be used to convert the generated locale_string, but it seems sufficient to just generate the string with a hyphen. dlls/ntdll/unix/env.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index b405624d7fb..e90bfbf171e 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1085,7 +1085,7 @@ static void init_locale(void) CFStringRef locale_string; if (country) - locale_string = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@_%@"), lang, country); + locale_string = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@-%@"), lang, country); else locale_string = CFStringCreateCopy(NULL, lang); @@ -1114,7 +1114,7 @@ static void init_locale(void) country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); } if (country) - locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@_%@"), lang, country ); + locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country ); else locale_string = CFStringCreateCopy( NULL, lang ); CFStringGetCString( locale_string, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); -- 2.31.1

1 0

[PATCH] wined3d: Recursively acquire queued command lists in wined3d_cs_acquire_command_list().
by Zebediah Figura 14 Jul '21

14 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/cs.c | 3 +++ dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3593e5bfb48..6e4517d6ec8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2403,6 +2403,9 @@ static void wined3d_cs_acquire_command_list(struct wined3d_device_context *conte for (i = 0; i < list->resource_count; ++i) wined3d_resource_acquire(list->resources[i]); + + for (i = 0; i < list->command_list_count; ++i) + wined3d_cs_acquire_command_list(context, list->command_lists[i]); } static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36fdf56a73c..952c10d6a71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4120,7 +4120,8 @@ static inline void wined3d_resource_acquire(struct wined3d_resource *resource) static inline void wined3d_resource_release(struct wined3d_resource *resource) { - InterlockedDecrement(&resource->access_count); + LONG refcount = InterlockedDecrement(&resource->access_count); + assert(refcount >= 0); } static inline HRESULT wined3d_resource_get_sub_resource_desc(struct wined3d_resource *resource, -- 2.30.2

2 1

[PATCH vkd3d 1/5] tests: Add tests for shader double-precision floating point instructions.
by Conor McCarthy 14 Jul '21

14 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 384 +++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 2 +- 2 files changed, 385 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index a84a8e28..c613ff4d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -41,6 +41,11 @@ struct ivec4 int x, y, z, w; }; +struct dvec2 +{ + double x, y; +}; + static bool compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2) { return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w; @@ -651,6 +656,21 @@ static bool is_memory_pool_L1_supported(ID3D12Device *device) return !architecture.UMA; } +static bool is_shader_float64_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return false; + } + + return options.DoublePrecisionFloatShaderOps; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -7510,6 +7530,7 @@ static void test_shader_instructions(void) D3D12_SHADER_BYTECODE shader; struct test_context context; ID3D12CommandQueue *queue; + bool test_shader_float64; ID3D12Resource *cb; unsigned int i; HRESULT hr; @@ -9054,6 +9075,322 @@ static void test_shader_instructions(void) 0x00100e46, 0x00000001, 0x0100003e, }; static struct named_shader ps_swapc5 = {"swapc5", ps_swapc5_code, sizeof(ps_swapc5_code)}; + static const DWORD ps_dmov_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + asuint(-src0.y, dst.x, dst.y); + asuint(-src0.x, dst.z, dst.w); + } +#endif + 0x43425844, 0x16bd7e63, 0x6b535ab7, 0xb7f182c2, 0x6f3819a8, 0x00000001, 0x000000f0, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000e0, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, + 0x00000019, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x070000c7, 0x001000f2, 0x00000000, 0x802084e6, 0x00000041, + 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, + 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dmov = {"dmov", ps_dmov_code, sizeof(ps_dmov_code)}; + static const DWORD ps_dadd_code[] = + { + /* Also test constant double2 vector. */ +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + double2 a = double2(src0 + 1.0000002433080226l, src0 + 2.000000481493771l); + asuint(a.x, dst.x, dst.y); + asuint(a.y, dst.z, dst.w); + } +#endif + 0x43425844, 0x23e20252, 0xf4d2708e, 0x87956944, 0xc61e7052, 0x00000001, 0x00000100, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000f0, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, + 0x0000001d, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x0b0000bf, 0x001000f2, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x00005002, 0x41500000, 0x3ff00000, 0x40a00000, 0x40000000, 0x05000036, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dadd = {"dadd", ps_dadd_code, sizeof(ps_dadd_code)}; + static const DWORD ps_dmin_dmax_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + asuint(min(src0.x, src0.y), dst.x, dst.y); + asuint(max(src0.x, src0.y), dst.z, dst.w); + } +#endif + 0x43425844, 0x6f8b547e, 0x3552757c, 0x92a81fa1, 0x00990b21, 0x00000001, 0x00000130, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000120, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050, + 0x00000029, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c1, 0x00100032, 0x00000000, 0x00208ee6, 0x00000000, + 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046, + 0x00000000, 0x090000c0, 0x00100032, 0x00000000, 0x00208ee6, 0x00000000, 0x00000000, 0x00208446, + 0x00000000, 0x00000000, 0x05000036, 0x001020c2, 0x00000000, 0x00100406, 0x00000000, 0x0100003e, + 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dmin_dmax = {"dmin_dmax", ps_dmin_dmax_code, sizeof(ps_dmin_dmax_code)}; + static const DWORD ps_dmovc_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + double2 a = src0.x > 1.0 ? src0 : double2(4.5, 4.5); + asuint(a.x, dst.x, dst.y); + asuint(a.y, dst.z, dst.w); + } +#endif + 0x43425844, 0xe3bae03a, 0x16178729, 0xc59e7f4a, 0x218fecac, 0x00000001, 0x00000134, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000124, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a8, 0x00000050, + 0x0000002a, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x0b0000c5, 0x00100012, 0x00000000, 0x00005002, 0x00000000, + 0x3ff00000, 0x00000000, 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x0d0000c8, 0x001000f2, + 0x00000000, 0x00100006, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00005002, 0x00000000, + 0x40120000, 0x00000000, 0x40120000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dmovc = {"dmovc", ps_dmovc_code, sizeof(ps_dmovc_code)}; + static const DWORD ps_dmodifier_code[] = + { + /* Already tested negation in the dmov test. */ +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + asuint(abs(src0), dst.x, dst.y); + asuint(saturate(src0) + 1.5, dst.z, dst.w); + } +#endif + 0x43425844, 0x15bb537e, 0x47ef3ae3, 0xba88acf7, 0x0b3624e0, 0x00000001, 0x00000144, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000134, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000b8, 0x00000050, + 0x0000002e, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060020c7, 0x00100032, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x0a0000bf, 0x00100032, 0x00000000, 0x00100446, 0x00000000, 0x00005002, 0x00000000, + 0x3ff80000, 0x00000000, 0x00000000, 0x05000036, 0x001020c2, 0x00000000, 0x00100406, 0x00000000, + 0x070000c7, 0x00100032, 0x00000000, 0x80208446, 0x00000081, 0x00000000, 0x00000000, 0x05000036, + 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, + 0x00000000, + }; + static struct named_shader ps_dmodifier = {"dmodifier", ps_dmodifier_code, sizeof(ps_dmodifier_code)}; + static const DWORD ps_deq_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + dst = (uint4)0; + if (src0.x == src0.y) + dst.x = 0xffffffff; + } +#endif + 0x43425844, 0x24c9cee6, 0xd38c521f, 0xcde7c8b6, 0xc173a8e3, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, + 0x00000023, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c3, 0x00100012, 0x00000000, 0x00208ee6, 0x00000000, + 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, + 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_deq = {"deq", ps_deq_code, sizeof(ps_deq_code)}; + static const DWORD ps_dne_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + dst = (uint4)0; + if (src0.x != src0.y) + dst.x = 0xffffffff; + } +#endif + 0x43425844, 0x99700929, 0x3b743000, 0xdfc89958, 0xfc2b89ab, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, + 0x00000023, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c6, 0x00100012, 0x00000000, 0x00208ee6, 0x00000000, + 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, + 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dne = {"dne", ps_dne_code, sizeof(ps_dne_code)}; + static const DWORD ps_dtou_code[] = + { +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + dst = uint4(src0, -src0, 0, 0); + } +#endif + 0x43425844, 0x6ca74abd, 0xe970e02d, 0xa65b35db, 0xd2f58586, 0x00000001, 0x00000128, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000118, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000009c, 0x00000050, + 0x00000027, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000d7, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x070000d7, 0x00100022, 0x00000000, 0x80208446, 0x00000041, 0x00000000, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, + 0x00000021, 0x00000000, + }; + static struct named_shader ps_dtou = {"dtou", ps_dtou_code, sizeof(ps_dtou_code)}; + static const DWORD ps_dtoi_code[] = + { +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + dst = int4(src0, -src0, 0, 0); + } +#endif + 0x43425844, 0x38d82727, 0x8666b36c, 0x91954b7e, 0xf376163a, 0x00000001, 0x00000128, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000118, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000009c, 0x00000050, + 0x00000027, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000d6, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x070000d6, 0x00100022, 0x00000000, 0x80208446, 0x00000041, 0x00000000, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, + 0x00000021, 0x00000000, + }; + static const struct named_shader ps_dtoi = {"dtoi", ps_dtoi_code, sizeof(ps_dtoi_code)}; + static const DWORD ps_utod_code[] = + { +#if 0 + uint2 src0; + + void main(out uint4 dst : SV_Target) + { + double2 a = src0; + asuint(a.x, dst.x, dst.y); + asuint(a.y, dst.z, dst.w); + } +#endif + 0x43425844, 0x05733379, 0x8683d4b9, 0x718f0111, 0x28153519, 0x00000001, 0x000000ec, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000dc, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, + 0x00000018, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000d9, 0x001000f2, 0x00000000, 0x00208046, 0x00000000, + 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000021, 0x00000000, + }; + static struct named_shader ps_utod = {"utod", ps_utod_code, sizeof(ps_utod_code)}; + static const DWORD ps_itod_code[] = + { +#if 0 + int2 src0; + + void main(out uint4 dst : SV_Target) + { + double2 a = src0; + asuint(a.x, dst.x, dst.y); + asuint(a.y, dst.z, dst.w); + } +#endif + 0x43425844, 0xbf96ef6f, 0x3ca9fd26, 0xd9b5cfc6, 0x4ef98f41, 0x00000001, 0x000000ec, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000dc, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, + 0x00000018, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000d8, 0x001000f2, 0x00000000, 0x00208046, 0x00000000, + 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000021, 0x00000000, + }; + static struct named_shader ps_itod = {"itod", ps_itod_code, sizeof(ps_itod_code)}; + static const DWORD ps_ftod_code[] = + { +#if 0 + float2 src0; + + void main(out uint4 dst : SV_Target) + { + double2 a = double2(src0.x, -src0.y); + asuint(a.x, dst.x, dst.y); + asuint(a.y, dst.z, dst.w); + } +#endif + 0x43425844, 0xef37cacc, 0x9ff35467, 0x0c9af3ed, 0x01e295eb, 0x00000001, 0x00000108, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000f8, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000007c, 0x00000050, + 0x0000001f, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000ca, 0x00100032, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x070000ca, 0x001000c2, 0x00000000, 0x8020801a, 0x00000041, 0x00000000, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, + 0x00000001, 0x00000000, + }; + static struct named_shader ps_ftod = {"ftod", ps_ftod_code, sizeof(ps_ftod_code)}; + static const DWORD ps_ddiv_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + asuint(src0.x / src0.y, dst.x, dst.y); + asuint(src0.y / src0.x, dst.z, dst.w); + } +#endif + 0x43425844, 0x6570ff79, 0xe1fd64a5, 0xb44313bb, 0xb5fdfa06, 0x00000001, 0x000000f8, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000e8, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000006c, 0x00000050, + 0x0000001b, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000d2, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, + 0x00000000, 0x002084e6, 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000021, 0x00000000, + }; + static const struct named_shader ps_ddiv = {"ddiv", ps_ddiv_code, sizeof(ps_ddiv_code)}; + static const DWORD ps_drcp_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + double2 a = rcp(src0); + asuint(a.x, dst.x, dst.y); + asuint(a.y, dst.z, dst.w); + } +#endif + 0x43425844, 0xdcbd25ba, 0x2d5cccb9, 0x84ed8028, 0x3d62632a, 0x00000001, 0x000000ec, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000dc, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, + 0x00000018, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000d4, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, + 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000021, 0x00000000, + }; + static struct named_shader ps_drcp = {"drcp", ps_drcp_code, sizeof(ps_drcp_code)}; static const struct { const struct named_shader *ps; @@ -9290,13 +9627,22 @@ static void test_shader_instructions(void) struct vec4 src1; struct vec4 src2; } f; + struct + { + struct dvec2 src0; + struct dvec2 src1; + struct dvec2 src2; + } d; } input; union { struct uvec4 u; struct ivec4 i; struct vec4 f; + struct dvec2 d; } output; + bool is_float64; + bool is_todo; bool skip_on_warp; } uint_tests[] = @@ -9526,6 +9872,31 @@ static void test_shader_instructions(void) {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}}, {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}}, + {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true, true}, + {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true, true}, + {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true, true}, + {&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5, 4.5}}, true, true}, + {&ps_dmovc, {.d = {{1.5, 0.0}}}, {.d = {1.5, 0.0}}, true, true}, + {&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true, true}, + {&ps_dmodifier, {.d = {{-1.5, 0.0}}}, {.d = {1.5f, 1.5f}}, true, true}, + {&ps_deq, {.d = {{0.0, 0.0}}}, {{0xffffffff}}, true, true}, + {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true, true}, + {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true}, + {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true, true}, + {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, true}, + {&ps_dtou, {.d = {{ NAN}}}, {{ 0, 0 }}, true, true}, + {&ps_dtou, {.d = {{-INFINITY}}}, {{ 0, ~0u}}, true, true}, + {&ps_dtou, {.d = {{ INFINITY}}}, {{~0u, 0 }}, true, true}, + {&ps_dtou, {.d = {{ -1.0}}}, {{ 0, 1 }}, true, true}, + {&ps_dtou, {.d = {{ 1.0}}}, {{ 1, 0 }}, true, true}, + {&ps_dtoi, {.d = {{ 1.0}}}, {.i = {1, -1}}, true, true}, + {&ps_utod, {.u = {{3, 0xffffffff}}}, {.d = {3.0, 4294967295.0}}, true, true}, + {&ps_itod, {.u = {{3, INT_MIN}}}, {.d = {3.0, -2147483648.0}}, true, true}, + {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true, true}, + {&ps_ddiv, {.d = {{ 2.0, 4.0}}}, {.d = { 0.5, 2.0}}, true, true}, + {&ps_ddiv, {.d = {{ 2.0, -4.0}}}, {.d = {-0.5, -2.0}}, true, true}, + {&ps_drcp, {.d = {{ 2.0, -0.5}}}, {.d = { 0.5, -2.0}}, true, true}, + { &ps_swapc0, {{{0, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}}, @@ -9818,6 +10189,7 @@ static void test_shader_instructions(void) return; command_list = context.list; queue = context.queue; + test_shader_float64 = is_shader_float64_supported(context.device); context.root_signature = create_cb_root_signature(context.device, 0, D3D12_SHADER_VISIBILITY_PIXEL, D3D12_ROOT_SIGNATURE_FLAG_NONE); @@ -9888,6 +10260,12 @@ static void test_shader_instructions(void) continue; } + if (uint_tests[i].is_float64 && !test_shader_float64) + { + skip("Skipping shader '%s' float64 test.\n", uint_tests[i].ps->name); + continue; + } + if (current_ps != uint_tests[i].ps) { if (context.pipeline_state) @@ -9895,8 +10273,14 @@ static void test_shader_instructions(void) current_ps = uint_tests[i].ps; shader.pShaderBytecode = current_ps->code; shader.BytecodeLength = current_ps->size; + todo_if(uint_tests[i].is_todo) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &shader, NULL); + if (!context.pipeline_state) + { + current_ps = NULL; + continue; + } } update_buffer_data(cb, 0, sizeof(uint_tests[i].input), &uint_tests[i].input); diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index a1e039de..5fe6f1ef 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -836,7 +836,7 @@ static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Devi const D3D12_INPUT_LAYOUT_DESC *input_layout) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pipeline_state_desc; - ID3D12PipelineState *pipeline_state; + ID3D12PipelineState *pipeline_state = NULL; HRESULT hr; init_pipeline_state_desc(&pipeline_state_desc, root_signature, rt_format, vs, ps, input_layout); -- 2.31.1

3 12

POSIX shared memory between regular Linux and Wine processes?
by Sebastian M. Ernst 14 Jul '21

14 Jul '21

Hi all, I could not find documentation and/or a working example, but a couple of "unfinished" discussions on the subject: Is it feasible / possible in any way, shape or form to literally share memory between a regular Linux process and a Wine process (on top of Linux) via POSIX shared memory? I am specifically talking about the `shmat`, `shmctl`, `shmdt` and `shmget` system calls. Has anyone around here ever done something like this? Thanks, Sebastian [1] https://en.wikipedia.org/wiki/Shared_memory#Support_on_Unix-like_systems

2 3

[PATCH vkd3d] tests: Use D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT in test_uav_counters().
by Conor McCarthy 14 Jul '21

14 Jul '21

CounterOffsetInBytes must be a multiple of the required alignment, and must be zero if no counter buffer is specified. This allows the test to succeed in Windows. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3892c1db..ad5b03c0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21671,7 +21671,8 @@ static void test_uav_counters(void) 0x00000001, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e, }; - static const unsigned int counter_offsets[] = {0, 1, 255}; + static const unsigned int counter_offsets[] = {0, D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT, + D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT * 2}; if (!init_compute_test_context(&context)) return; @@ -21702,7 +21703,7 @@ static void test_uav_counters(void) D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); out_buffer = create_default_buffer(device, 1024, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - counter_buffer = create_default_buffer(device, 1024, + counter_buffer = create_default_buffer(device, D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT * 2 + sizeof(uint32_t), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); for (i = 0; i < ARRAY_SIZE(counter_offsets); ++i) @@ -21720,15 +21721,14 @@ static void test_uav_counters(void) uav_desc.Buffer.NumElements = 256; uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; - uav_desc.Buffer.CounterOffsetInBytes = counter_offsets[i] * sizeof(uint32_t); - ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, - get_cpu_descriptor_handle(&context, descriptor_heap, 0)); ID3D12Device_CreateUnorderedAccessView(device, out_buffer, NULL, &uav_desc, get_cpu_descriptor_handle(&context, descriptor_heap, 1)); + uav_desc.Buffer.CounterOffsetInBytes = counter_offsets[i]; + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, descriptor_heap, 0)); counter = 0; - upload_buffer_data(counter_buffer, counter_offsets[i] * sizeof(uint32_t), - sizeof(counter), &counter, queue, command_list); + upload_buffer_data(counter_buffer, counter_offsets[i], sizeof(counter), &counter, queue, command_list); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, counter_buffer, 0, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); @@ -21801,8 +21801,7 @@ static void test_uav_counters(void) id[j] = 0xdeadbeef; upload_buffer_data(buffer, 0, counter * sizeof(*id), id, queue, command_list); reset_command_list(command_list, context.allocator); - upload_buffer_data(counter_buffer, counter_offsets[i] * sizeof(uint32_t), - sizeof(counter), &counter, queue, command_list); + upload_buffer_data(counter_buffer, counter_offsets[i], sizeof(counter), &counter, queue, command_list); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, counter_buffer, 0, -- 2.31.1

2 1