lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-28 04:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine GL maps for looking up ID/Resource Record from resource name

Browse Source
This commit is contained in:
baldurk
2020-08-26 16:48:13 +01:00
parent 5e79465ab5
commit 022ba9ce67
1 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_manager.h
+67 -47
View File
@@ -65,18 +65,19 @@ public:
// records
// that have already freed their parents.
{
auto it = m_GLResourceRecords.begin();
auto it = m_CurrentResources.begin();
for(size_t i = 0; it != m_GLResourceRecords.end();)
for(size_t i = 0; it != m_CurrentResources.end();)
{
size_t prevSize = m_GLResourceRecords.size();
it->second->FreeParents(this);
size_t prevSize = m_CurrentResources.size();
if(it->second.second)
it->second.second->FreeParents(this);
// collection modified, restart loop
if(prevSize != m_GLResourceRecords.size())
if(prevSize != m_CurrentResources.size())
{
i = 0;
it = m_GLResourceRecords.begin();
it = m_CurrentResources.begin();
continue;
}
@@ -86,17 +87,18 @@ public:
}
}
while(!m_GLResourceRecords.empty())
while(!m_CurrentResources.empty())
{
auto it = m_GLResourceRecords.begin();
ResourceId id = it->second->GetResourceID();
it->second->Delete(this);
auto it = m_CurrentResources.begin();
ResourceId id = it->second.first;
if(it->second.second)
it->second.second->Delete(this);
if(!m_GLResourceRecords.empty() && m_GLResourceRecords.begin()->second->GetResourceID() == id)
m_GLResourceRecords.erase(m_GLResourceRecords.begin());
if(!m_CurrentResources.empty() && m_CurrentResources.begin()->second.first == id)
m_CurrentResources.erase(m_CurrentResources.begin());
}
m_CurrentResourceIds.clear();
m_CurrentResources.clear();
ResourceManager::Shutdown();
}
@@ -104,16 +106,15 @@ public:
void DeleteContext(void *context)
{
size_t count = 0;
for(auto it = m_CurrentResourceIds.begin(); it != m_CurrentResourceIds.end();)
for(auto it = m_CurrentResources.begin(); it != m_CurrentResources.end();)
{
if(it->first.ContextShareGroup == context && it->first.Namespace != eResSpecial)
{
++count;
ResourceId res = it->second;
if(HasResourceRecord(res))
GetResourceRecord(res)->Delete(this);
ReleaseCurrentResource(it->second);
it = m_CurrentResourceIds.erase(it);
if(it->second.second)
it->second.second->Delete(this);
ReleaseCurrentResource(it->second.first);
m_CurrentResources.erase(it);
}
else
{
@@ -121,16 +122,16 @@ public:
}
}
RDCDEBUG("Removed %zu/%zu resources belonging to context/sharegroup %p", count,
m_CurrentResourceIds.size(), context);
m_CurrentResources.size(), context);
}
inline void RemoveResourceRecord(ResourceId id)
{
for(auto it = m_GLResourceRecords.begin(); it != m_GLResourceRecords.end(); it++)
for(auto it = m_CurrentResources.begin(); it != m_CurrentResources.end(); it++)
{
if(it->second->GetResourceID() == id)
if(it->second.first == id)
{
m_GLResourceRecords.erase(it);
m_CurrentResources.erase(it);
break;
}
}
@@ -142,7 +143,7 @@ public:
{
if(id == ResourceId())
id = ResourceIDGen::GetNewUniqueID();
m_CurrentResourceIds[res] = id;
m_CurrentResources[res].first = id;
AddCurrentResource(id, res);
return id;
}
@@ -151,8 +152,8 @@ public:
bool HasCurrentResource(GLResource res)
{
auto it = m_CurrentResourceIds.find(res);
if(it != m_CurrentResourceIds.end())
auto it = m_CurrentResources.find(res);
if(it != m_CurrentResources.end())
return true;
return false;
@@ -160,23 +161,23 @@ public:
void UnregisterResource(GLResource res)
{
auto it = m_CurrentResourceIds.find(res);
if(it != m_CurrentResourceIds.end())
auto it = m_CurrentResources.find(res);
if(it != m_CurrentResources.end())
{
m_Names.erase(it->second);
m_Names.erase(it->second.first);
if(IsReplayMode(m_State) && HasLiveResource(it->second))
EraseLiveResource(it->second);
ReleaseCurrentResource(it->second);
m_CurrentResourceIds.erase(res);
if(IsReplayMode(m_State) && HasLiveResource(it->second.first))
EraseLiveResource(it->second.first);
ReleaseCurrentResource(it->second.first);
m_CurrentResources.erase(res);
}
}
ResourceId GetResID(GLResource res)
{
auto it = m_CurrentResourceIds.find(res);
if(it != m_CurrentResourceIds.end())
return it->second;
auto it = m_CurrentResources.find(res);
if(it != m_CurrentResources.end())
return it->second.first;
return ResourceId();
}
@@ -185,7 +186,7 @@ public:
GLResourceRecord *ret = ResourceManager::AddResourceRecord(id);
GLResource res = GetCurrentResource(id);
m_GLResourceRecords[res] = ret;
m_CurrentResources[res].second = ret;
ret->Resource = res;
return ret;
@@ -198,9 +199,9 @@ public:
GLResourceRecord *GetResourceRecord(GLResource res)
{
auto it = m_GLResourceRecords.find(res);
if(it != m_GLResourceRecords.end())
return it->second;
auto it = m_CurrentResources.find(res);
if(it != m_CurrentResources.end())
return it->second.second;
return ResourceManager::GetResourceRecord(GetID(res));
}
@@ -221,7 +222,13 @@ public:
// we allow VAO 0 as a special case
if(res.name == 0 && res.Namespace != eResVertexArray)
return;
GLResourceManager::MarkResourceFrameReferenced(GetID(res), refType);
rdcpair<ResourceId, GLResourceRecord *> &it = m_CurrentResources[res];
if(it.second && it.second->viewSource != ResourceId())
ResourceManager::MarkResourceFrameReferenced(it.second->viewSource, refType);
ResourceManager::MarkResourceFrameReferenced(it.first, refType);
}
void MarkDirtyResource(ResourceId id)
@@ -234,14 +241,27 @@ public:
}
void MarkDirtyResource(GLResource res)
{
return GLResourceManager::MarkDirtyResource(GetID(res));
rdcpair<ResourceId, GLResourceRecord *> &it = m_CurrentResources[res];
if(it.second && it.second->viewSource != ResourceId())
ResourceManager::MarkDirtyResource(it.second->viewSource);
return ResourceManager::MarkDirtyResource(it.first);
}
// Mark resource as dirty and write-referenced.
// Write-referenced resources are used to track resource "age".
void MarkDirtyWithWriteReference(GLResource res)
{
MarkResourceFrameReferenced(res, eFrameRef_ReadBeforeWrite);
MarkDirtyResource(res);
rdcpair<ResourceId, GLResourceRecord *> &it = m_CurrentResources[res];
if(it.second && it.second->viewSource != ResourceId())
{
ResourceManager::MarkResourceFrameReferenced(it.second->viewSource, eFrameRef_ReadBeforeWrite);
ResourceManager::MarkDirtyResource(it.second->viewSource);
}
ResourceManager::MarkResourceFrameReferenced(it.first, eFrameRef_ReadBeforeWrite);
ResourceManager::MarkDirtyResource(it.first);
}
void RegisterSync(ContextPair &ctx, GLsync sync, GLuint &name, ResourceId &id)
@@ -292,9 +312,9 @@ private:
void Create_InitialState(ResourceId id, GLResource live, bool hasData);
void Apply_InitialState(GLResource live, const GLInitialContents &initial);
std::map<GLResource, GLResourceRecord *> m_GLResourceRecords;
std::map<GLResource, ResourceId> m_CurrentResourceIds;
// unfortunately not all resources have a record even at capture time (certain special resources
// do not) so we store a pair to ensure we can always lookup the resource ID
rdcflatmap<GLResource, rdcpair<ResourceId, GLResourceRecord *>> m_CurrentResources;
// sync objects must be treated differently as they're not GLuint names, but pointer sized.
// We manually give them GLuint names so they're otherwise namespaced as (eResSync, GLuint)