Module: Mesa Branch: staging/21.3 Commit: 7ede5f9e924ecbb2b80421557dd5ff94b94ebbd6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ede5f9e924ecbb2b80421557dd5ff94b94ebbd6
Author: Bas Nieuwenhuizen <[email protected]> Date: Sat Jan 15 14:43:15 2022 +0100 radv: Fix preamble argument order. Used the wrong cmdbuffer in the wrong situation. Oops. Fixes: 915e9178faf ("radv: Split out commandbuffer submission.") Reviewed-By: Tatsuyuki Ishi <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14574> (cherry picked from commit 79131b6ee6c98a8b662aeb32bb623a8974f8bef5) --- .pick_status.json | 2 +- src/amd/vulkan/radv_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 33477365593..4567bddcd86 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1741,7 +1741,7 @@ "description": "radv: Fix preamble argument order.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "915e9178faf9c0ee9098b8915d8b30009ae4f08d" }, diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index a69cccfe8bc..bb64db6e34e 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -4695,7 +4695,7 @@ radv_queue_submit_deferred(struct radv_deferred_queue_submission *submission, result = radv_get_preambles(queue, submission->cmd_buffers, submission->cmd_buffer_count, - &initial_preamble_cs, &initial_flush_preamble_cs, &continue_preamble_cs); + &initial_flush_preamble_cs, &initial_preamble_cs, &continue_preamble_cs); if (result != VK_SUCCESS) goto fail;
