[PATCH 0/5] MR216: vkd3d: Prepare for tiled resource support.
From: Conor McCarthy <cmccarthy(a)codeweavers.com> Based on code by Jan Sikorski. --- libs/vkd3d/resource.c | 16 ++++++++++++++++ libs/vkd3d/utils.c | 2 ++ 2 files changed, 18 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 213b2dbb..b381350c 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -776,9 +776,11 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format_compatibility_list *compat_list; const bool sparse_resource = !heap_properties; + VkSparseImageFormatProperties properties[2]; VkImageFormatListCreateInfoKHR format_list; const struct vkd3d_format *format; VkImageCreateInfo image_info; + uint32_t count; VkResult vr; if (resource) @@ -914,6 +916,20 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, if (resource && image_info.tiling == VK_IMAGE_TILING_LINEAR) resource->flags |= VKD3D_RESOURCE_LINEAR_TILING; + if (sparse_resource) + { + count = ARRAY_SIZE(properties); + VK_CALL(vkGetPhysicalDeviceSparseImageFormatProperties(device->vk_physical_device, image_info.format, + image_info.imageType, image_info.samples, image_info.usage, image_info.tiling, &count, properties)); + + if (!count) + { + FIXME("Sparse images are not supported with format %u, type %u, samples %u, usage %#x.\n", + image_info.format, image_info.imageType, image_info.samples, image_info.usage); + return E_INVALIDARG; + } + } + if ((vr = VK_CALL(vkCreateImage(device->vk_device, &image_info, NULL, vk_image))) < 0) WARN("Failed to create Vulkan image, vr %d.\n", vr); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 9b28068b..b8c19bd2 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -767,6 +767,8 @@ HRESULT hresult_from_vk_result(VkResult vr) /* fall-through */ case VK_ERROR_OUT_OF_HOST_MEMORY: return E_OUTOFMEMORY; + case VK_ERROR_FORMAT_NOT_SUPPORTED: + return E_INVALIDARG; default: FIXME("Unhandled VkResult %d.\n", vr); /* fall-through */ -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/216
From: Conor McCarthy <cmccarthy(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 b381350c..cfc7aff2 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -944,6 +944,7 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, D3D12_RESOURCE_DESC validated_desc; VkMemoryRequirements requirements; VkImage vk_image; + bool tiled; HRESULT hr; assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER); @@ -956,8 +957,10 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, desc = &validated_desc; } + tiled = desc->Layout == D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; + /* XXX: We have to create an image to get its memory requirements. */ - if (SUCCEEDED(hr = vkd3d_create_image(device, &heap_properties, 0, desc, NULL, &vk_image))) + if (SUCCEEDED(hr = vkd3d_create_image(device, tiled ? NULL : &heap_properties, 0, desc, NULL, &vk_image))) { VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, &requirements)); VK_CALL(vkDestroyImage(device->vk_device, vk_image, NULL)); -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/216
From: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cfc7aff2..33f7efc9 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1680,6 +1680,16 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d return E_INVALIDARG; } + if (desc->Layout == D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE) + { + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D + && device->feature_options.TiledResourcesTier < D3D12_TILED_RESOURCES_TIER_3) + { + WARN("Tiled resource tier 3 is required for tiled 3D images.\n"); + return E_INVALIDARG; + } + } + if (!d3d12_resource_validate_texture_format(desc, format) || !d3d12_resource_validate_texture_alignment(desc, format)) return E_INVALIDARG; -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/216
From: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 33f7efc9..0cf910cd 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1688,6 +1688,12 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d WARN("Tiled resource tier 3 is required for tiled 3D images.\n"); return E_INVALIDARG; } + if (format->plane_count > 1) + { + WARN("Invalid format %#x. D3D12 does not support multiplanar formats for tiled resources.\n", + format->dxgi_format); + return E_INVALIDARG; + } } if (!d3d12_resource_validate_texture_format(desc, format) -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/216
From: Conor McCarthy <cmccarthy(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 4 ++-- libs/vkd3d/command.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 652ffc36..06287f5a 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2266,8 +2266,8 @@ interface ID3D12CommandQueue : ID3D12Pageable ID3D12Heap *heap, UINT range_count, const D3D12_TILE_RANGE_FLAGS *range_flags, - UINT *heap_range_offsets, - UINT *range_tile_counts, + const UINT *heap_range_offsets, + const UINT *range_tile_counts, D3D12_TILE_MAPPING_FLAGS flags); void CopyTileMappings(ID3D12Resource *dst_resource, diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 32439eec..c5bd687b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6166,7 +6166,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_UpdateTileMappings(ID3D12Comma ID3D12Resource *resource, UINT region_count, const D3D12_TILED_RESOURCE_COORDINATE *region_start_coordinates, const D3D12_TILE_REGION_SIZE *region_sizes, ID3D12Heap *heap, UINT range_count, const D3D12_TILE_RANGE_FLAGS *range_flags, - UINT *heap_range_offsets, UINT *range_tile_counts, D3D12_TILE_MAPPING_FLAGS flags) + const UINT *heap_range_offsets, const UINT *range_tile_counts, D3D12_TILE_MAPPING_FLAGS flags) { FIXME("iface %p, resource %p, region_count %u, region_start_coordinates %p, " "region_sizes %p, heap %p, range_count %u, range_flags %p, heap_range_offsets %p, " -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/216
Giovanni Mascellani (@giomasce) commented about libs/vkd3d/utils.c:
/* fall-through */ case VK_ERROR_OUT_OF_HOST_MEMORY: return E_OUTOFMEMORY; + case VK_ERROR_FORMAT_NOT_SUPPORTED: + return E_INVALIDARG;
Does this really belong to this patch? -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/216#note_34070
Giovanni Mascellani (@giomasce) commented about libs/vkd3d/resource.c:
desc = &validated_desc; }
+ tiled = desc->Layout == D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE;
Shouldn't this apply to `D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE` too, and similarly in later commits? -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/216#note_34071
On Mon May 29 11:57:52 2023 +0000, Giovanni Mascellani wrote:
Shouldn't this apply to `D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE` too, and similarly in later commits? `vkd3d_create_image()` doesn't support it. Maybe d3d12_resource_validate_desc() should check layouts too, but that would be a separate MR.
-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/216#note_34079
On Mon May 29 11:57:51 2023 +0000, Giovanni Mascellani wrote:
Does this really belong to this patch? I don't see a way this error could be raised during tiled resource creation, so no it isn't needed.
-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/216#note_34082
participants (3)
-
Conor McCarthy -
Conor McCarthy (＠cmccarthy)
-
Giovanni Mascellani (＠giomasce)