From da74e86cb7346411847fcc85e66c456bd6a7417c Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Mon, 12 Apr 2021 12:15:47 +0200 Subject: [PATCH] radv: Allocate buffer list for MUTABLE descriptor types as well. Fixes: 86644b84b94 ("radv: Implement VK_VALVE_mutable_descriptor_type.") Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit 08fdaec473c9596aba2fe9947eb800b0282bdf26) --- .pick_status.json | 2 +- src/amd/vulkan/radv_descriptor_set.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 1719f0d1394..6fccacaa724 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1075,7 +1075,7 @@ "description": "radv: Allocate buffer list for MUTABLE descriptor types as well.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "86644b84b94910ddb78b7a1117b8bcf55bb76265" }, diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index be8782ddca5..d51492ce01b 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -242,6 +242,7 @@ radv_CreateDescriptorSetLayout(VkDevice _device, const VkDescriptorSetLayoutCrea &mutable_size, &mutable_align); assert(mutable_size && mutable_align); set_layout->binding[b].size = mutable_size; + binding_buffer_count = 1; alignment = mutable_align; break; }