lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-13 17:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move most objects to their own resource records, ditch m_DeviceRecord

Browse Source 
* It's mostly a legacy concept anyway. m_InstanceRecord is kept for a
  couple of things - physical devices and devices and always ref'd.
This commit is contained in:
baldurk
2016-02-07 18:38:32 +01:00
parent 20942a7a5f
commit bf0e12a497
3 changed files with 84 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.cpp
+42 -96
View File
@@ -25,8 +25,6 @@
#include "vk_core.h"
#include "serialise/string_utils.h"
// VKTODO drop m_DeviceRecord - move EVERYTHING to resource records.
static bool operator <(const VkExtensionProperties &a, const VkExtensionProperties &b)
{
int cmp = strcmp(a.extName, b.extName);
@@ -356,18 +354,10 @@ WrappedVulkan::WrappedVulkan(const VulkanFunctions &real, const char *logFilenam
m_ResourceManager = new VulkanResourceManager(m_State, m_pSerialiser, this);
m_DeviceResourceID = GetResourceManager()->RegisterResource(VkResource(eResSpecial, VK_NULL_HANDLE));
m_ContextResourceID = GetResourceManager()->RegisterResource(VkResource(eResSpecial, VK_NULL_HANDLE));
if(!RenderDoc::Inst().IsReplayApp())
{
m_DeviceRecord = GetResourceManager()->AddResourceRecord(m_DeviceResourceID);
m_DeviceRecord->DataInSerialiser = false;
m_DeviceRecord->Length = 0;
m_DeviceRecord->NumSubResources = 0;
m_DeviceRecord->SpecialResource = true;
m_DeviceRecord->SubResources = NULL;
m_ContextRecord = GetResourceManager()->AddResourceRecord(m_ContextResourceID);
m_ContextRecord->DataInSerialiser = false;
m_ContextRecord->Length = 0;
@@ -377,7 +367,7 @@ WrappedVulkan::WrappedVulkan(const VulkanFunctions &real, const char *logFilenam
}
else
{
m_DeviceRecord = m_ContextRecord = NULL;
m_ContextRecord = NULL;
ResourceIDGen::SetReplayResourceIDs();
}
@@ -454,7 +444,9 @@ VkResult WrappedVulkan::vkCreateInstance(
if(m_State >= WRITING)
{
m_InitParams.Set(pCreateInfo, GetResourceManager()->GetID(MakeRes(inst)));
ResourceId instID = GetResourceManager()->GetID(MakeRes(inst));
m_InitParams.Set(pCreateInfo, instID);
m_InstanceRecord = GetResourceManager()->AddResourceRecord(instID);
}
*pInstance = inst;
@@ -475,13 +467,7 @@ VkResult WrappedVulkan::vkDestroyInstance(
m_Real.vkDbgDestroyMsgCallback(instance, m_MsgCallback);
}
VkResource res = MakeRes(instance);
if(GetResourceManager()->HasCurrentResource(res))
{
if(GetResourceManager()->HasResourceRecord(res))
GetResourceManager()->GetResourceRecord(res)->Delete(GetResourceManager());
GetResourceManager()->UnregisterResource(res);
}
GetResourceManager()->UnregisterResource(MakeRes(instance));
return VK_SUCCESS;
}
@@ -556,7 +542,7 @@ VkResult WrappedVulkan::vkEnumeratePhysicalDevices(
SCOPED_SERIALISE_CONTEXT(ENUM_PHYSICALS);
Serialise_vkEnumeratePhysicalDevices(instance, &count, &devices[i]);
m_DeviceRecord->AddChunk(scope.Get());
m_InstanceRecord->AddChunk(scope.Get());
}
}
@@ -696,7 +682,7 @@ VkResult WrappedVulkan::vkCreateDevice(
chunk = scope.Get();
}
m_DeviceRecord->AddChunk(chunk);
m_InstanceRecord->AddChunk(chunk);
}
else
{
@@ -709,6 +695,7 @@ VkResult WrappedVulkan::vkCreateDevice(
VkResult WrappedVulkan::vkDestroyDevice(VkDevice device)
{
// VKTODO this stuff should all be in vkDestroyInstance
if(m_State >= WRITING)
{
for(size_t i=0; i < m_PhysicalReplayData.size(); i++)
@@ -717,12 +704,7 @@ VkResult WrappedVulkan::vkDestroyDevice(VkDevice device)
{
if(i == (size_t)m_SwapPhysDevice)
{
if(m_DeviceRecord)
{
RDCASSERT(m_DeviceRecord->GetRefCount() == 1);
m_DeviceRecord->Delete(GetResourceManager());
m_DeviceRecord = NULL;
}
// VKTODO m_InstanceRecord
if(m_ContextRecord)
{
@@ -733,13 +715,6 @@ VkResult WrappedVulkan::vkDestroyDevice(VkDevice device)
m_ResourceManager->Shutdown();
m_DeviceRecord = GetResourceManager()->AddResourceRecord(m_DeviceResourceID);
m_DeviceRecord->DataInSerialiser = false;
m_DeviceRecord->Length = 0;
m_DeviceRecord->NumSubResources = 0;
m_DeviceRecord->SpecialResource = true;
m_DeviceRecord->SubResources = NULL;
m_ContextRecord = GetResourceManager()->AddResourceRecord(m_ContextResourceID);
m_ContextRecord->DataInSerialiser = false;
m_ContextRecord->Length = 0;
@@ -1257,11 +1232,12 @@ VkResult WrappedVulkan::vkAllocMemory(
chunk = scope.Get();
}
m_DeviceRecord->AddChunk(chunk);
// create resource record for gpu memory, although we won't use it for chunk tracking
GetResourceManager()->AddResourceRecord(id);
// create resource record for gpu memory
VkResourceRecord *record = GetResourceManager()->AddResourceRecord(id);
RDCASSERT(record);
record->AddChunk(chunk);
}
else
{
@@ -1275,57 +1251,15 @@ VkResult WrappedVulkan::vkAllocMemory(
return ret;
}
bool WrappedVulkan::Serialise_vkFreeMemory(
VkDevice device,
VkDeviceMemory mem)
{
SERIALISE_ELEMENT(ResourceId, devId, GetResourceManager()->GetID(MakeRes(device)));
SERIALISE_ELEMENT(ResourceId, id, GetResourceManager()->GetID(MakeRes(mem)));
if(m_State == READING)
{
VkResource res = GetResourceManager()->GetLiveResource(id);
device = (VkDevice)GetResourceManager()->GetLiveResource(devId).handle;
mem = (VkDeviceMemory)res.handle;
VkResult ret = m_Real.vkFreeMemory(device, mem);
if(ret != VK_SUCCESS)
{
RDCERR("Failed on freeing memory, VkResult: 0x%08x", ret);
}
ResourceId liveid = GetResourceManager()->GetLiveID(id);
m_MemoryInfo.erase(liveid);
GetResourceManager()->EraseLiveResource(id);
GetResourceManager()->MarkCleanResource(liveid);
VkResourceRecord *record = GetResourceManager()->GetResourceRecord(liveid);
if(record)
record->Delete(GetResourceManager());
GetResourceManager()->UnregisterResource(res);
}
return true;
}
VkResult WrappedVulkan::vkFreeMemory(
VkDevice device,
VkDeviceMemory mem)
{
if(m_State >= WRITING)
{
Chunk *chunk = NULL;
{
SCOPED_SERIALISE_CONTEXT(FREE_MEM);
Serialise_vkFreeMemory(device, mem);
chunk = scope.Get();
}
m_DeviceRecord->AddChunk(chunk);
}
// VKTODO I don't think I need to serialise this.
// the resource record just stays around until there are
// no references (which should be the same since lifetime
// tracking is app responsibility)
// we just need to clean up after ourselves on replay
ResourceId id = GetResourceManager()->GetID(MakeRes(mem));
m_MemoryInfo.erase(id);
GetResourceManager()->MarkCleanResource(id);
@@ -1451,8 +1385,10 @@ VkResult WrappedVulkan::vkUnmapMemory(
SCOPED_SERIALISE_CONTEXT(UNMAP_MEM);
Serialise_vkUnmapMemory(device, mem);
VkResourceRecord *record = GetResourceManager()->GetResourceRecord(MakeRes(mem));
if(m_State == WRITING_IDLE)
m_DeviceRecord->AddChunk(scope.Get());
record->AddChunk(scope.Get());
else
m_ContextRecord->AddChunk(scope.Get());
}
@@ -1497,7 +1433,6 @@ VkResult WrappedVulkan::vkBindBufferMemory(
VkDeviceSize memOffset)
{
VkResourceRecord *record = GetResourceManager()->GetResourceRecord(MakeRes(buffer));
if(record == NULL) record = m_DeviceRecord;
if(m_State >= WRITING)
{
@@ -1511,6 +1446,8 @@ VkResult WrappedVulkan::vkBindBufferMemory(
}
record->AddChunk(chunk);
record->SetMemoryRecord(GetResourceManager()->GetResourceRecord(MakeRes(mem)));
}
return m_Real.vkBindBufferMemory(device, buffer, mem, memOffset);
@@ -1546,7 +1483,6 @@ VkResult WrappedVulkan::vkBindImageMemory(
VkDeviceSize memOffset)
{
VkResourceRecord *record = GetResourceManager()->GetResourceRecord(MakeRes(image));
if(record == NULL) record = m_DeviceRecord;
if(m_State >= WRITING)
{
@@ -1560,6 +1496,8 @@ VkResult WrappedVulkan::vkBindImageMemory(
}
record->AddChunk(chunk);
record->SetMemoryRecord(GetResourceManager()->GetResourceRecord(MakeRes(mem)));
}
return m_Real.vkBindImageMemory(device, image, mem, memOffset);
@@ -2734,7 +2672,8 @@ VkResult WrappedVulkan::vkCreateDynamicViewportState(
chunk = scope.Get();
}
m_DeviceRecord->AddChunk(chunk);
VkResourceRecord *record = GetResourceManager()->AddResourceRecord(id);
record->AddChunk(chunk);
}
else
{
@@ -2797,7 +2736,8 @@ VkResult WrappedVulkan::vkCreateDynamicRasterState(
chunk = scope.Get();
}
m_DeviceRecord->AddChunk(chunk);
VkResourceRecord *record = GetResourceManager()->AddResourceRecord(id);
record->AddChunk(chunk);
}
else
{
@@ -2860,7 +2800,8 @@ VkResult WrappedVulkan::vkCreateDynamicColorBlendState(
chunk = scope.Get();
}
m_DeviceRecord->AddChunk(chunk);
VkResourceRecord *record = GetResourceManager()->AddResourceRecord(id);
record->AddChunk(chunk);
}
else
{
@@ -2923,7 +2864,8 @@ VkResult WrappedVulkan::vkCreateDynamicDepthStencilState(
chunk = scope.Get();
}
m_DeviceRecord->AddChunk(chunk);
VkResourceRecord *record = GetResourceManager()->AddResourceRecord(id);
record->AddChunk(chunk);
}
else
{
@@ -2988,7 +2930,8 @@ VkResult WrappedVulkan::vkCreateCommandPool(
chunk = scope.Get();
}
m_DeviceRecord->AddChunk(chunk);
VkResourceRecord *record = GetResourceManager()->AddResourceRecord(id);
record->AddChunk(chunk);
}
else
{
@@ -3029,6 +2972,8 @@ VkResult WrappedVulkan::vkCreateCommandBuffer(
record->bakedCommands = NULL;
record->AddParent(GetResourceManager()->GetResourceRecord(MakeRes(pCreateInfo->cmdPool)));
// we don't serialise this as we never create this command buffer directly.
// Instead we create a command buffer for each baked list that we find.
}
@@ -5660,7 +5605,7 @@ VkResult WrappedVulkan::vkQueuePresentWSI(
GetResourceManager()->ClearReferencedResources();
GetResourceManager()->MarkResourceFrameReferenced(m_DeviceResourceID, eFrameRef_Write);
GetResourceManager()->MarkResourceFrameReferenced(m_InstanceRecord->GetResourceID(), eFrameRef_Read);
GetResourceManager()->PrepareInitialContents();
AttemptCapture();
@@ -5842,8 +5787,9 @@ void WrappedVulkan::ProcessChunk(uint64_t offset, VulkanChunkType context)
Serialise_vkUnmapMemory(VK_NULL_HANDLE, VK_NULL_HANDLE);
break;
case FREE_MEM:
Serialise_vkFreeMemory(VK_NULL_HANDLE, VK_NULL_HANDLE);
break;
// VKTODO see vkFreeMemory
//Serialise_vkFreeMemory(VK_NULL_HANDLE, VK_NULL_HANDLE);
//break;
case CREATE_CMD_POOL:
Serialise_vkCreateCommandPool(VK_NULL_HANDLE, NULL, NULL);
break;
renderdoc/driver/vulkan/vk_core.h
+1 -3
View File
@@ -104,8 +104,7 @@ private:
VkInitParams m_InitParams;
ResourceId m_DeviceResourceID;
VkResourceRecord *m_DeviceRecord;
VkResourceRecord *m_InstanceRecord;
ResourceId m_ContextResourceID;
VkResourceRecord *m_ContextRecord;
@@ -270,7 +269,6 @@ public:
WrappedVulkan(const VulkanFunctions &real, const char *logFilename);
~WrappedVulkan();
ResourceId GetDeviceResourceID() { return m_DeviceResourceID; }
ResourceId GetContextResourceID() { return m_ContextResourceID; }
VulkanResourceManager *GetResourceManager() { return m_ResourceManager; }
renderdoc/driver/vulkan/vk_resources.h
+41 -14
View File
@@ -152,24 +152,51 @@ struct ImageRegionState
struct VkResourceRecord : public ResourceRecord
{
static const NullInitialiser NullResource = MakeNullResource;
public:
static const NullInitialiser NullResource = MakeNullResource;
VkResourceRecord(ResourceId id) :
ResourceRecord(id, true),
bakedCommands(NULL)
{
}
VkResourceRecord(ResourceId id) :
ResourceRecord(id, true),
bakedCommands(NULL),
memory(NULL)
{
}
void Bake()
{
SwapChunks(bakedCommands);
dirtied.swap(bakedCommands->dirtied);
}
void Bake()
{
SwapChunks(bakedCommands);
dirtied.swap(bakedCommands->dirtied);
}
VkResourceRecord *bakedCommands;
// need to only track current memory binding,
// so we don't have parents on every memory record
// that we were ever bound to. But we also want
// the record to be immediately in Parents without
// needing an extra step to insert it at the last
// minute.
void SetMemoryRecord(VkResourceRecord *r)
{
if(memory != NULL)
Parents.erase((ResourceRecord *)memory);
// a list of resources that are made dirty by submitting this command buffer
set<ResourceId> dirtied;
memory = r;
if(memory != NULL)
AddParent(memory);
}
VkResourceRecord *GetMemoryRecord()
{
return memory;
}
VkResourceRecord *bakedCommands;
// a list of resources that are made dirty by submitting this command buffer
set<ResourceId> dirtied;
private:
VkResourceRecord *memory;
};
struct MemState