From bb3274f0d8913b046fa833dbd2c8e7b523fe1e47 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 2 Jul 2025 10:11:30 -0400 Subject: [PATCH] nvk: Pass the pipe_format to copy_remap_format() This changed in 76c6157902f1 ("nil/copy: Base swizzling on the per-plane pipe_format") but I missed the case for linear render targets. Fixes: 76c6157902f1 ("nil/copy: Base swizzling on the per-plane pipe_format") Part-of: --- src/nouveau/vulkan/nvk_cmd_copy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nouveau/vulkan/nvk_cmd_copy.c b/src/nouveau/vulkan/nvk_cmd_copy.c index bb2d833a989..3510e36ad39 100644 --- a/src/nouveau/vulkan/nvk_cmd_copy.c +++ b/src/nouveau/vulkan/nvk_cmd_copy.c @@ -682,7 +682,8 @@ nvk_linear_render_copy(struct nvk_cmd_buffer *cmd, src_plane->nil.sample_layout), }; - copy.remap = nouveau_copy_remap_format(image->vk.format); + assert(src_plane->nil.format.p_format == dst_plane->nil.format.p_format); + copy.remap = nouveau_copy_remap_format(src_plane->nil.format.p_format); nouveau_copy_rect(cmd, ©); }