From 0a5a4562596adc53fd842964463afe169955ab15 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Mon, 27 Oct 2025 12:24:25 -0400 Subject: [PATCH] nvk: Switch to CmdEndRendering2KHR() Reviewed-by: Mel Henning Part-of: --- src/nouveau/vulkan/nvk_cmd_clear.c | 6 +++++- src/nouveau/vulkan/nvk_cmd_draw.c | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_clear.c b/src/nouveau/vulkan/nvk_cmd_clear.c index 2f55b8686a7..6352678a430 100644 --- a/src/nouveau/vulkan/nvk_cmd_clear.c +++ b/src/nouveau/vulkan/nvk_cmd_clear.c @@ -323,7 +323,11 @@ clear_image(struct nvk_cmd_buffer *cmd, render.pStencilAttachment = &vk_att; nvk_CmdBeginRendering(nvk_cmd_buffer_to_handle(cmd), &render); - nvk_CmdEndRendering(nvk_cmd_buffer_to_handle(cmd)); + + const VkRenderingEndInfoKHR end = { + .sType = VK_STRUCTURE_TYPE_RENDERING_END_INFO_KHR, + }; + nvk_CmdEndRendering2KHR(nvk_cmd_buffer_to_handle(cmd), &end); nvk_image_view_finish(dev, &view); } diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 45f37e32869..aacfbfa02e6 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -1481,7 +1481,8 @@ nvk_CmdBeginRendering(VkCommandBuffer commandBuffer, } VKAPI_ATTR void VKAPI_CALL -nvk_CmdEndRendering(VkCommandBuffer commandBuffer) +nvk_CmdEndRendering2KHR(VkCommandBuffer commandBuffer, + const VkRenderingEndInfoKHR *pRenderingEndInfo) { VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer); struct nvk_rendering_state *render = &cmd->state.gfx.render;