Module: Mesa Branch: main Commit: 4af6a9507f421759f35c40e7af263a722d3aeb2b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4af6a9507f421759f35c40e7af263a722d3aeb2b
Author: Matt Coster <[email protected]> Date: Thu May 18 10:26:23 2023 +0100 pvr: Fix allocation scopes in vkCreateRenderPass2() code path These previously COMMAND scoped allocations are stored on the VkRenderPass and must therefore be OBJECT scoped. Fixes: dEQP-VK.api.object_management.single_alloc_callbacks.render_pass Signed-off-by: Matt Coster <[email protected]> Reviewed-by: Karmjit Mahil <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23130> --- src/imagination/vulkan/pvr_hw_pass.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/imagination/vulkan/pvr_hw_pass.c b/src/imagination/vulkan/pvr_hw_pass.c index 47c549429a1..615bf3024e5 100644 --- a/src/imagination/vulkan/pvr_hw_pass.c +++ b/src/imagination/vulkan/pvr_hw_pass.c @@ -476,7 +476,7 @@ pvr_surface_setup_render_init(struct pvr_renderpass_context *ctx, sizeof(hw_render->color_init[0U]) * (hw_render->color_init_count + 1U), 8U, - VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (!new_color_init) return vk_error(NULL, VK_ERROR_OUT_OF_HOST_MEMORY); @@ -494,7 +494,7 @@ pvr_surface_setup_render_init(struct pvr_renderpass_context *ctx, sizeof(hw_render->init_setup.mrt_resources[0U]) * (hw_render->init_setup.num_render_targets + 1U), 8U, - VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (!new_mrt) return vk_error(NULL, VK_ERROR_OUT_OF_HOST_MEMORY); @@ -2145,7 +2145,7 @@ pvr_merge_subpass(const struct pvr_device *device, sizeof(hw_subpass->color_initops[0U]) * input_subpass->color_count, 8, - VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (!hw_subpass->color_initops) { result = vk_error(NULL, VK_ERROR_OUT_OF_HOST_MEMORY); goto end_merge_subpass;
