From bf3b1d8ea9df4163904ed8366bd4034b2647b013 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 14 Oct 2024 10:55:12 -0700 Subject: [PATCH] anv: when handling descriptor sets, layout cannot be NULL if dynamic_offets are used We have no cases where we intentionally pass a NULL layout when dynamic offsets, and doing so would cause a null dereference. Le't asd an assert for that. CID: 1620447 Fixes: f39cd30f4fd ("anv: Track all the descriptor sets") Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_cmd_buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c index f42a4acef99..d2480a74948 100644 --- a/src/intel/vulkan/anv_cmd_buffer.c +++ b/src/intel/vulkan/anv_cmd_buffer.c @@ -875,6 +875,7 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer, if (dynamic_offsets) { if (set_layout->dynamic_offset_count > 0) { struct anv_push_constants *push = &pipe_state->push_constants; + assert(layout != NULL); uint32_t dynamic_offset_start = layout->set[set_index].dynamic_offset_start; uint32_t *push_offsets =