lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-07 15:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update VMA Allocator to v3.0.1

Browse Source 
Disabled warnings 4189, 4324 for vk_test.cpp

4189: 'identifier' : local variable is initialized but not referenced

4324: 'struct_name' : structure was padded due to __declspec(align())

because of warnings in vk_mem_alloc.h
This commit is contained in:
Jake Turner
2023-12-22 12:53:40 +00:00
parent 65e77c56ba
commit 6895194805
4 changed files with 15786 additions and 9690 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/3rdparty/VulkanMemoryAllocator/README.md
Vendored
+1 -1
View File
@@ -1 +1 @@
VulkanMemoryAllocator from https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator at v2.1.0
VulkanMemoryAllocator from https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator at v3.0.1
util/test/demos/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
Vendored
+15777 -9687
View File
File diff suppressed because it is too large Load Diff
util/test/demos/demos.vcxproj
+4 -1
View File
@@ -361,7 +361,10 @@
<ClCompile Include="vk\vk_video_textures.cpp" />
<ClCompile Include="vk\vk_vs_max_desc_set.cpp" />
<ClCompile Include="vk\vk_simple_triangle.cpp" />
<ClCompile Include="vk\vk_test.cpp" />
<ClCompile Include="vk\vk_test.cpp">
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Development|x64'">4100;4054;4055;4189;4324</DisableSpecificWarnings>
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4100;4054;4055;4189;4324</DisableSpecificWarnings>
</ClCompile>
<ClCompile Include="3rdparty\volk\volk.c" />
<ClCompile Include="win32\win32_platform.cpp" />
<ClCompile Include="win32\win32_window.cpp" />
util/test/demos/vk/vk_test.cpp
+4 -1
View File
@@ -717,6 +717,8 @@ bool VulkanGraphicsTest::Init()
}
VmaVulkanFunctions funcs = {
vkGetInstanceProcAddr,
vkGetDeviceProcAddr,
vkGetPhysicalDeviceProperties,
vkGetPhysicalDeviceMemoryProperties,
vkAllocateMemory,
@@ -733,14 +735,15 @@ bool VulkanGraphicsTest::Init()
vkDestroyBuffer,
vkCreateImage,
vkDestroyImage,
vkCmdCopyBuffer,
vkGetBufferMemoryRequirements2KHR,
vkGetImageMemoryRequirements2KHR,
};
VmaAllocatorCreateInfo allocInfo = {};
allocInfo.instance = instance;
allocInfo.physicalDevice = phys;
allocInfo.device = device;
allocInfo.frameInUseCount = 4;
allocInfo.pVulkanFunctions = &funcs;
if(hasExt(VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME) && vmaDedicated)
allocInfo.flags |= VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT;