From: Dave Airlie Date: Mon, 12 Jun 2017 23:36:15 +0000 (+1000) Subject: radv: move assert down in radv_bind_descriptor_set X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9cce302951cda4604b1ed953bf9d16f60210e5e1;p=mesa.git radv: move assert down in radv_bind_descriptor_set coverity complains about the deref before NULL check. Reviewed-by: Bas Nieuwenhuizen Signed-off-by: Dave Airlie --- diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index b08f218549a..9f36d982234 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2015,13 +2015,13 @@ void radv_bind_descriptor_set(struct radv_cmd_buffer *cmd_buffer, { struct radeon_winsys *ws = cmd_buffer->device->ws; - assert(!(set->layout->flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)); - cmd_buffer->state.descriptors[idx] = set; cmd_buffer->state.descriptors_dirty |= (1u << idx); if (!set) return; + assert(!(set->layout->flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)); + for (unsigned j = 0; j < set->layout->buffer_count; ++j) if (set->descriptors[j]) ws->cs_add_buffer(cmd_buffer->cs, set->descriptors[j], 7);