From 97527d273dfbf7da183115efe02cb6ab11f8e7a8 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 29 Oct 2015 16:44:46 +0100
Subject: [PATCH] Add memory creation info

---
 renderdoc/driver/vulkan/vk_info.cpp                    | 5 +++++
 renderdoc/driver/vulkan/vk_info.h                      | 8 ++++++++
 renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp | 4 ++++
 3 files changed, 17 insertions(+)

diff --git a/renderdoc/driver/vulkan/vk_info.cpp b/renderdoc/driver/vulkan/vk_info.cpp
index 69edfb480..e7d00593e 100644
--- a/renderdoc/driver/vulkan/vk_info.cpp
+++ b/renderdoc/driver/vulkan/vk_info.cpp
@@ -262,6 +262,11 @@ void VulkanCreationInfo::Framebuffer::Init(VulkanResourceManager *resourceMan, c
 		attachments[i].view = resourceMan->GetNonDispWrapper(pCreateInfo->pAttachments[i])->id;
 }
 
+void VulkanCreationInfo::Memory::Init(VulkanResourceManager *resourceMan, const VkMemoryAllocInfo* pAllocInfo)
+{
+	size = pAllocInfo->allocationSize;
+}
+
 void VulkanCreationInfo::Buffer::Init(VulkanResourceManager *resourceMan, const VkBufferCreateInfo* pCreateInfo)
 {
 	size = pCreateInfo->size;
diff --git a/renderdoc/driver/vulkan/vk_info.h b/renderdoc/driver/vulkan/vk_info.h
index 3cc5df2a3..67eb0335e 100644
--- a/renderdoc/driver/vulkan/vk_info.h
+++ b/renderdoc/driver/vulkan/vk_info.h
@@ -188,6 +188,14 @@ struct VulkanCreationInfo
 	};
 	map<ResourceId, Framebuffer> m_Framebuffer;
 	
+	struct Memory
+	{
+		void Init(VulkanResourceManager *resourceMan, const VkMemoryAllocInfo* pAllocInfo);
+
+		uint64_t size;
+	};
+	map<ResourceId, Memory> m_Memory;
+	
 	struct Buffer
 	{
 		void Init(VulkanResourceManager *resourceMan, const VkBufferCreateInfo* pCreateInfo);
diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
index 7cbdf480a..e91575a47 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
@@ -54,6 +54,8 @@ bool WrappedVulkan::Serialise_vkAllocMemory(
 		{
 			ResourceId live = GetResourceManager()->WrapResource(Unwrap(device), mem);
 			GetResourceManager()->AddLiveResource(id, mem);
+
+			m_CreationInfo.m_Memory[live].Init(GetResourceManager(), &info);
 		}
 	}
 
@@ -97,6 +99,8 @@ VkResult WrappedVulkan::vkAllocMemory(
 		else
 		{
 			GetResourceManager()->AddLiveResource(id, *pMem);
+
+			m_CreationInfo.m_Memory[id].Init(GetResourceManager(), pAllocInfo);
 		}
 	}