From 712c11fc1714688dae24ddb3ed58a17a64d21023 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 16 Oct 2024 12:26:54 +0200 Subject: [PATCH] panvk: assert on missing vs A vs is always required, and we already dereference it in this function unconditionally. Let's add an assert to be sure, and drop the run-time check here. CID: 1620449 Reviewed-by: Boris Brezillon Part-of: --- src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c index 7f0625ef7ee..5a747335232 100644 --- a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c +++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c @@ -1359,6 +1359,8 @@ prepare_draw(struct panvk_cmd_buffer *cmdbuf, struct panvk_draw_info *draw) bool idvs = vs->info.vs.idvs; VkResult result; + assert(vs); + /* FIXME: support non-IDVS. */ assert(idvs); @@ -1414,7 +1416,7 @@ prepare_draw(struct panvk_cmd_buffer *cmdbuf, struct panvk_draw_info *draw) uint32_t varying_size = 0; - if (vs && fs) { + if (fs) { unsigned vs_vars = vs->info.varyings.output_count; unsigned fs_vars = fs->info.varyings.input_count; unsigned var_slots = MAX2(vs_vars, fs_vars);