From 2dfd1b915168459b03e88f3ae5ae1dce4ea71bf4 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Mon, 9 Sep 2024 12:28:27 -0500 Subject: [PATCH] nvk: Move flush_push_descriptors to the front of flush_state() Part-of: --- src/nouveau/vulkan/nvk_cmd_draw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index ce90588b186..98e3827329a 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -2898,8 +2898,6 @@ nvk_flush_descriptors(struct nvk_cmd_buffer *cmd) const uint32_t min_cbuf_alignment = nvk_min_cbuf_alignment(&pdev->info); struct nvk_descriptor_state *desc = &cmd->state.gfx.descriptors; - nvk_cmd_buffer_flush_push_descriptors(cmd, desc); - /* Find cbuf maps for the 5 cbuf groups */ const struct nvk_shader *cbuf_shaders[5] = { NULL, }; for (gl_shader_stage stage = 0; stage < MESA_SHADER_STAGES; stage++) { @@ -2996,6 +2994,7 @@ nvk_flush_descriptors(struct nvk_cmd_buffer *cmd) static void nvk_flush_gfx_state(struct nvk_cmd_buffer *cmd) { + nvk_cmd_buffer_flush_push_descriptors(cmd, &cmd->state.gfx.descriptors); nvk_flush_shaders(cmd); nvk_flush_dynamic_state(cmd); nvk_flush_descriptors(cmd);