From 765cdedcd04873c84d1cbdb596ad755dde129103 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 2 Jan 2025 18:26:25 +0100 Subject: [PATCH] radv: fix adding the BO to cmdbuf list when starting conditional rendering Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: (cherry picked from commit 9b827556f52748976e76667a83a667d3673f0b21) --- .pick_status.json | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 1add858d777..27e3c6a28d1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -14,7 +14,7 @@ "description": "radv: fix adding the BO to cmdbuf list when starting conditional rendering", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 691ee223b5a..ee217b3c8fb 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -13249,11 +13249,14 @@ radv_CmdBeginConditionalRenderingEXT(VkCommandBuffer commandBuffer, { VK_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); VK_FROM_HANDLE(radv_buffer, buffer, pConditionalRenderingBegin->buffer); + struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); bool draw_visible = true; uint64_t va; va = radv_buffer_get_va(buffer->bo) + buffer->offset + pConditionalRenderingBegin->offset; + radv_cs_add_buffer(device->ws, cmd_buffer->cs, buffer->bo); + /* By default, if the 32-bit value at offset in buffer memory is zero, * then the rendering commands are discarded, otherwise they are * executed as normal. If the inverted flag is set, all commands are