lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-22 23:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update VMA Allocator to v3.0.1"

Browse Source 
It is causing more problems than benefits

This reverts commit 6895194805.
This commit is contained in:
Jake Turner
2024-01-03 13:34:13 +00:00
parent a871457172
commit 93eb160e08
4 changed files with 9651 additions and 15747 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 v3.0.1
VulkanMemoryAllocator from https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator at v2.1.0
util/test/demos/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h
Vendored
+9648 -15738
View File
File diff suppressed because it is too large Load Diff
util/test/demos/demos.vcxproj
+1 -4
View File
@@ -361,10 +361,7 @@
<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">
<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="vk\vk_test.cpp" />
<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
+1 -4
View File
@@ -717,8 +717,6 @@ bool VulkanGraphicsTest::Init()
}
VmaVulkanFunctions funcs = {
vkGetInstanceProcAddr,
vkGetDeviceProcAddr,
vkGetPhysicalDeviceProperties,
vkGetPhysicalDeviceMemoryProperties,
vkAllocateMemory,
@@ -735,15 +733,14 @@ 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;