March 2022 - Wine-commits - list.winehq.org

Conor McCarthy : vkd3d: Write a resource null descriptor to all applicable sets when one set is written.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: vkd3d Branch: master Commit: e3045090a80ef8ede7a71cb28ebae41d34b5e3d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e3045090a80ef8ede7a71cb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 14:36:10 2022 +1000 vkd3d: Write a resource null descriptor to all applicable sets when one set is written. Binding a shader with the wrong null descriptor type works in Windows. The introduction of Vulkan-backed heaps may cause a regression in clients which do this, because the written index will remain unpopulated in all other sets, but a shader may access it in one of them. 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 | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 38fd632b..68c28cd1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2131,6 +2131,7 @@ void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) vkd3d_view_destroy(view, device); } +/* TODO: write null descriptors to all applicable sets (invalid behaviour workaround). */ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descriptor_heap_vk_set *descriptor_set, struct d3d12_desc_copy_location *locations, unsigned int write_count) { @@ -2178,6 +2179,47 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip } } +static void d3d12_desc_write_vk_heap_null_descriptor(struct d3d12_descriptor_heap *descriptor_heap, + uint32_t dst_array_element, const struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct d3d12_descriptor_heap_vk_set *descriptor_set; + VkBufferView vk_buffer_view = VK_NULL_HANDLE; + enum vkd3d_vk_descriptor_set_index i; + VkDescriptorBufferInfo vk_cbv_info; + + vk_cbv_info.buffer = VK_NULL_HANDLE; + vk_cbv_info.offset = 0; + vk_cbv_info.range = VK_WHOLE_SIZE; + + /* Binding a shader with the wrong null descriptor type works in Windows. + * To support that here we must write one to all applicable Vulkan sets. */ + for (i = VKD3D_SET_INDEX_UNIFORM_BUFFER; i <= VKD3D_SET_INDEX_STORAGE_IMAGE; ++i) + { + descriptor_set = &descriptor_heap->vk_descriptor_sets[i]; + descriptor_set->vk_descriptor_writes[0].dstArrayElement = dst_array_element; + descriptor_set->vk_descriptor_writes[0].descriptorCount = 1; + switch (i) + { + case VKD3D_SET_INDEX_UNIFORM_BUFFER: + descriptor_set->vk_descriptor_writes[0].pBufferInfo = &vk_cbv_info; + break; + case VKD3D_SET_INDEX_SAMPLED_IMAGE: + case VKD3D_SET_INDEX_STORAGE_IMAGE: + descriptor_set->vk_image_infos[0].imageView = VK_NULL_HANDLE; + break; + case VKD3D_SET_INDEX_UNIFORM_TEXEL_BUFFER: + case VKD3D_SET_INDEX_STORAGE_TEXEL_BUFFER: + descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &vk_buffer_view; + break; + default: + assert(false); + break; + } + VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); + } +} + /* dst and src contain the same data unless another thread overwrites dst. The array index is * calculated from dst, and src is thread safe. */ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct d3d12_desc *src, @@ -2186,6 +2228,7 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct struct d3d12_descriptor_heap_vk_set *descriptor_set; struct d3d12_descriptor_heap *descriptor_heap; const struct vkd3d_vk_device_procs *vk_procs; + bool is_null = false; descriptor_heap = vkd3d_gpu_descriptor_allocator_heap_from_descriptor(&device->gpu_descriptor_allocator, dst); descriptor_set = &descriptor_heap->vk_descriptor_sets[vkd3d_vk_descriptor_set_index_from_vk_descriptor_type( @@ -2201,14 +2244,16 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct { case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: descriptor_set->vk_descriptor_writes[0].pBufferInfo = &src->u.vk_cbv_info; + is_null = !src->u.vk_cbv_info.buffer; break; case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - descriptor_set->vk_image_infos[0].imageView = src->u.view_info.view->u.vk_image_view; + is_null = !(descriptor_set->vk_image_infos[0].imageView = src->u.view_info.view->u.vk_image_view); break; case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &src->u.view_info.view->u.vk_buffer_view; + is_null = !src->u.view_info.view->u.vk_buffer_view; break; case VK_DESCRIPTOR_TYPE_SAMPLER: descriptor_set->vk_image_infos[0].sampler = src->u.view_info.view->u.vk_sampler; @@ -2217,6 +2262,14 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct ERR("Unhandled descriptor type %#x.\n", src->vk_descriptor_type); break; } + if (is_null && device->vk_info.EXT_robustness2) + { + d3d12_desc_write_vk_heap_null_descriptor(descriptor_heap, + descriptor_set->vk_descriptor_writes[0].dstArrayElement, device); + vkd3d_mutex_unlock(&descriptor_heap->vk_sets_mutex); + return; + } + VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); if (src->magic == VKD3D_DESCRIPTOR_MAGIC_UAV && src->u.view_info.view->vk_counter_view)

1 0

Conor McCarthy : vkd3d: Use Vulkan timeline semaphores for D3D12 fences.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: vkd3d Branch: master Commit: 22d86653003aeec7b919d0b58b2c0bb76438936e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22d86653003aeec7b919d0b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 15:56:00 2022 +0100 vkd3d: Use Vulkan timeline semaphores for D3D12 fences. D3D12 supports signalling a fence to a lower value, while Vulkan timeline semaphores do not. On the GPU side this is handled by simply submitting the signal anyway, if a test for this passes on device creation, because working around this is impractical. For CPU signals the Vulkan semaphore is replaced with a new one at the lower value only if no waits and/or signals are pending on the GPU. Otherwise, a fixme is emitted. Partly based on a vkd3d-proton patch by Hans-Kristian Arntzen (not including the handling of lower fence values). The old implementation is used if KHR_timeline_semaphore is not available or GPU signals do not work for a lower value. 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/command.c | 571 ++++++++++++++++++++++++++++++++++++++++++--- libs/vkd3d/device.c | 87 +++++++ libs/vkd3d/vkd3d_private.h | 30 +++ libs/vkd3d/vulkan_procs.h | 5 + tests/d3d12.c | 11 +- 5 files changed, 663 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=22d86653003aeec7b91…

1 0

Conor McCarthy : tests: Test signalling a fence to a lower value after a GPU wait.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: vkd3d Branch: master Commit: 889e5af5dd48e5c76747abe33dfe402d40182e40 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=889e5af5dd48e5c76747abe… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 15:56:01 2022 +0100 tests: Test signalling a fence to a lower value after a GPU wait. Ensures the new fence implementation using timeline semaphores handles this correctly. 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/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2059b182..486c0093 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33373,6 +33373,12 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xffff0000, 0); release_resource_readback(&rb); + /* signal to a lower value after a GPU wait was used (test timeline semaphore replacement) */ + hr = ID3D12Fence_Signal(fence, 0); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == 0, "Got unexpected value %"PRIu64".\n", value); + hr = ID3D12Fence_Signal(fence, 6); ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); update_buffer_data(cb, 0, sizeof(green), &green);

1 0

Alexandre Julliard : kernel32/tests: Fix codepage test for UTF-8 default codepage.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 273ab6c774ee41908b38eb6b2ca03f686eb44085 URL: https://source.winehq.org/git/wine.git/?a=commit;h=273ab6c774ee41908b38eb6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 18:31:12 2022 +0100 kernel32/tests: Fix codepage test for UTF-8 default codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 33eeebcc617..b0dbd812346 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1152,7 +1152,8 @@ static void test_threadcp(void) ret = GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); ok(ret, "GetCPInfoExA failed for lcid %04lx, error %ld\n", lcids[i].lcid, GetLastError()); if (lcids[i].threadcp) - ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04lx, should be %u\n", + ok(cpi.CodePage == lcids[i].threadcp || cpi.CodePage == CP_UTF8 /* Win10 1809+ */, + "wrong codepage %u for lcid %04lx, should be %u\n", cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); else ok(cpi.CodePage == acp || cpi.CodePage == CP_UTF8 /* Win10 1809+ */, @@ -1185,8 +1186,10 @@ static void test_threadcp(void) { SetThreadLocale(isleads[i].lcid); + GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads[i].testchar); - ok(islead == isleads[i].islead, "wrong islead %i for test char %x in lcid %04lx. should be %i\n", + ok(islead == isleads[i].islead || (cpi.CodePage == CP_UTF8 && !islead), + "wrong islead %i for test char %x in lcid %04lx. should be %i\n", islead, isleads[i].testchar, isleads[i].lcid, isleads[i].islead); }

1 0

Paul Gofman : d3dcompiler: Implement d3dcompiler_shader_reflection_GetThreadGroupSize().
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 47b9c450c6cc7f41205ad40cdd6942d4bc782b47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47b9c450c6cc7f41205ad40c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 23 13:58:15 2022 +0100 d3dcompiler: Implement d3dcompiler_shader_reflection_GetThreadGroupSize(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 92 ++++++++++++++++++++++++++++++++-- dlls/d3dcompiler_43/tests/reflection.c | 60 ++++++++++++++++++++++ 2 files changed, 148 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 91cc20cdded..787d0388f93 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -50,6 +50,12 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE #define D3DCOMPILER_SHADER_TARGET_VERSION_MASK 0xffff #define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK 0xffff0000 +#define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT 16 + +enum d3dcompiler_shader_type +{ + D3DCOMPILER_SHADER_TYPE_CS = 5, +}; struct d3dcompiler_shader_signature { @@ -158,6 +164,9 @@ struct d3dcompiler_shader_reflection D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_partitioning; D3D_TESSELLATOR_DOMAIN tessellator_domain; + UINT thread_group_size_x; + UINT thread_group_size_y; + UINT thread_group_size_z; struct d3dcompiler_shader_signature *isgn; struct d3dcompiler_shader_signature *osgn; @@ -707,9 +716,21 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMinFeatureLeve static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( ID3D11ShaderReflection *iface, UINT *sizex, UINT *sizey, UINT *sizez) { - FIXME("iface %p, sizex %p, sizey %p, sizez %p stub!\n", iface, sizex, sizey, sizez); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - return 0; + TRACE("iface %p, sizex %p, sizey %p, sizez %p.\n", iface, sizex, sizey, sizez); + + if (!sizex || !sizey || !sizez) + { + WARN("Invalid argument specified.\n"); + return E_INVALIDARG; + } + + *sizex = reflection->thread_group_size_x; + *sizey = reflection->thread_group_size_y; + *sizez = reflection->thread_group_size_z; + + return *sizex * *sizey * *sizez; } static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( @@ -1754,15 +1775,79 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * return S_OK; } +#define SM4_OPCODE_MASK 0xff +#define SM4_INSTRUCTION_LENGTH_SHIFT 24 +#define SM4_INSTRUCTION_LENGTH_MASK (0x1fu << SM4_INSTRUCTION_LENGTH_SHIFT) + +enum sm4_opcode +{ + SM5_OP_DCL_THREAD_GROUP = 0x9b, +}; + static HRESULT d3dcompiler_parse_shdr(struct d3dcompiler_shader_reflection *r, const char *data, size_t data_size) { + uint32_t opcode_token, opcode; + uint32_t size, shader_type; const char *ptr = data; + const uint32_t *u_ptr; + unsigned int len; r->version = read_u32(&ptr); TRACE("Shader version: %u\n", r->version); - /* todo: Check if anything else is needed from the shdr or shex blob. */ + shader_type = (r->version & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) + >> D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT; + if (shader_type != D3DCOMPILER_SHADER_TYPE_CS) + { + /* TODO: Check if anything else is needed from the SHDR or SHEX blob. */ + return S_OK; + } + + size = read_u32(&ptr); + TRACE("size %u.\n", size); + if (size * sizeof(uint32_t) != data_size || size < 2) + { + WARN("Invalid size %u.\n", size); + return E_FAIL; + } + size -= 2; + u_ptr = (uint32_t *)ptr; + while (size) + { + opcode_token = *u_ptr; + opcode = opcode_token & SM4_OPCODE_MASK; + len = (opcode_token & SM4_INSTRUCTION_LENGTH_MASK) >> SM4_INSTRUCTION_LENGTH_SHIFT; + if (!len) + { + if (size < 2) + { + WARN("End of byte-code, failed to read length token.\n"); + return E_FAIL; + } + len = u_ptr[1]; + } + if (!len || size < len) + { + WARN("Invalid instruction length %u, size %u.\n", len, size); + return E_FAIL; + } + if (opcode == SM5_OP_DCL_THREAD_GROUP) + { + if (len != 4) + { + WARN("Invalid dcl_thread_group opcode length %u.\n", len); + return E_FAIL; + } + r->thread_group_size_x = u_ptr[1]; + r->thread_group_size_y = u_ptr[2]; + r->thread_group_size_z = u_ptr[3]; + TRACE("Found dcl_thread_group %u, %u, %u.\n", + r->thread_group_size_x, r->thread_group_size_y, r->thread_group_size_z); + } + size -= len; + u_ptr += len; + } return S_OK; } @@ -1972,7 +2057,6 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void } *reflector = object; - TRACE("Created ID3D11ShaderReflection %p\n", object); return S_OK; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f2b7f094de6..e4261ad0d79 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -777,6 +777,7 @@ static void test_reflection_desc_ps(void) D3D_NAME expected; unsigned int i; #if D3D_COMPILER_VERSION + UINT size_x, size_y, size_z, size_total; UINT ret; #endif @@ -920,6 +921,17 @@ static void test_reflection_desc_ps(void) ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } +#if D3D_COMPILER_VERSION + size_x = 0xdeadbeef; + size_y = 0xdeadbeef; + size_z = 0xdeadbeef; + size_total = ref11->lpVtbl->GetThreadGroupSize(ref11, &size_x, &size_y, &size_z); + ok(!size_x, "Unexpected size %u.\n", size_x); + ok(!size_y, "Unexpected size %u.\n", size_y); + ok(!size_z, "Unexpected size %u.\n", size_z); + ok(!size_total, "Unexpected size %u.\n", size_total); +#endif + count = ref11->lpVtbl->Release(ref11); ok(!count, "Got unexpected count %lu.\n", count); } @@ -1186,6 +1198,53 @@ static const D3D12_SHADER_INPUT_BIND_DESC test_reflection_bound_resources_result {"c2", D3D_SIT_CBUFFER, 1, 1, 0, 0, D3D_SRV_DIMENSION_UNKNOWN, 0, 0, 1}, }; +#if D3D_COMPILER_VERSION +static void test_reflection_cs(void) +{ + /* + * fxc.exe /T cs_5_1 /Fo + */ +#if 0 + [numthreads(16, 8, 4)] + void main( uint3 DTid : SV_DispatchThreadID ) + { + } +#endif + static const DWORD test_blob[] = + { + 0x43425844, 0x77a220d9, 0xfebd5b9c, 0x14a86e30, 0x57537394, 0x00000001, 0x00000184, 0x00000005, + 0x00000034, 0x000000a0, 0x000000b0, 0x000000c0, 0x000000e8, 0x46454452, 0x00000064, 0x00000000, + 0x00000000, 0x00000000, 0x0000003c, 0x43530501, 0x00000500, 0x0000003c, 0x25441313, 0x0000003c, + 0x00000018, 0x00000028, 0x00000028, 0x00000024, 0x0000000c, 0x00000000, 0x7263694d, 0x666f736f, + 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, + 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, + 0x58454853, 0x00000020, 0x00050051, 0x00000008, 0x0100086a, 0x0400009b, 0x00000010, 0x00000008, + 0x00000004, 0x0100003e, 0x54415453, 0x00000094, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, + }; + UINT size_x, size_y, size_z, size_total; + ID3D11ShaderReflection *ref11; + HRESULT hr; + + hr = call_reflect(test_blob, test_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + todo_wine_if(D3D_COMPILER_VERSION < 47) + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (FAILED(hr)) + return; + size_total = ref11->lpVtbl->GetThreadGroupSize(ref11, &size_x, &size_y, &size_z); + ok(size_x == 16, "Unexpected size %u.\n", size_x); + ok(size_y == 8, "Unexpected size %u.\n", size_y); + ok(size_z == 4, "Unexpected size %u.\n", size_z); + ok(size_total == size_x * size_y * size_z, "Unexpected size %u.\n", size_total); + + ref11->lpVtbl->Release(ref11); +} +#endif + static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADER_INPUT_BIND_DESC *result, unsigned int result_count, unsigned int target_version) { @@ -2150,6 +2209,7 @@ START_TEST(reflection) #if D3D_COMPILER_VERSION test_reflection_references(); test_reflection_interfaces(); + test_reflection_cs(); #else test_d3d10_interfaces(); #endif

1 0

Paul Gofman : d3dcompiler: Allow cs5.1 shaders on earlier d3dcompiler versions.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: af454773929dd01844326c8756cdce438ead2df9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af454773929dd01844326c87… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 23 13:58:16 2022 +0100 d3dcompiler: Allow cs5.1 shaders on earlier d3dcompiler versions. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 4 ++-- dlls/d3dcompiler_43/tests/reflection.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 787d0388f93..096efc91bd4 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1507,9 +1507,9 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Target: %#x.\n", r->target); target_version = r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK; - #if D3D_COMPILER_VERSION < 47 - if (target_version >= 0x501) + if (target_version >= 0x501 && (!D3D_COMPILER_VERSION || ((r->target & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) + >> D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT) != 0x4353 /* CS */)) { WARN("Target version %#x is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION); return E_INVALIDARG; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index e4261ad0d79..bfd79d04618 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1231,7 +1231,6 @@ static void test_reflection_cs(void) HRESULT hr; hr = call_reflect(test_blob, test_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - todo_wine_if(D3D_COMPILER_VERSION < 47) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (FAILED(hr)) return;

1 0

Matteo Bruni : d3d10: Do not accept any compute shader in D3D10ReflectShader().
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: c36a25897c23e6353065335bbb900b5010e7ac76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36a25897c23e6353065335b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 13:58:17 2022 +0100 d3d10: Do not accept any compute shader in D3D10ReflectShader(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 11 ++++++++-- dlls/d3dcompiler_43/tests/reflection.c | 39 +++++++++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 096efc91bd4..0fa0dc16839 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -52,6 +52,8 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE #define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK 0xffff0000 #define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT 16 +#define D3DCOMPILER_SHDR_SHADER_TYPE_CS 0x4353 + enum d3dcompiler_shader_type { D3DCOMPILER_SHADER_TYPE_CS = 5, @@ -1487,6 +1489,9 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c size_t size = data_size >> 2; uint32_t target_version; const char *ptr = data; +#if D3D_COMPILER_VERSION < 47 + uint32_t shader_type; +#endif HRESULT hr; TRACE("Size %Iu.\n", size); @@ -1508,8 +1513,10 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c target_version = r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK; #if D3D_COMPILER_VERSION < 47 - if (target_version >= 0x501 && (!D3D_COMPILER_VERSION || ((r->target & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) - >> D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT) != 0x4353 /* CS */)) + shader_type = (r->target & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) + >> D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT; + if ((target_version >= 0x501 && shader_type != D3DCOMPILER_SHDR_SHADER_TYPE_CS) + || (!D3D_COMPILER_VERSION && shader_type == D3DCOMPILER_SHDR_SHADER_TYPE_CS)) { WARN("Target version %#x is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION); return E_INVALIDARG; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index bfd79d04618..70f3a51683a 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1198,9 +1198,32 @@ static const D3D12_SHADER_INPUT_BIND_DESC test_reflection_bound_resources_result {"c2", D3D_SIT_CBUFFER, 1, 1, 0, 0, D3D_SRV_DIMENSION_UNKNOWN, 0, 0, 1}, }; -#if D3D_COMPILER_VERSION static void test_reflection_cs(void) { + /* + * fxc.exe /T cs_4_0 /Fo + */ +#if 0 + [numthreads(16, 8, 4)] + void main( uint3 DTid : SV_DispatchThreadID ) + { + } +#endif + static const DWORD test_blob_cs_4_0[] = + { + 0x43425844, 0x698a31ca, 0x8c6eee35, 0x2377107a, 0xe1e69066, 0x00000001, 0x00000150, 0x00000005, + 0x00000034, 0x0000008c, 0x0000009c, 0x000000ac, 0x000000d4, 0x46454452, 0x00000050, 0x00000000, + 0x00000000, 0x00000000, 0x0000001c, 0x43530400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, + 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, + 0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000020, 0x00050040, 0x00000008, 0x0100086a, + 0x0400009b, 0x00000010, 0x00000008, 0x00000004, 0x0100003e, 0x54415453, 0x00000074, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + }; + /* * fxc.exe /T cs_5_1 /Fo */ @@ -1228,10 +1251,17 @@ static void test_reflection_cs(void) }; UINT size_x, size_y, size_z, size_total; ID3D11ShaderReflection *ref11; - HRESULT hr; + HRESULT hr, expected; + + expected = D3D_COMPILER_VERSION ? S_OK : E_INVALIDARG; + hr = call_reflect(test_blob_cs_4_0, test_blob_cs_4_0[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == expected, "Unexpected hr %#lx.\n", hr); + + if (SUCCEEDED(hr)) + ref11->lpVtbl->Release(ref11); hr = call_reflect(test_blob, test_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == expected, "Unexpected hr %#lx.\n", hr); if (FAILED(hr)) return; size_total = ref11->lpVtbl->GetThreadGroupSize(ref11, &size_x, &size_y, &size_z); @@ -1242,7 +1272,6 @@ static void test_reflection_cs(void) ref11->lpVtbl->Release(ref11); } -#endif static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADER_INPUT_BIND_DESC *result, unsigned int result_count, unsigned int target_version) @@ -2208,10 +2237,10 @@ START_TEST(reflection) #if D3D_COMPILER_VERSION test_reflection_references(); test_reflection_interfaces(); - test_reflection_cs(); #else test_d3d10_interfaces(); #endif + test_reflection_cs(); test_reflection_desc_vs(); test_reflection_desc_ps(); test_reflection_desc_ps_output();

1 0

Jacek Caban : user32: Factor out dispatch_win_proc_params.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: a821155f21425b91e392bc67ace5e5904281f7e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a821155f21425b91e392bc67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 14:00:21 2022 +0100 user32: Factor out dispatch_win_proc_params. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_private.h | 13 ---- dlls/user32/winproc.c | 174 ++++++++++++++++++++++++++++----------------- include/ntuser.h | 30 ++++++++ 3 files changed, 140 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a821155f21425b91e392…

1 0

Jacek Caban : user32: Use dispatch_win_proc_params in CallWindowProc.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: afddda2ce6596d864efd0228eb2f69bb0348ae37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afddda2ce6596d864efd0228… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 14:06:49 2022 +0100 user32: Use dispatch_win_proc_params in CallWindowProc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 70 +++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index adbd5aeb8f6..b3da8d26cb3 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -850,6 +850,37 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, } +static void init_win_proc_params( struct win_proc_params *info, WNDPROC func, HWND hwnd, UINT msg, + WPARAM wparam, LPARAM lparam, LRESULT *result, BOOL ansi ) +{ + WINDOWPROC *proc; + + info->hwnd = hwnd; + info->msg = msg; + info->wparam = wparam; + info->lparam = lparam; + info->result = result; + info->ansi = info->ansi_dst = ansi; + info->is_dialog = FALSE; + info->mapping = WMCHAR_MAP_CALLWINDOWPROC; + info->func = func; + + if (!(proc = handle_to_proc( func ))) + { + info->procW = info->procA = NULL; + } + else if (proc == WINPROC_PROC16) + { + info->procW = info->procA = WINPROC_PROC16; + } + else + { + info->procA = proc->procA; + info->procW = proc->procW; + } +} + + /********************************************************************** * CallWindowProcA (USER32.@) * @@ -874,27 +905,14 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, * * ECMA-234, Win32 */ -LRESULT WINAPI CallWindowProcA( - WNDPROC func, /* [in] window procedure */ - HWND hwnd, /* [in] target window */ - UINT msg, /* [in] message */ - WPARAM wParam, /* [in] message dependent parameter */ - LPARAM lParam /* [in] message dependent parameter */ -) { - WINDOWPROC *proc; +LRESULT WINAPI CallWindowProcA( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + struct win_proc_params params; LRESULT result; if (!func) return 0; - - if (!(proc = handle_to_proc( func ))) - call_window_proc( hwnd, msg, wParam, lParam, &result, func ); - else if (proc == WINPROC_PROC16) - wow_handlers.call_window_proc( hwnd, msg, wParam, lParam, &result, func ); - else if (proc->procA) - call_window_proc( hwnd, msg, wParam, lParam, &result, proc->procA ); - else - WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, &result, - proc->procW, WMCHAR_MAP_CALLWINDOWPROC ); + init_win_proc_params( &params, func, hwnd, msg, wParam, lParam, &result, TRUE ); + dispatch_win_proc_params( &params ); return result; } @@ -904,22 +922,14 @@ LRESULT WINAPI CallWindowProcA( * * See CallWindowProcA. */ -LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { - WINDOWPROC *proc; + struct win_proc_params params; LRESULT result; if (!func) return 0; - - if (!(proc = handle_to_proc( func ))) - call_window_proc( hwnd, msg, wParam, lParam, &result, func ); - else if (proc == WINPROC_PROC16) - WINPROC_CallProcWtoA( wow_handlers.call_window_proc, hwnd, msg, wParam, lParam, &result, func ); - else if (proc->procW) - call_window_proc( hwnd, msg, wParam, lParam, &result, proc->procW ); - else - WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, &result, proc->procA ); + init_win_proc_params( &params, func, hwnd, msg, wParam, lParam, &result, FALSE ); + dispatch_win_proc_params( &params ); return result; }

1 0

Jacek Caban : user32: Move more code out of call_window_proc.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: b8a805e2f2c2411aa3ed6a4650d6ab3a5a852f78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a805e2f2c2411aa3ed6a46… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 14:00:43 2022 +0100 user32: Move more code out of call_window_proc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 20 ++++++++++++-------- include/ntuser.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index b3da8d26cb3..c46cd373b4e 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -119,18 +119,12 @@ static WPARAM map_wparam_char_WtoA( WPARAM wParam, DWORD len ) /* call a 32-bit window procedure */ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { - DPI_AWARENESS_CONTEXT context; WNDPROC proc = arg; - USER_CheckNotLock(); - - hwnd = WIN_GetFullHandle( hwnd ); TRACE_(relay)( "\1Call window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); - context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); *result = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); - SetThreadDpiAwarenessContext( context ); TRACE_(relay)( "\1Ret window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result ); @@ -711,6 +705,10 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN static void dispatch_win_proc_params( struct win_proc_params *params ) { + DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( params->dpi_awareness ); + + USER_CheckNotLock(); + if (!params->ansi) { if (params->procW == WINPROC_PROC16) @@ -789,6 +787,8 @@ static void dispatch_win_proc_params( struct win_proc_params *params ) call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, params->result, params->func ); } + + SetThreadDpiAwarenessContext( context ); } @@ -818,13 +818,14 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, params.is_dialog = wndPtr->dlgInfo != NULL; WIN_ReleasePtr( wndPtr ); - params.hwnd = hwnd; + params.hwnd = WIN_GetFullHandle( hwnd ); params.msg = msg; params.wparam = wParam; params.lparam = lParam; params.result = result; params.ansi = !unicode; params.mapping = mapping; + params.dpi_awareness = GetWindowDpiAwarenessContext( params.hwnd ); if (!proc) { @@ -855,7 +856,9 @@ static void init_win_proc_params( struct win_proc_params *info, WNDPROC func, HW { WINDOWPROC *proc; - info->hwnd = hwnd; + USER_CheckNotLock(); + + info->hwnd = WIN_GetFullHandle( hwnd ); info->msg = msg; info->wparam = wparam; info->lparam = lparam; @@ -863,6 +866,7 @@ static void init_win_proc_params( struct win_proc_params *info, WNDPROC func, HW info->ansi = info->ansi_dst = ansi; info->is_dialog = FALSE; info->mapping = WMCHAR_MAP_CALLWINDOWPROC; + info->dpi_awareness = GetWindowDpiAwarenessContext( info->hwnd ); info->func = func; if (!(proc = handle_to_proc( func ))) diff --git a/include/ntuser.h b/include/ntuser.h index 19f303f0dae..12e9b5b3025 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -87,6 +87,7 @@ struct win_proc_params BOOL ansi_dst; BOOL is_dialog; enum wm_char_mapping mapping; + DPI_AWARENESS_CONTEXT dpi_awareness; WNDPROC procA; WNDPROC procW; };

1 0