mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-19 19:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add VulkanMemoryAllocator v2.3.0 submodule

Browse source
This commit is contained in:
Megamouse 2025-03-26 18:42:38 +01:00
parent 9c99e75939
commit 596e6cc2c3
7 changed files with 8 additions and 18137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -104,3 +104,7 @@
path = 3rdparty/discord-rpc/discord-rpc path = 3rdparty/discord-rpc/discord-rpc
url = ../../Vestrel/discord-rpc url = ../../Vestrel/discord-rpc
ignore = dirty ignore = dirty
[submodule "3rdparty/GPUOpen/VulkanMemoryAllocator"]
path = 3rdparty/GPUOpen/VulkanMemoryAllocator
url = ../../Megamouse/VulkanMemoryAllocator.git
ignore = dirty

1
3rdparty/GPUOpen/VulkanMemoryAllocator vendored Submodule

@ -0,0 +1 @@
Subproject commit 3951bb11de459d8019ce8b28e276170860c079c0

18120
3rdparty/GPUOpen/include/vk_mem_alloc.h vendored
View file

File diff suppressed because it is too large Load diff

2
rpcs3/Emu/RSX/VK/VKMemAlloc.cpp
View file

@ -53,7 +53,7 @@ private:
#pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn" #pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn"
#endif #endif
#endif #endif
#include "3rdparty/GPUOpen/include/vk_mem_alloc.h" #include "3rdparty/GPUOpen/VulkanMemoryAllocator/src/vk_mem_alloc.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else #else

14
rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h
View file

@ -1,14 +0,0 @@
#pragma once
#include "../VulkanAPI.h"
#include "../../rsx_utils.h"
#include "shared.h"
#include "3rdparty/GPUOpen/include/vk_mem_alloc.h"
namespace vk
{
// Memory Allocator - base class
}

2
rpcs3/Emu/RSX/VK/vkutils/memory.h
View file

@ -4,7 +4,7 @@
#include "../../rsx_utils.h" #include "../../rsx_utils.h"
#include "shared.h" #include "shared.h"
#include "3rdparty/GPUOpen/include/vk_mem_alloc.h" #include "3rdparty/GPUOpen/VulkanMemoryAllocator/src/vk_mem_alloc.h"
namespace vk namespace vk
{ {

2
rpcs3/Emu/RSX/VK/vkutils/sampler.cpp
View file

@ -22,7 +22,7 @@ namespace vk
} }
border_color_t::border_color_t(const color4f& color, VkFormat fmt, VkImageAspectFlags aspect) border_color_t::border_color_t(const color4f& color, VkFormat fmt, VkImageAspectFlags aspect)
: format(fmt), aspect(aspect), color_value(color) : storage_key(0), format(fmt), aspect(aspect), color_value(color)
{ {
const auto encoded_color = rsx::encode_color_to_storage_key(color); const auto encoded_color = rsx::encode_color_to_storage_key(color);
value = vk::get_border_color(encoded_color); value = vk::get_border_color(encoded_color);