From a125accd16f1c45e71e0857ce291556acb7df52f Mon Sep 17 00:00:00 2001 From: Rajnesh Kanwal Date: Sun, 25 Sep 2022 20:36:41 +0100 Subject: [PATCH] pvr: Add assert to check for non-NULL binding_desc. Signed-off-by: Rajnesh Kanwal Reviewed-by: Frank Binns Reviewed-by: Karmjit Mahil Part-of: --- src/imagination/vulkan/pvr_pipeline.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/imagination/vulkan/pvr_pipeline.c b/src/imagination/vulkan/pvr_pipeline.c index ad06ed2..31bac62 100644 --- a/src/imagination/vulkan/pvr_pipeline.c +++ b/src/imagination/vulkan/pvr_pipeline.c @@ -279,6 +279,10 @@ static void pvr_pds_vertex_attrib_init_dma_descriptions( const VkVertexInputAttributeDescription *const attrib_desc = &vertex_input_state->pVertexAttributeDescriptions[i]; const VkVertexInputBindingDescription *binding_desc = NULL; + struct pvr_pds_vertex_dma *const dma_desc = &dma_descriptions[dma_count]; + size_t location = attrib_desc->location; + + assert(location < vs_data->inputs.num_input_vars); /* Finding the matching binding description. */ for (uint32_t j = 0; @@ -300,15 +304,8 @@ static void pvr_pds_vertex_attrib_init_dma_descriptions( * pVertexAttributeDescriptions, a * VkVertexInputBindingDescription must exist in * pVertexBindingDescriptions with the same value of binding" - * - * So we don't check if we found the matching binding description - * or not. */ - - struct pvr_pds_vertex_dma *const dma_desc = &dma_descriptions[dma_count]; - - size_t location = attrib_desc->location; - assert(location < vs_data->inputs.num_input_vars); + assert(binding_desc); dma_desc->offset = attrib_desc->offset; dma_desc->stride = binding_desc->stride; -- 2.7.4