VERY experimental Nintendo Switch 2 emulator
C++
renderer_vulkan: Add missing initializers
GPUCode7b3718dc9cbd
diff --git a/externals/vma/vma.cpp b/externals/vma/vma.cppindex 7f7df9cffd..ff1acc3200 100644--- a/externals/vma/vma.cpp+++ b/externals/vma/vma.cpp@@ -2,4 +2,6 @@// SPDX-License-Identifier: GPL-2.0-or-later#define VMA_IMPLEMENTATION+#define VMA_STATIC_VULKAN_FUNCTIONS 0+#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1#include <vk_mem_alloc.h>\ No newline at end of filediff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex 541f0c1dae..94dd1aa14c 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -597,18 +597,22 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHRgraphics_queue = logical.GetQueue(graphics_family);present_queue = logical.GetQueue(present_family);- const VmaVulkanFunctions functions = {- .vkGetInstanceProcAddr = dld.vkGetInstanceProcAddr,- .vkGetDeviceProcAddr = dld.vkGetDeviceProcAddr,- };+ VmaVulkanFunctions functions{};+ functions.vkGetInstanceProcAddr = dld.vkGetInstanceProcAddr;+ functions.vkGetDeviceProcAddr = dld.vkGetDeviceProcAddr;const VmaAllocatorCreateInfo allocator_info = {.flags = VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT,.physicalDevice = physical,.device = *logical,+ .preferredLargeHeapBlockSize = 0,+ .pAllocationCallbacks = nullptr,+ .pDeviceMemoryCallbacks = nullptr,+ .pHeapSizeLimit = nullptr,.pVulkanFunctions = &functions,.instance = instance,.vulkanApiVersion = VK_API_VERSION_1_1,+ .pTypeExternalMemoryHandleTypes = nullptr,};vk::Check(vmaCreateAllocator(&allocator_info, &allocator));diff --git a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp b/src/video_core/vulkan_common/vulkan_memory_allocator.cppindex d2e1ef58e4..20d36680cc 100644--- a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp+++ b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp@@ -75,7 +75,7 @@ struct Range {[[nodiscard]] VkMemoryPropertyFlags MemoryUsagePreferedVmaFlags(MemoryUsage usage) {return usage != MemoryUsage::DeviceLocal ? VK_MEMORY_PROPERTY_HOST_COHERENT_BIT- : VkMemoryPropertyFlags{};+ : VkMemoryPropertyFlagBits{};}[[nodiscard]] VmaAllocationCreateFlags MemoryUsageVmaFlags(MemoryUsage usage) {@@ -239,8 +239,10 @@ vk::Image MemoryAllocator::CreateImage(const VkImageCreateInfo& ci) const {.usage = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE,.requiredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,.preferredFlags = 0,+ .memoryTypeBits = 0,.pool = VK_NULL_HANDLE,.pUserData = nullptr,+ .priority = 0.f,};VkImage handle{};@@ -259,8 +261,10 @@ vk::Buffer MemoryAllocator::CreateBuffer(const VkBufferCreateInfo& ci, MemoryUsa.usage = MemoryUsageVma(usage),.requiredFlags = MemoryUsageRequiredVmaFlags(usage),.preferredFlags = MemoryUsagePreferedVmaFlags(usage),+ .memoryTypeBits = 0,.pool = VK_NULL_HANDLE,.pUserData = nullptr,+ .priority = 0.f,};VkBuffer handle{};