From 7b0639325708d2236d90b0d7d3dff6d33e981912 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 29 Mar 2024 13:45:19 +0100 Subject: [PATCH] panvk: Don't assume pViewportState != NULL Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/vulkan/panvk_vX_pipeline.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/panfrost/vulkan/panvk_vX_pipeline.c b/src/panfrost/vulkan/panvk_vX_pipeline.c index 26c2bb76113..371840acafa 100644 --- a/src/panfrost/vulkan/panvk_vX_pipeline.c +++ b/src/panfrost/vulkan/panvk_vX_pipeline.c @@ -520,11 +520,13 @@ panvk_pipeline_builder_parse_viewport(struct panvk_pipeline_builder *builder, builder->create_info.gfx->pViewportState->pScissors, vpd); pipeline->vpd = pipeline->state_bo->addr.dev + builder->vpd_offset; } - if (panvk_pipeline_static_state(pipeline, VK_DYNAMIC_STATE_VIEWPORT)) + if (panvk_pipeline_static_state(pipeline, VK_DYNAMIC_STATE_VIEWPORT) && + builder->create_info.gfx->pViewportState) pipeline->viewport = builder->create_info.gfx->pViewportState->pViewports[0]; - if (panvk_pipeline_static_state(pipeline, VK_DYNAMIC_STATE_SCISSOR)) + if (panvk_pipeline_static_state(pipeline, VK_DYNAMIC_STATE_SCISSOR) && + builder->create_info.gfx->pViewportState) pipeline->scissor = builder->create_info.gfx->pViewportState->pScissors[0]; }