- Wine-Devel - list.winehq.org

[PATCH vkd3d 3/9] vkd3d: Normalise layer counts in vkd3d_create_texture_uav().
by Henri Verbeet Oct. 12, 2021

Oct. 12, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Passing UINT_MAX as layer count to Direct3D behaves similar to passing VK_REMAINING_ARRAY_LAYERS to Vulkan. Since these have the same value, everything usually works out even without normalisation. However, there are some exceptions; for example, we calculate workgroup counts for UAV clears from layer counts using vkd3d_compute_workgroup_count(), which doesn't handle UINT_MAX. Normalising layer counts during view creation avoids having to handle this issue in the rest of the code. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: - Introduce a helper to normalise the view instead of a helper for the layer count. - Some improvements to the commit message. This supersedes patch 215654. libs/vkd3d/resource.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a51f5795..854e73a3 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2477,6 +2477,27 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } +static void vkd3d_texture_view_desc_normalise(struct vkd3d_texture_view_desc *desc, + const D3D12_RESOURCE_DESC *resource_desc) +{ + unsigned int max_layer_count = resource_desc->DepthOrArraySize; + + if (desc->layer_idx >= max_layer_count) + { + WARN("Layer index %u exceeds maximum available layer %u.\n", desc->layer_idx, max_layer_count - 1); + desc->layer_count = 1; + return; + } + + max_layer_count -= desc->layer_idx; + if (desc->layer_count <= max_layer_count) + return; + + if (desc->layer_count != UINT_MAX) + WARN("Layer count %u exceeds maximum %u.\n", desc->layer_count, max_layer_count); + desc->layer_count = max_layer_count; +} + bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { @@ -2920,6 +2941,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_UAV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; -- 2.20.1

1 0

[PATCH vkd3d 2/9] vkd3d-shader/spirv: Correctly handle bit shifts greater than 31 bits.
by Henri Verbeet Oct. 12, 2021

Oct. 12, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> This is undefined behaviour in SPIR-V, but well-defined in Direct3D, so we should explicitly 'and' the shift amount with 31. Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Minor modifications to the comment and commit message. This supersedes patch 216958. libs/vkd3d-shader/spirv.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ebaf1631..58bf3d9c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6840,6 +6840,21 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler for (i = 0; i < instruction->src_count; ++i) src_ids[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], dst->write_mask); + /* The SPIR-V specification states, "The resulting value is undefined if + * Shift is greater than or equal to the bit width of the components of + * Base." Direct3D applies only the lowest 5 bits of the shift. + * + * Microsoft fxc will compile immediate constants larger than 5 bits. + * Fixing up the constants would be more elegant, but the simplest way is + * to let this handle constants too. */ + if (instruction->handler_idx == VKD3DSIH_ISHL || instruction->handler_idx == VKD3DSIH_ISHR + || instruction->handler_idx == VKD3DSIH_USHR) + { + uint32_t mask_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, + VKD3D_SHADER_COMPONENT_UINT, vkd3d_write_mask_component_count(dst->write_mask), 0x1f); + src_ids[1] = vkd3d_spirv_build_op_and(builder, type_id, src_ids[1], mask_id); + } + val_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, instruction->src_count); if (instruction->flags & VKD3DSI_PRECISE_XYZW) -- 2.20.1

1 0

[PATCH vkd3d 1/9] tests: Add a test for 5-bit masking of shader bit shift operands.
by Henri Verbeet Oct. 12, 2021

Oct. 12, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Unmodified resend of patch 216957. tests/d3d12.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 38fab13c..d1337e27 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -8584,15 +8584,16 @@ static void test_shader_instructions(void) void main(out uint4 dst : SV_Target) { - dst = src << 2; + dst = src << uint4(2, 2, 0x22, 0x22); } #endif - 0x43425844, 0x5b749bf4, 0xe24de3dc, 0xbbd75bc9, 0xc6fc9eca, 0x00000001, 0x000000c0, 0x00000003, + 0x43425844, 0x999070b8, 0x623414f1, 0xb1ce04f4, 0x58554022, 0x00000001, 0x000000d0, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000048, 0x00000040, 0x00000012, - 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029, - 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000058, 0x00000050, 0x00000016, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x0b000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004002, 0x00000002, + 0x00000002, 0x00000022, 0x00000022, 0x0100003e, }; static struct named_shader ps_ishl_const = {"ishl_const", ps_ishl_const_code, sizeof(ps_ishl_const_code)}; static const DWORD ps_not_code[] = @@ -9913,6 +9914,8 @@ static void test_shader_instructions(void) {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}}, {&ps_ishl, {{{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}, {~0x1fu, 0, 32, 64}}}, {{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}}}, + {&ps_ishl, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, { 33, 34, 65, 66}}}, + {{0xfffffffe, 0xfffffffc, 0xfffffffe, 0xfffffffc}}}, {&ps_ishl, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, { 31, 7, 15, 11}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, {&ps_ishl, {{{0x80000000, 0x80000000, 0x80000000, 0x80000000}, { 31, 7, 15, 11}}}, -- 2.20.1

1 0

[PATCH 1/7] win32u: Use syscall interface for some path functions.
by Jacek Caban Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 3 --- dlls/win32u/syscall.c | 3 +++ dlls/win32u/win32u.spec | 6 +++--- dlls/win32u/win32u_private.h | 3 --- dlls/win32u/wrappers.c | 15 --------------- dlls/wow64win/gdi.c | 24 ++++++++++++++++++++++++ dlls/wow64win/syscall.h | 3 +++ 7 files changed, 33 insertions(+), 24 deletions(-)

3 3

[PATCH v5 1/2] mshtml: Implement HTMLDocument's toString using dispex_to_string.
by Gabriel Ivăncescu Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 7 +------ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 12fce6d..d2caaef 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1703,12 +1703,7 @@ static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) TRACE("(%p)->(%p)\n", This, String); - if(!String) - return E_INVALIDARG; - - *String = SysAllocString(L"[object]"); - return *String ? S_OK : E_OUTOFMEMORY; - + return dispex_to_string(&This->doc_node->node.event_target.dispex, String); } static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 2c11744..7f7fe87 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -210,6 +210,7 @@ sync_test("builtin_toString", function() { if(clientRects) test("clientRect", clientRects[0], "ClientRect"); if(clientRects) test("clientRects", clientRects, "ClientRectList"); if(currentStyle) test("currentStyle", currentStyle, "MSCurrentStyleCSSProperties"); + if(v >= 11 /* todo_wine */) test("document", document, v < 11 ? "Document" : "HTMLDocument"); test("elements", document.getElementsByTagName("body"), "HTMLCollection"); test("history", window.history, "History"); test("implementation", document.implementation, "DOMImplementation"); -- 2.31.1

3 5

[PATCH 3/7] win32u: Use syscall interface for spooler functions.
by Jacek Caban Oct. 12, 2021

Oct. 12, 2021

2 1

[PATCH 2/7] win32u: Use syscall interface for pen constructors.
by Jacek Caban Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 14 -------------- dlls/wow64win/gdi.c | 29 +++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 2 ++ 7 files changed, 35 insertions(+), 23 deletions(-)

2 1

[PATCH vkd3d v2 1/5] vkd3d-shader: Introduce a shader interface extension for descriptor offset info.
by Conor McCarthy Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- include/vkd3d_shader.h | 38 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 12 +++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 37b5936d..77cc3751 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -64,6 +64,11 @@ enum vkd3d_shader_structure_type * \since 1.3 */ VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO, + /** + * The structure is a vkd3d_shader_descriptor_offset_info structure. + * \since 1.3 + */ + VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -452,6 +457,39 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +/* Extends vkd3d_shader_interface_info. */ +struct vkd3d_shader_descriptor_offset_info +{ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO. */ + enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ + const void *next; + + /** + * Pointer to an array of offsets which define the location of each vkd3d + * shader resource descriptor binding within a Vulkan descriptor binding. + * This array correlates exactly to the 'bindings' array in struct + * vkd3d_shader_interface_info. Multiple vkd3d bindings may be merged into + * a single Vulkan binding, and these offsets will be used to address the + * correct location in a merged binding. This value may be NULL, but if + * merged bindings are not used (i.e. all offsets are zero), struct + * vkd3d_shader_descriptor_offset_info may be omitted. The 'count' field in + * struct vkd3d_shader_descriptor_binding begins at the offset location. + * Use of merged Vulkan bindings requires EXT_descriptor_indexing. Merged + * bindings are not supported for combined samplers. + */ + const unsigned int *descriptor_offsets; + + /** + * Pointer to an array of offsets into UAV counter descriptor bindings. + * These correlate exactly to the 'uav_counters' array in struct + * vkd3d_shader_interface_info, and will be used in the same way as + * \ref descriptor_offsets above. UAV counter arrays are not supported in + * this version of vkd3d-shader, so this value must be NULL. + */ + const unsigned int *uav_counter_offsets; +}; + /** The format of a shader to be compiled or scanned. */ enum vkd3d_shader_source_type { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ebaf1631..d04b1101 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2231,6 +2231,7 @@ struct vkd3d_dxbc_compiler size_t control_flow_info_size; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_spirv_target_info *spirv_target_info; @@ -2292,6 +2293,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; const struct vkd3d_shader_interface_info *shader_interface; + const struct vkd3d_shader_descriptor_offset_info *offset_info; const struct vkd3d_shader_spirv_target_info *target_info; struct vkd3d_dxbc_compiler *compiler; unsigned int max_element_count; @@ -2385,6 +2387,13 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader for (i = 0; i < shader_interface->push_constant_buffer_count; ++i) compiler->push_constants[i].pc = shader_interface->push_constant_buffers[i]; } + + if ((offset_info = vkd3d_find_struct(shader_interface->next, DESCRIPTOR_OFFSET_INFO))) + { + compiler->offset_info = *offset_info; + if (offset_info->uav_counter_offsets) + WARN("Ignoring UAV counter offsets %p.\n", offset_info->uav_counter_offsets); + } } compiler->scan_descriptor_info = scan_descriptor_info; @@ -2546,6 +2555,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; unsigned int register_last = (range->last == ~0u) ? range->first : range->last; + const unsigned int *descriptor_offsets = compiler->offset_info.descriptor_offsets; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2626,7 +2636,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor || current->binding.count <= register_last - current->register_index) continue; - *binding_base_idx = current->register_index; + *binding_base_idx = current->register_index - (descriptor_offsets ? descriptor_offsets[i] : 0); return current->binding; } if (shader_interface->binding_count) -- 2.32.0

1 4

[PATCH 7/7] win32u/tests: Add NtUserCloseWindowStation test.
by Jacek Caban Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/tests/Makefile.in | 5 +++++ dlls/win32u/tests/win32u.c | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 dlls/win32u/tests/Makefile.in create mode 100644 dlls/win32u/tests/win32u.c

1 0

[PATCH 6/7] win32u: Move NtUserCloseWindowStation from user32.
by Jacek Caban Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/winstation.c | 16 -------------- dlls/win32u/Makefile.in | 1 + dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 45 ++++++++++++++++++++++++++++++++++++++ dlls/wow64win/Makefile.in | 3 ++- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 35 +++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/ntuser.h | 27 +++++++++++++++++++++++ 13 files changed, 119 insertions(+), 22 deletions(-) create mode 100644 dlls/win32u/winstation.c create mode 100644 dlls/wow64win/user.c create mode 100644 include/ntuser.h

1 0