From b42522a7194132e00dfc4469c0dd00a2c41c67f5 Mon Sep 17 00:00:00 2001
From: Luigi Santivetti <luigi.santivetti@imgtec.com>
Date: Thu, 18 Sep 2025 12:15:01 +0100
Subject: [PATCH] pvr: split framebuffer clear values allocation and setup

Signed-off-by: Luigi Santivetti <luigi.santivetti@imgtec.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38744>
---
 src/imagination/vulkan/pvr_cmd_buffer.c | 70 +++++++++++++++++--------
 1 file changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
index 6e12c7ff66a..3e391827ec8 100644
--- a/src/imagination/vulkan/pvr_cmd_buffer.c
+++ b/src/imagination/vulkan/pvr_cmd_buffer.c
@@ -3379,42 +3379,68 @@ static bool pvr_loadops_contain_clear(struct pvr_renderpass_hwsetup *hw_setup)
    return false;
 }
 
+static inline void
+pvr_cmd_buffer_clear_values_free(struct pvr_cmd_buffer *cmd_buffer)
+{
+   struct pvr_cmd_buffer_state *state = &cmd_buffer->state;
+
+   vk_free(&cmd_buffer->vk.pool->alloc, state->render_pass_info.clear_values);
+   state->render_pass_info.clear_value_count = 0;
+   state->render_pass_info.clear_values = NULL;
+}
+
 static VkResult
-pvr_cmd_buffer_set_clear_values(struct pvr_cmd_buffer *cmd_buffer,
-                                const VkRenderPassBeginInfo *pRenderPassBegin)
+pvr_cmd_buffer_clear_values_alloc(struct pvr_cmd_buffer *cmd_buffer,
+                                  uint32_t clear_value_count)
 {
    struct pvr_cmd_buffer_state *state = &cmd_buffer->state;
 
    /* Free any previously allocated clear values. */
    vk_free(&cmd_buffer->vk.pool->alloc, state->render_pass_info.clear_values);
 
-   if (pRenderPassBegin->clearValueCount) {
-      const size_t size = pRenderPassBegin->clearValueCount *
-                          sizeof(*state->render_pass_info.clear_values);
-
-      state->render_pass_info.clear_values =
-         vk_zalloc(&cmd_buffer->vk.pool->alloc,
-                   size,
-                   8,
-                   VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
-      if (!state->render_pass_info.clear_values) {
-         return vk_command_buffer_set_error(&cmd_buffer->vk,
-                                            VK_ERROR_OUT_OF_HOST_MEMORY);
-      }
-
-      memcpy(state->render_pass_info.clear_values,
-             pRenderPassBegin->pClearValues,
-             size);
-   } else {
+   state->render_pass_info.clear_value_count = clear_value_count;
+   if (!clear_value_count) {
       state->render_pass_info.clear_values = NULL;
+      return VK_SUCCESS;
    }
 
-   state->render_pass_info.clear_value_count =
-      pRenderPassBegin->clearValueCount;
+   const size_t size = clear_value_count *
+      sizeof(*state->render_pass_info.clear_values);
+
+   state->render_pass_info.clear_values =
+      vk_zalloc(&cmd_buffer->vk.pool->alloc,
+                size,
+                8,
+                VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
+   if (!state->render_pass_info.clear_values) {
+      return vk_command_buffer_set_error(&cmd_buffer->vk,
+                                         VK_ERROR_OUT_OF_HOST_MEMORY);
+   }
 
    return VK_SUCCESS;
 }
 
+static VkResult
+pvr_cmd_buffer_set_clear_values(struct pvr_cmd_buffer *cmd_buffer,
+                                const VkRenderPassBeginInfo *pRenderPassBegin)
+{
+   struct pvr_cmd_buffer_state *state = &cmd_buffer->state;
+   const size_t size = pRenderPassBegin->clearValueCount *
+      sizeof(*state->render_pass_info.clear_values);
+   VkResult result;
+
+   result = pvr_cmd_buffer_clear_values_alloc(cmd_buffer,
+                                              pRenderPassBegin->clearValueCount);
+   if (result != VK_SUCCESS)
+      return result;
+
+   memcpy(state->render_pass_info.clear_values,
+          pRenderPassBegin->pClearValues,
+          size);
+
+   return result;
+}
+
 /**
  * \brief Indicates whether to use the large or normal clear state words.
  *