From 3f9450b4e5c889552f87cfdd846391f055e84d73 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 9 Aug 2022 15:01:28 +0200 Subject: [PATCH] vulkan: initialize discardRectangleCount even if the state is dynamic Only the array of rectangles should be dynamic. Signed-off-by: Samuel Pitoiset Reviewed-by: Jason Ekstrand Part-of: --- src/vulkan/runtime/vk_graphics_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c index 2ca8dfced50..164526b33cc 100644 --- a/src/vulkan/runtime/vk_graphics_state.c +++ b/src/vulkan/runtime/vk_graphics_state.c @@ -403,11 +403,11 @@ vk_discard_rectangles_state_init(struct vk_discard_rectangles_state *dr, if (dr_info == NULL) return; + assert(dr_info->discardRectangleCount <= MESA_VK_MAX_DISCARD_RECTANGLES); dr->mode = dr_info->discardRectangleMode; + dr->rectangle_count = dr_info->discardRectangleCount; if (!IS_DYNAMIC(DR_RECTANGLES)) { - assert(dr_info->discardRectangleCount <= MESA_VK_MAX_DISCARD_RECTANGLES); - dr->rectangle_count = dr_info->discardRectangleCount; typed_memcpy(dr->rectangles, dr_info->pDiscardRectangles, dr_info->discardRectangleCount); }