Add VulkanMemoryAllocator v2.3.0 submodule
This commit is contained in:
@@ -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
Submodule 3rdparty/GPUOpen/VulkanMemoryAllocator added at 3951bb11de
-18120
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||||
|
|||||||
@@ -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
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user