From 14597315f89b71fd5e465b9cb0844908b4fd3ae2 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 15 Jun 2021 08:27:43 -0700 Subject: [PATCH] zink: use max-descriptor define This avoids compile errors on MSVC due to VLAs. Reviewed-by: Hoe Hao Cheng Reviewed-By: Mike Blumenkrantz Part-of: --- src/gallium/drivers/zink/zink_descriptors.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index f4bce1823e2..af906ac805b 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -339,7 +339,7 @@ descriptor_layout_create(struct zink_screen *screen, enum zink_descriptor_type t dcslci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; dcslci.pNext = NULL; VkDescriptorSetLayoutBindingFlagsCreateInfo fci = {0}; - VkDescriptorBindingFlags flags[num_bindings]; + VkDescriptorBindingFlags flags[ZINK_MAX_DESCRIPTORS_PER_TYPE]; if (screen->descriptor_mode == ZINK_DESCRIPTOR_MODE_LAZY) { dcslci.pNext = &fci; if (t == ZINK_DESCRIPTOR_TYPES) @@ -1235,9 +1235,8 @@ update_descriptors_internal(struct zink_context *ctx, struct zink_descriptor_set } unsigned num_resources = 0; - unsigned num_descriptors = zds[h]->pool->key.layout->num_descriptors; ASSERTED unsigned num_bindings = zds[h]->pool->num_resources; - VkWriteDescriptorSet wds[num_descriptors]; + VkWriteDescriptorSet wds[ZINK_MAX_DESCRIPTORS_PER_TYPE]; unsigned num_wds = 0; for (int i = 0; i < num_stages; i++) {