From 9b83bf0bfefada049d0e505402b1850ee5ab615d Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Mon, 9 Sep 2024 12:09:22 +0200 Subject: [PATCH] panvk: Ensure to clear dirty dynamic state in panvk_cmd_draw This was missing and causing dynamic state to remain dirty once set. Signed-off-by: Mary Guillemard Fixes: 1f57aae4e4f ("panvk: Move vkCmdDraw* functions to their own file") Reviewed-by: Boris Brezillon Part-of: (cherry picked from commit e47e94f9f2a3012c21f580de7a101733cc8f047e) --- .pick_status.json | 2 +- src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 1145c5a219a..0a7b1434ce9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3164,7 +3164,7 @@ "description": "panvk: Ensure to clear dirty dynamic state in panvk_cmd_draw", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "1f57aae4e4f1172c848a44e1682d73dadb14ac24", "notes": null diff --git a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c index 5f5fffc4566..c20287d6bed 100644 --- a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c +++ b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c @@ -1249,6 +1249,7 @@ panvk_cmd_draw(struct panvk_cmd_buffer *cmdbuf, struct panvk_draw_info *draw) } /* Clear the dirty flags all at once */ + vk_dynamic_graphics_state_clear_dirty(&cmdbuf->vk.dynamic_graphics_state); cmdbuf->state.gfx.dirty = 0; }