fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk/meta: Support DS <-> color copies

Browse source 
VK_KHR_maintenance8 allows such copies, but there are a few things we
need to fix to support the case where the destination and source aspects
don't match.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Tested-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37473>
This commit is contained in:
Boris Brezillon 2025-09-17 16:12:21 +02:00
parent 214a431caf
commit 27988e9848
1 changed files with 63 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/vulkan/runtime/vk_meta_copy_fill_update.c
View file

@ -83,9 +83,9 @@ struct vk_meta_copy_image_key {
/* One source per-aspect being copied. */
struct {
struct vk_meta_copy_image_view view;
VkImageAspectFlagBits aspects;
} src, dst;
VkImageAspectFlagBits aspects;
VkSampleCountFlagBits samples;
uint32_t wg_size[3];
@ -1716,23 +1716,25 @@ build_copy_image_fs(const struct vk_meta_device *meta, const void *key_data)
nir_variable *color_var = NULL;
uint32_t tex_binding = 0;
u_foreach_bit(a, key->aspects) {
VkImageAspectFlagBits aspect = 1 << a;
u_foreach_bit(a, key->src.aspects) {
VkImageAspectFlags src_aspect = 1 << a;
VkImageAspectFlags dst_aspect =
key->dst.aspects == key->src.aspects ? src_aspect : key->dst.aspects;
VkFormat src_fmt =
copy_img_view_format_for_aspect(&key->src.view, aspect);
copy_img_view_format_for_aspect(&key->src.view, src_aspect);
VkFormat dst_fmt =
copy_img_view_format_for_aspect(&key->dst.view, aspect);
copy_img_view_format_for_aspect(&key->dst.view, dst_aspect);
nir_deref_instr *tex =
tex_deref(b, &key->src.view, aspect, key->samples, tex_binding++);
tex_deref(b, &key->src.view, src_aspect, key->samples, tex_binding++);
nir_def *texel = read_texel(b, tex, src_coords, sample_id);
if (!color_var || !depth_stencil_interleaved(&key->dst.view)) {
color_var =
frag_var(b, &key->dst.view, aspect, color_var != NULL ? 1 : 0);
frag_var(b, &key->dst.view, dst_aspect, color_var != NULL ? 1 : 0);
}
texel = convert_texel(b, src_fmt, dst_fmt, texel);
write_frag(b, &key->dst.view, aspect, color_var, texel);
write_frag(b, &key->dst.view, dst_aspect, color_var, texel);
}
return b->shader;
@ -1759,7 +1761,7 @@ get_copy_image_gfx_pipeline(struct vk_device *device,
return get_gfx_copy_pipeline(
device, meta, *layout_out, key->samples, build_copy_image_fs,
key->aspects, &key->dst.view, key, sizeof(*key), pipeline_out);
key->dst.aspects, &key->dst.view, key, sizeof(*key), pipeline_out);
}
static nir_shader *
@ -1808,16 +1810,18 @@ build_copy_image_cs(const struct vk_meta_device *meta, const void *key_data)
dst_coords = nir_pad_vector_imm_int(b, dst_coords, 0, 4);
uint32_t binding = 0;
u_foreach_bit(a, key->aspects) {
VkImageAspectFlagBits aspect = 1 << a;
u_foreach_bit(a, key->src.aspects) {
VkImageAspectFlagBits src_aspect = 1 << a;
VkImageAspectFlags dst_aspect =
key->dst.aspects == key->src.aspects ? src_aspect : key->dst.aspects;
VkFormat src_fmt =
copy_img_view_format_for_aspect(&key->src.view, aspect);
copy_img_view_format_for_aspect(&key->src.view, src_aspect);
VkFormat dst_fmt =
copy_img_view_format_for_aspect(&key->dst.view, aspect);
copy_img_view_format_for_aspect(&key->dst.view, dst_aspect);
nir_deref_instr *tex =
tex_deref(b, &key->src.view, aspect, key->samples, binding);
tex_deref(b, &key->src.view, src_aspect, key->samples, binding);
nir_deref_instr *img =
img_deref(b, &key->dst.view, aspect, key->samples, binding + 1);
img_deref(b, &key->dst.view, dst_aspect, key->samples, binding + 1);
for (uint32_t s = 0; s < key->samples; s++) {
nir_def *sample_id =
@ -1825,7 +1829,7 @@ build_copy_image_cs(const struct vk_meta_device *meta, const void *key_data)
nir_def *texel = read_texel(b, tex, src_coords, sample_id);
texel = convert_texel(b, src_fmt, dst_fmt, texel);
write_img(b, &key->dst.view, aspect, key->samples, img, dst_coords,
write_img(b, &key->dst.view, dst_aspect, key->samples, img, dst_coords,
sample_id, texel);
}
@ -1874,14 +1878,14 @@ copy_image_prepare_gfx_desc_set(
{
struct vk_device *dev = cmd->base.device;
const struct vk_device_dispatch_table *disp = &dev->dispatch_table;
VkImageAspectFlags aspects = key->aspects;
VkImageAspectFlags src_aspects = key->src.aspects;
VkImageView iviews[] = {
VK_NULL_HANDLE,
VK_NULL_HANDLE,
};
uint32_t desc_count = 0;
u_foreach_bit(a, aspects) {
u_foreach_bit(a, src_aspects) {
assert(desc_count < ARRAY_SIZE(iviews));
VkResult result = copy_create_src_image_view(
@ -1912,7 +1916,7 @@ copy_image_prepare_compute_desc_set(
{
struct vk_device *dev = cmd->base.device;
const struct vk_device_dispatch_table *disp = &dev->dispatch_table;
VkImageAspectFlags aspects = key->aspects;
VkImageAspectFlags src_aspects = key->src.aspects;
VkImageView iviews[] = {
VK_NULL_HANDLE,
VK_NULL_HANDLE,
@ -1921,23 +1925,21 @@ copy_image_prepare_compute_desc_set(
};
unsigned desc_count = 0;
u_foreach_bit(a, aspects) {
VkImageAspectFlagBits aspect = 1 << a;
u_foreach_bit(a, src_aspects) {
VkImageAspectFlagBits src_aspect = 1 << a;
VkImageAspectFlags dst_aspect =
key->dst.aspects == key->src.aspects ? src_aspect : key->dst.aspects;
assert(desc_count + 2 <= ARRAY_SIZE(iviews));
VkResult result = copy_create_src_image_view(
cmd, meta, src_img, &key->src.view, aspect, &region->srcSubresource,
cmd, meta, src_img, &key->src.view, src_aspect, &region->srcSubresource,
&iviews[desc_count++]);
if (unlikely(result != VK_SUCCESS))
return result;
if (region->srcSubresource.aspectMask !=
region->dstSubresource.aspectMask)
aspect = region->dstSubresource.aspectMask;
result = copy_create_dst_image_view(
cmd, meta, dst_img, &key->dst.view, aspect, &region->dstOffset,
cmd, meta, dst_img, &key->dst.view, dst_aspect, &region->dstOffset,
&region->extent, &region->dstSubresource,
VK_PIPELINE_BIND_POINT_COMPUTE, &iviews[desc_count++]);
if (unlikely(result != VK_SUCCESS))
@ -2075,17 +2077,36 @@ aspect_masks_valid(struct vk_image *src_img, struct vk_image *dst_img,
const struct vk_format_ycbcr_info *dst_ycbcr_info =
vk_format_get_ycbcr_info(dst_img->format);
/* From the Vulkan 1.4.303 spec, vkCmdCopyImage:
*
* VUID-vkCmdCopyImage-srcImage-01551
*
* "If neither srcImage nor dstImage has a multi-planar image format
* then for each element of pRegions, srcSubresource.aspectMask and
* dstSubresource.aspectMask must match"
*/
if (!src_ycbcr_info && !dst_ycbcr_info)
return region->srcSubresource.aspectMask ==
region->dstSubresource.aspectMask;
if (!src_ycbcr_info && !dst_ycbcr_info) {
const VkImageAspectFlags valid_aspects =
VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT |
VK_IMAGE_ASPECT_STENCIL_BIT;
assert(!(region->srcSubresource.aspectMask & ~valid_aspects) &&
!(region->dstSubresource.aspectMask & ~valid_aspects));
/* From the Vulkan 1.4.303 spec, vkCmdCopyImage:
*
* VUID-vkCmdCopyImage-srcSubresource-10214
*
* "If srcSubresource.aspectMask is VK_IMAGE_ASPECT_COLOR_BIT, then
* dstSubresource.aspectMask must not contain both
* VK_IMAGE_ASPECT_DEPTH_BIT and VK_IMAGE_ASPECT_STENCIL_BIT"
*
* VUID-vkCmdCopyImage-dstSubresource-10215
*
* "If dstSubresource.aspectMask is VK_IMAGE_ASPECT_COLOR_BIT, then
* srSubresource.aspectMask must not contain both
* VK_IMAGE_ASPECT_DEPTH_BIT and VK_IMAGE_ASPECT_STENCIL_BIT"
*/
if ((region->srcSubresource.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT ||
region->dstSubresource.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) &&
(util_bitcount(region->srcSubresource.aspectMask) != 1 ||
util_bitcount(region->dstSubresource.aspectMask) != 1))
return false;
return true;
}
/* VUID-vkCmdCopyImage-srcImage-08713
*
@ -2156,10 +2177,11 @@ copy_image_region_gfx(struct vk_command_buffer *cmd,
struct vk_meta_copy_image_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_GFX,
.samples = src_img->samples,
.aspects = region->srcSubresource.aspectMask,
.src.aspects = region->srcSubresource.aspectMask,
.src.view = img_copy_view_info(vk_image_sampled_view_type(src_img),
region->srcSubresource.aspectMask, src_img,
src_props),
.dst.aspects = region->dstSubresource.aspectMask,
.dst.view = img_copy_view_info(dst_view_type,
region->dstSubresource.aspectMask, dst_img,
dst_props),
@ -2215,10 +2237,11 @@ copy_image_region_compute(struct vk_command_buffer *cmd,
struct vk_meta_copy_image_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_CS,
.samples = src_img->samples,
.aspects = region->srcSubresource.aspectMask,
.src.aspects = region->srcSubresource.aspectMask,
.src.view = img_copy_view_info(vk_image_sampled_view_type(src_img),
region->srcSubresource.aspectMask, src_img,
src_props),
.dst.aspects = region->dstSubresource.aspectMask,
.dst.view = img_copy_view_info(
dst_view_type, region->dstSubresource.aspectMask, dst_img, dst_props),
};