radv: fix setting the number of rectangles when it's dyanmic

We need to know the number of rectangles.

This fixes new CTS dEQP-VK.draw.discard_rectangles.dynamic_*.

Fixes: 5db0bf99944 ("radv: Implement VK_EXT_discard_rectangles.")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 5383f00e75480a537543cb6ceb37cc7bd57db022..f25a5f55bf5c55f1dd12b0e021fd4cf214bac121 100644 (file)
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -1417,11 +1417,13 @@ radv_pipeline_init_dynamic_state(struct radv_pipeline *pipeline,
 
        const  VkPipelineDiscardRectangleStateCreateInfoEXT *discard_rectangle_info =
                        vk_find_struct_const(pCreateInfo->pNext, PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT);
-       if (states & RADV_DYNAMIC_DISCARD_RECTANGLE) {
+       if (needed_states & RADV_DYNAMIC_DISCARD_RECTANGLE) {
                dynamic->discard_rectangle.count = discard_rectangle_info->discardRectangleCount;
-               typed_memcpy(dynamic->discard_rectangle.rectangles,
-                            discard_rectangle_info->pDiscardRectangles,
-                            discard_rectangle_info->discardRectangleCount);
+               if (states & RADV_DYNAMIC_DISCARD_RECTANGLE) {
+                       typed_memcpy(dynamic->discard_rectangle.rectangles,
+                                    discard_rectangle_info->pDiscardRectangles,
+                                    discard_rectangle_info->discardRectangleCount);
+               }
        }
 
        pipeline->dynamic_state.mask = states;