diff --git a/src/dxvk/dxvk_descriptor.cpp b/src/dxvk/dxvk_descriptor.cpp index 112011cb1..bb09d5178 100644 --- a/src/dxvk/dxvk_descriptor.cpp +++ b/src/dxvk/dxvk_descriptor.cpp @@ -305,10 +305,7 @@ namespace dxvk { { VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, maxSets / 64 }, { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, maxSets * 1 } }}; - VkDescriptorPoolCreateInfo info; - info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; - info.pNext = nullptr; - info.flags = 0; + VkDescriptorPoolCreateInfo info = { VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO }; info.maxSets = maxSets; info.poolSizeCount = pools.size(); info.pPoolSizes = pools.data(); diff --git a/src/dxvk/dxvk_gpu_event.cpp b/src/dxvk/dxvk_gpu_event.cpp index b54303f7d..6166ca09a 100644 --- a/src/dxvk/dxvk_gpu_event.cpp +++ b/src/dxvk/dxvk_gpu_event.cpp @@ -58,10 +58,7 @@ namespace dxvk { } if (!event) { - VkEventCreateInfo info; - info.sType = VK_STRUCTURE_TYPE_EVENT_CREATE_INFO; - info.pNext = nullptr; - info.flags = 0; + VkEventCreateInfo info = { VK_STRUCTURE_TYPE_EVENT_CREATE_INFO }; VkResult status = m_vkd->vkCreateEvent( m_vkd->device(), &info, nullptr, &event); diff --git a/src/dxvk/dxvk_gpu_query.cpp b/src/dxvk/dxvk_gpu_query.cpp index 40d3a0910..426b58f6e 100644 --- a/src/dxvk/dxvk_gpu_query.cpp +++ b/src/dxvk/dxvk_gpu_query.cpp @@ -183,13 +183,9 @@ namespace dxvk { void DxvkGpuQueryAllocator::createQueryPool() { - VkQueryPoolCreateInfo info; - info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO; - info.pNext = nullptr; - info.flags = 0; + VkQueryPoolCreateInfo info = { VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO }; info.queryType = m_queryType; info.queryCount = m_queryPoolSize; - info.pipelineStatistics = 0; if (m_queryType == VK_QUERY_TYPE_PIPELINE_STATISTICS) { info.pipelineStatistics diff --git a/src/dxvk/dxvk_memory.cpp b/src/dxvk/dxvk_memory.cpp index 279700d85..308bee3e1 100644 --- a/src/dxvk/dxvk_memory.cpp +++ b/src/dxvk/dxvk_memory.cpp @@ -407,17 +407,16 @@ namespace dxvk { result.memFlags = flags; result.priority = priority; - VkMemoryPriorityAllocateInfoEXT prio; - prio.sType = VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT; - prio.pNext = dedAllocInfo; + VkMemoryPriorityAllocateInfoEXT prio = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT }; prio.priority = priority; - VkMemoryAllocateInfo info; - info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; - info.pNext = useMemoryPriority ? &prio : prio.pNext; + VkMemoryAllocateInfo info = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, dedAllocInfo }; info.allocationSize = size; info.memoryTypeIndex = type->memTypeId; + if (useMemoryPriority) + prio.pNext = std::exchange(info.pNext, &prio); + if (m_vkd->vkAllocateMemory(m_vkd->device(), &info, nullptr, &result.memHandle) != VK_SUCCESS) return DxvkDeviceMemory();