From a98c46f992441698e7ddfd1c9c54dd8bc77ef2c3 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 10 Sep 2025 15:01:20 +0200 Subject: [PATCH] radv/meta: fix saving push constants for depth/stensil resolves on compute Found by inspection. Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: (cherry picked from commit 2207d1e732fac36417c20e2b7f3b9147afa3b086) --- .pick_status.json | 2 +- src/amd/vulkan/meta/radv_meta_resolve_cs.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 69e0143e4f6..5c0e877bf06 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3934,7 +3934,7 @@ "description": "radv/meta: fix saving push constants for depth/stensil resolves on compute", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/meta/radv_meta_resolve_cs.c b/src/amd/vulkan/meta/radv_meta_resolve_cs.c index 3b6ab539bfc..012346f5cd9 100644 --- a/src/amd/vulkan/meta/radv_meta_resolve_cs.c +++ b/src/amd/vulkan/meta/radv_meta_resolve_cs.c @@ -455,7 +455,8 @@ radv_depth_stencil_resolve_rendering_cs(struct radv_cmd_buffer *cmd_buffer, VkIm radv_decompress_resolve_src(cmd_buffer, src_image, src_layout, ®ion); - radv_meta_save(&saved_state, cmd_buffer, RADV_META_SAVE_COMPUTE_PIPELINE | RADV_META_SAVE_DESCRIPTORS); + radv_meta_save(&saved_state, cmd_buffer, + RADV_META_SAVE_COMPUTE_PIPELINE | RADV_META_SAVE_DESCRIPTORS | RADV_META_SAVE_CONSTANTS); struct radv_image_view *dst_iview = render->ds_att.resolve_iview; VkImageLayout dst_layout =