From 8f25cc0bbc3f348e8548aa2467db6724f4f0246e Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Tue, 19 Nov 2024 18:37:15 -0800 Subject: [PATCH] panvk: inherit sample count in secondary cmdbufs Fixes crashes in dEQP-VK.draw.dynamic_rendering.partial_secondary_cmd_buff.multiple_interpolation.* src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c:1413: void panvk_cmd_draw(struct panvk_cmd_buffer *, struct panvk_draw_info *): Assertion `rasterization_samples == fbinfo->nr_samples' failed. Signed-off-by: Benjamin Lee Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c index a38a436aaf3..c9f5ae985c2 100644 --- a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c +++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c @@ -1673,7 +1673,7 @@ panvk_per_arch(cmd_inherit_render_state)( cmdbuf->state.gfx.render.layer_count = 0; *fbinfo = (struct pan_fb_info){ .tile_buf_budget = panfrost_query_optimal_tib_size(phys_dev->model), - .nr_samples = 1, + .nr_samples = inheritance_info->rasterizationSamples, .rt_count = inheritance_info->colorAttachmentCount, };