From 10bdf616a7094969b2912777e3728986403e4af2 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 30 Nov 2023 13:28:29 +0000
Subject: [PATCH] Fix memory corruption properly in test

---
 util/test/demos/vk/vk_parameter_zoo.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/util/test/demos/vk/vk_parameter_zoo.cpp b/util/test/demos/vk/vk_parameter_zoo.cpp
index 485914692..f37f06dec 100644
--- a/util/test/demos/vk/vk_parameter_zoo.cpp
+++ b/util/test/demos/vk/vk_parameter_zoo.cpp
@@ -471,7 +471,7 @@ void main()
         {10, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, VK_SHADER_STAGE_VERTEX_BIT},
     }));
 
-    vkh::DescriptorSetLayoutCreateInfo refsetlayoutcreateinfo = vkh::DescriptorSetLayoutCreateInfo({
+    std::vector<VkDescriptorSetLayoutBinding> refsetlayoutbinds = {
         {0, VK_DESCRIPTOR_TYPE_SAMPLER, 1, VK_SHADER_STAGE_VERTEX_BIT},
         {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_VERTEX_BIT},
         {2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1, VK_SHADER_STAGE_VERTEX_BIT},
@@ -482,10 +482,12 @@ void main()
         {7, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_VERTEX_BIT},
         {8, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1, VK_SHADER_STAGE_VERTEX_BIT},
         {9, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, 1, VK_SHADER_STAGE_VERTEX_BIT},
-    });
+    };
 
-    VkDescriptorSetLayout refsetlayout = createDescriptorSetLayout(refsetlayoutcreateinfo);
-    VkDescriptorSetLayout refsetlayout_copy = createDescriptorSetLayout(refsetlayoutcreateinfo);
+    VkDescriptorSetLayout refsetlayout =
+        createDescriptorSetLayout(vkh::DescriptorSetLayoutCreateInfo(refsetlayoutbinds));
+    VkDescriptorSetLayout refsetlayout_copy =
+        createDescriptorSetLayout(vkh::DescriptorSetLayoutCreateInfo(refsetlayoutbinds));
 
     VkSampler invalidSampler = (VkSampler)0x1234;
     VkSampler validSampler = createSampler(vkh::SamplerCreateInfo(VK_FILTER_LINEAR));