- Wine-Devel - list.winehq.org

[PATCH 1/5] winemenubuilder: Return pointer from freedesktop_mime_type_for_extension
by Alex Henrie Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/winemenubuilder/winemenubuilder.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e02d7bd787f..51d83aed971 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1874,29 +1874,26 @@ static BOOL build_native_mime_types(struct list *mime_types) return ret; } -static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, - LPCWSTR extensionW, - WCHAR **match) +static WCHAR *freedesktop_mime_type_for_extension(struct list *native_mime_types, + const WCHAR *extensionW) { struct xdg_mime_type *mime_type_entry; int matchLength = 0; - - *match = NULL; + const WCHAR* match = NULL; LIST_FOR_EACH_ENTRY(mime_type_entry, native_mime_types, struct xdg_mime_type, entry) { if (PathMatchSpecW( extensionW, mime_type_entry->glob )) { - if (*match == NULL || matchLength < lstrlenW(mime_type_entry->glob)) + if (match == NULL || matchLength < lstrlenW(mime_type_entry->glob)) { - *match = mime_type_entry->mimeType; + match = mime_type_entry->mimeType; matchLength = lstrlenW(mime_type_entry->glob); } } } - if (*match != NULL) *match = xwcsdup(*match); - return TRUE; + return match ? xwcsdup(match) : NULL; } static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) @@ -2190,8 +2187,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic if (contentTypeW) wcslwr(contentTypeW); - if (!freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionW, &mimeType)) - goto end; + mimeType = freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionW); if (mimeType == NULL) { -- 2.33.0

3 11

[PATCH v2] server: Use SO_BINDTODEVICE in bind_to_index() if possible.
by Paul Gofman Oct. 12, 2021

Oct. 12, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Using SO_REUSEADDR is currently problematic when more than one UDP socket is bound to different interfaces. While that succeeds, it is unspecified which socket will receive a packet coming to INADDR_ANY. The filter being installed for each socket with SO_ATTACH_FILTER can only reject the packet coming for another interface but that rejected packed doesn't arrive to another socket. SO_BINDTODEVICE seems to do exactly what we want without installing any socket filters and without requiring SO_REUSEADDR or SO_REUSEPORT. It originally considered for implementing broadcast listen on interface bound sockets but it wasn't much useful by that time as the SO_BINDTODEVICE required CAP_NET_RAW privilege which is normally not available for a non-root user [1]. However, that changed since Linux 5.7 [2]. This patch uses SO_BINDTODEVICE but falls back to the previous way if that fails. 1. https://www.winehq.org/pipermail/wine-devel/2011-October/092681.html 2. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?i… server/sock.c | 74 +++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/server/sock.c b/server/sock.c index 03716cba90f..fd05ebd0f3c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1756,12 +1756,21 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) #ifdef IP_BOUND_IF -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) { - return setsockopt( fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index) ); + static const int enable = 1; + unsigned int index; + + if (!(index = if_nametoindex( name ))) + return -1; + + if (setsockopt( fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index) )) + return -1; + + return setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ); } -#elif defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) +#elif defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) && defined(SO_BINDTODEVICE) struct interface_filter { @@ -1794,27 +1803,43 @@ static struct interface_filter generic_interface_filter = BPF_STMT(BPF_RET+BPF_K, 0) /* dump packet */ }; -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) { - in_addr_t ifindex = htonl( index ); struct interface_filter specific_interface_filter; struct sock_fprog filter_prog; - int ret; + static const int enable = 1; + unsigned int index; + in_addr_t ifindex; - if ((ret = setsockopt( fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex) )) < 0) - return ret; + if (!setsockopt( fd, SOL_SOCKET, SO_BINDTODEVICE, name, strlen( name ) + 1 )) + return 0; + + /* SO_BINDTODEVICE requires NET_CAP_RAW until Linux 5.7. */ + if (debug_level) + fprintf( stderr, "setsockopt SO_BINDTODEVICE fd %d, name %s failed: %s, falling back to SO_REUSE_ADDR\n", + fd, name, strerror( errno )); + + if (!(index = if_nametoindex( name ))) + return -1; + + ifindex = htonl( index ); + if (setsockopt( fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex) ) < 0) + return -1; specific_interface_filter = generic_interface_filter; specific_interface_filter.iface_rule.k = index; specific_interface_filter.ip_rule.k = htonl( bind_addr ); filter_prog.len = sizeof(generic_interface_filter) / sizeof(struct sock_filter); filter_prog.filter = (struct sock_filter *)&specific_interface_filter; - return setsockopt( fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog) ); + if (setsockopt( fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog) )) + return -1; + + return setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ); } #else -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) { errno = EOPNOTSUPP; return -1; @@ -1840,8 +1865,7 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr in_addr_t bind_addr = addr->sin_addr.s_addr; struct ifaddrs *ifaddrs, *ifaddr; int fd = get_unix_fd( sock->fd ); - static const int enable = 1; - unsigned int index; + int err = 0; if (bind_addr == htonl( INADDR_ANY ) || bind_addr == htonl( INADDR_LOOPBACK )) return 0; @@ -1855,36 +1879,16 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr if (ifaddr->ifa_addr && ifaddr->ifa_addr->sa_family == AF_INET && ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr == bind_addr) { - index = if_nametoindex( ifaddr->ifa_name ); - if (!index) - { - if (debug_level) - fprintf( stderr, "Unable to look up interface index for %s: %s\n", - ifaddr->ifa_name, strerror( errno ) ); - continue; - } - - freeifaddrs( ifaddrs ); - - if (bind_to_index( fd, bind_addr, index ) < 0) + if ((err = bind_to_iface_name( fd, bind_addr, ifaddr->ifa_name )) < 0) { if (debug_level) fprintf( stderr, "failed to bind to interface: %s\n", strerror( errno ) ); - return 0; } - - if (setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ) < 0) - { - if (debug_level) - fprintf( stderr, "failed to reuse address: %s\n", strerror( errno ) ); - return 0; - } - return 1; + break; } } - freeifaddrs( ifaddrs ); - return 0; + return !err; } #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID -- 2.31.1

1 0

[PATCH 1/9] tools/winedump: fix incorrect alignment
by Eric Pouech Oct. 12, 2021

Oct. 12, 2021

(BTW dbghelp is already doing the right thing) --- tools/winedump/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 2c3d406347e..b7b7eb435ff 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1161,7 +1161,7 @@ BOOL codeview_dump_types_from_block(const void* table, unsigned long len) codeview_dump_one_type(curr_type, type); curr_type++; - ptr += (type->generic.len + 2 + 3) & ~3; + ptr += type->generic.len + 2; } return TRUE;

3 10

[PATCH vkd3d 01/10] vkd3d: Use minimum width/height/layer framebuffer.
by Conor McCarthy Oct. 12, 2021

Oct. 12, 2021

All attachments must be at least as large as the framebuffer; using a max operator is not compliant with Vulkan (VUID-VkFramebufferCreateInfo-flags-04533, etc). From: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9f4a4149..e81feea4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4517,6 +4517,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi BOOL single_descriptor_handle, const D3D12_CPU_DESCRIPTOR_HANDLE *depth_stencil_descriptor) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); + const VkPhysicalDeviceLimits *limits = &list->device->vk_info.device_limits; const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; VkFormat prev_dsv_format; @@ -4535,9 +4536,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi render_target_descriptor_count = ARRAY_SIZE(list->rtvs); } - list->fb_width = 0; - list->fb_height = 0; - list->fb_layer_count = 0; + list->fb_width = limits->maxFramebufferWidth; + list->fb_height = limits->maxFramebufferHeight; + list->fb_layer_count = limits->maxFramebufferLayers; for (i = 0; i < render_target_descriptor_count; ++i) { if (single_descriptor_handle) @@ -4567,9 +4568,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } list->rtvs[i] = view->u.vk_image_view; - list->fb_width = max(list->fb_width, rtv_desc->width); - list->fb_height = max(list->fb_height, rtv_desc->height); - list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); + list->fb_width = min(list->fb_width, rtv_desc->width); + list->fb_height = min(list->fb_height, rtv_desc->height); + list->fb_layer_count = min(list->fb_layer_count, rtv_desc->layer_count); } prev_dsv_format = list->dsv_format; @@ -4591,9 +4592,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } list->dsv = view->u.vk_image_view; - list->fb_width = max(list->fb_width, dsv_desc->width); - list->fb_height = max(list->fb_height, dsv_desc->height); - list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); + list->fb_width = min(list->fb_width, dsv_desc->width); + list->fb_height = min(list->fb_height, dsv_desc->height); + list->fb_layer_count = min(list->fb_layer_count, dsv_desc->layer_count); list->dsv_format = dsv_desc->format->vk_format; } else -- 2.32.0

2 10

[PATCH vkd3d 9/9] tests: Add a UINT_MAX layer count test to test_clear_depth_stencil_view().
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> --- v2: Unmodified resend of patch 215659. tests/d3d12.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9e4dcb5b..5593393e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4485,6 +4485,17 @@ static void test_clear_depth_stencil_view(void) reset_command_list(command_list, context.allocator); } + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); + dsv_desc.Texture2DArray.ArraySize = UINT_MAX; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[4], 0, 0, NULL); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 5, queue, command_list, expected_values[4], 1); + destroy_depth_stencil(&ds); destroy_test_context(&context); } -- 2.20.1

1 0

[PATCH vkd3d 8/9] tests: Add UINT_MAX layer count tests to test_clear_render_target_view().
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> --- v2: Unmodified resend of patch 215658. tests/d3d12.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac1e24da..9e4dcb5b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4672,7 +4672,7 @@ static void test_clear_render_target_view(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DARRAY; rtv_desc.Texture2DArray.FirstArraySlice = i; - rtv_desc.Texture2DArray.ArraySize = 1; + rtv_desc.Texture2DArray.ArraySize = (i == ARRAY_SIZE(array_colors) - 1) ? UINT_MAX : 1; ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); @@ -4703,7 +4703,7 @@ static void test_clear_render_target_view(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; rtv_desc.Texture2DMSArray.FirstArraySlice = i; - rtv_desc.Texture2DMSArray.ArraySize = 1; + rtv_desc.Texture2DMSArray.ArraySize = (i == ARRAY_SIZE(array_colors) - 1) ? UINT_MAX : 1; ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); @@ -4759,6 +4759,23 @@ static void test_clear_render_target_view(void) check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); release_resource_readback(&rb); + rtv_desc.Texture3D.FirstWSlice = 30; + rtv_desc.Texture3D.WSize = UINT_MAX; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 4, 32, 32, 30); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + set_box(&box, 0, 0, 30, 32, 32, 32); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + release_resource_readback(&rb); + ID3D12Resource_Release(resource); ID3D12DescriptorHeap_Release(rtv_heap); destroy_test_context(&context); -- 2.20.1

1 0

[PATCH vkd3d 7/9] tests: Test a UINT_MAX layer count in test_clear_unordered_access_view_image().
by Henri Verbeet Oct. 12, 2021

Oct. 12, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Testing without the fixes in vkd3d_create_texture_uav() has nasty results in radv and possibly others. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Mostly unmodified resend of patch 215657. tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d1337e27..ac1e24da 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5014,6 +5014,8 @@ static void test_clear_unordered_access_view_image(void) {0x3f000000, 0, 0, 0}, 0x3f000000, true}, {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true}, + /* Test clearing a UINT_MAX layer count. */ + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, UINT_MAX, 0, {}, {1, 0, 0, 0}, 1}, /* Test a single clear rect. */ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}}, {1, 0, 0, 0}, 1}, -- 2.20.1

1 0

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

Oct. 12, 2021

I'm not aware of any issue caused by not normalising SRV layer counts, but this makes it consistent with the other view types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/resource.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index bf01a64c..d6e5d4be 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2753,6 +2753,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); if (desc->u.Texture2DArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_SRV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -2761,6 +2762,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; @@ -2783,10 +2785,11 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; vkd3d_desc.layer_count = desc->u.TextureCubeArray.NumCubes; - if (vkd3d_desc.layer_count != VK_REMAINING_ARRAY_LAYERS) + if (vkd3d_desc.layer_count != UINT_MAX) vkd3d_desc.layer_count *= 6; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); -- 2.20.1

1 0

[PATCH vkd3d 5/9] vkd3d: Normalise layer counts in d3d12_dsv_desc_create_dsv().
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> --- v2: Adjusted for changes earlier in the series. This supersedes patch 215656. libs/vkd3d/resource.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 30d7d2cf..bf01a64c 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3296,6 +3296,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_DSV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -3304,6 +3305,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); -- 2.20.1

1 0

[PATCH vkd3d 4/9] vkd3d: Normalise layer counts in d3d12_rtv_desc_create_rtv().
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> --- v2: Take the mip-level into account when calculating the maximum layer count for 3D textures. This supersedes patch 215655. libs/vkd3d/resource.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 854e73a3..30d7d2cf 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2480,7 +2480,19 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, 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; + unsigned int max_layer_count; + + if (resource_desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + if (desc->view_type == VK_IMAGE_VIEW_TYPE_2D_ARRAY) + max_layer_count = max(1, resource_desc->DepthOrArraySize >> desc->miplevel_idx); + else + max_layer_count = 1; + } + else + { + max_layer_count = resource_desc->DepthOrArraySize; + } if (desc->layer_idx >= max_layer_count) { @@ -3186,6 +3198,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev 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_RTV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -3194,12 +3207,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; vkd3d_desc.layer_idx = desc->u.Texture3D.FirstWSlice; vkd3d_desc.layer_count = desc->u.Texture3D.WSize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); -- 2.20.1

1 0