From 2e8ce2cbafff8c8fd057e0b17c2cf586720249ba Mon Sep 17 00:00:00 2001 From: PixelyIon Date: Wed, 23 Jun 2021 02:29:08 +0530 Subject: [PATCH] Update C++ Libraries --- app/libraries/fmt | 2 +- app/libraries/frozen | 2 +- app/libraries/oboe | 2 +- app/libraries/perfetto | 2 +- app/libraries/vkhpp | 2 +- app/libraries/vkma | 2 +- .../main/cpp/skyline/gpu/memory_manager.cpp | 47 ++++++++++--------- 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/app/libraries/fmt b/app/libraries/fmt index 9c418bc4..9e8b86fd 160000 --- a/app/libraries/fmt +++ b/app/libraries/fmt @@ -1 +1 @@ -Subproject commit 9c418bc468baf434a848010bff74663e1f820e79 +Subproject commit 9e8b86fd2d9806672cc73133d21780dd182bfd24 diff --git a/app/libraries/frozen b/app/libraries/frozen index e6ddc432..96ac3481 160000 --- a/app/libraries/frozen +++ b/app/libraries/frozen @@ -1 +1 @@ -Subproject commit e6ddc432d0ba4e42542b5867bdc932b5f6d1e08d +Subproject commit 96ac3481a9e9543f44b4de8e65af9ad2b040241c diff --git a/app/libraries/oboe b/app/libraries/oboe index 5eb2ea68..f126f79f 160000 --- a/app/libraries/oboe +++ b/app/libraries/oboe @@ -1 +1 @@ -Subproject commit 5eb2ea6899367f9cdc5a262f340c06e1a7c284b2 +Subproject commit f126f79fd3d9cbfac78f6e8d8e8bc1cd9f4db849 diff --git a/app/libraries/perfetto b/app/libraries/perfetto index 3f02be82..e5293f1c 160000 --- a/app/libraries/perfetto +++ b/app/libraries/perfetto @@ -1 +1 @@ -Subproject commit 3f02be823cef0f54e720c0382ffc4507f48e6e4b +Subproject commit e5293f1cf1800d5776f4bfe96d1ec0aeec30cd46 diff --git a/app/libraries/vkhpp b/app/libraries/vkhpp index 32188df5..8c7a248a 160000 --- a/app/libraries/vkhpp +++ b/app/libraries/vkhpp @@ -1 +1 @@ -Subproject commit 32188df57b217b5658bdf74e11c966fb84d7287d +Subproject commit 8c7a248a72c685ce28cbc63f6c40e6a2ea786346 diff --git a/app/libraries/vkma b/app/libraries/vkma index 6889faaa..0790b5f0 160000 --- a/app/libraries/vkma +++ b/app/libraries/vkma @@ -1 +1 @@ -Subproject commit 6889faaaa284e7ec514e75ea74b113539021d1ad +Subproject commit 0790b5f0a9b96cd79fe75e4f458fc6b468dd9ec3 diff --git a/app/src/main/cpp/skyline/gpu/memory_manager.cpp b/app/src/main/cpp/skyline/gpu/memory_manager.cpp index 146683f9..26840da2 100644 --- a/app/src/main/cpp/skyline/gpu/memory_manager.cpp +++ b/app/src/main/cpp/skyline/gpu/memory_manager.cpp @@ -34,30 +34,31 @@ namespace skyline::gpu::memory { } MemoryManager::MemoryManager(const GPU &pGpu) : gpu(pGpu) { - auto dispatcher{gpu.vkDevice.getDispatcher()}; + auto instanceDispatcher{gpu.vkInstance.getDispatcher()}; + auto deviceDispatcher{gpu.vkDevice.getDispatcher()}; VmaVulkanFunctions vulkanFunctions{ - .vkGetPhysicalDeviceProperties = dispatcher->vkGetPhysicalDeviceProperties, - .vkGetPhysicalDeviceMemoryProperties = dispatcher->vkGetPhysicalDeviceMemoryProperties, - .vkAllocateMemory = dispatcher->vkAllocateMemory, - .vkFreeMemory = dispatcher->vkFreeMemory, - .vkMapMemory = dispatcher->vkMapMemory, - .vkUnmapMemory = dispatcher->vkUnmapMemory, - .vkFlushMappedMemoryRanges = dispatcher->vkFlushMappedMemoryRanges, - .vkInvalidateMappedMemoryRanges = dispatcher->vkInvalidateMappedMemoryRanges, - .vkBindBufferMemory = dispatcher->vkBindBufferMemory, - .vkBindImageMemory = dispatcher->vkBindImageMemory, - .vkGetBufferMemoryRequirements = dispatcher->vkGetBufferMemoryRequirements, - .vkGetImageMemoryRequirements = dispatcher->vkGetImageMemoryRequirements, - .vkCreateBuffer = dispatcher->vkCreateBuffer, - .vkDestroyBuffer = dispatcher->vkDestroyBuffer, - .vkCreateImage = dispatcher->vkCreateImage, - .vkDestroyImage = dispatcher->vkDestroyImage, - .vkCmdCopyBuffer = dispatcher->vkCmdCopyBuffer, - .vkGetBufferMemoryRequirements2KHR = dispatcher->vkGetBufferMemoryRequirements2, - .vkGetImageMemoryRequirements2KHR = dispatcher->vkGetImageMemoryRequirements2, - .vkBindBufferMemory2KHR = dispatcher->vkBindBufferMemory2, - .vkBindImageMemory2KHR = dispatcher->vkBindImageMemory2, - .vkGetPhysicalDeviceMemoryProperties2KHR = dispatcher->vkGetPhysicalDeviceMemoryProperties2, + .vkGetPhysicalDeviceProperties = instanceDispatcher->vkGetPhysicalDeviceProperties, + .vkGetPhysicalDeviceMemoryProperties = instanceDispatcher->vkGetPhysicalDeviceMemoryProperties, + .vkAllocateMemory = deviceDispatcher->vkAllocateMemory, + .vkFreeMemory = deviceDispatcher->vkFreeMemory, + .vkMapMemory = deviceDispatcher->vkMapMemory, + .vkUnmapMemory = deviceDispatcher->vkUnmapMemory, + .vkFlushMappedMemoryRanges = deviceDispatcher->vkFlushMappedMemoryRanges, + .vkInvalidateMappedMemoryRanges = deviceDispatcher->vkInvalidateMappedMemoryRanges, + .vkBindBufferMemory = deviceDispatcher->vkBindBufferMemory, + .vkBindImageMemory = deviceDispatcher->vkBindImageMemory, + .vkGetBufferMemoryRequirements = deviceDispatcher->vkGetBufferMemoryRequirements, + .vkGetImageMemoryRequirements = deviceDispatcher->vkGetImageMemoryRequirements, + .vkCreateBuffer = deviceDispatcher->vkCreateBuffer, + .vkDestroyBuffer = deviceDispatcher->vkDestroyBuffer, + .vkCreateImage = deviceDispatcher->vkCreateImage, + .vkDestroyImage = deviceDispatcher->vkDestroyImage, + .vkCmdCopyBuffer = deviceDispatcher->vkCmdCopyBuffer, + .vkGetBufferMemoryRequirements2KHR = deviceDispatcher->vkGetBufferMemoryRequirements2, + .vkGetImageMemoryRequirements2KHR = deviceDispatcher->vkGetImageMemoryRequirements2, + .vkBindBufferMemory2KHR = deviceDispatcher->vkBindBufferMemory2, + .vkBindImageMemory2KHR = deviceDispatcher->vkBindImageMemory2, + .vkGetPhysicalDeviceMemoryProperties2KHR = instanceDispatcher->vkGetPhysicalDeviceMemoryProperties2, }; VmaAllocatorCreateInfo allocatorCreateInfo{ .physicalDevice = *gpu.vkPhysicalDevice,