sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RenderQueues now use std::map::insert only if necessary 

It looks like my std::map::insert implementation allocates something,
even if the element is present (It's not a leak, just some useless
allocation)


Former-commit-id: 9490bfb7994c23f893a74d5710381ba5919bb38c
This commit is contained in:
Lynix 2014-03-14 23:55:14 +01:00
parent 0ca2c9ccb2
commit 268d3ae86d
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Nazara/Graphics/DeferredRenderQueue.cpp
View File

@ -119,22 +119,28 @@ void NzDeferredRenderQueue::AddSubMesh(const NzMaterial* material, const NzSubMe
{ {
const NzStaticMesh* staticMesh = static_cast<const NzStaticMesh*>(subMesh); const NzStaticMesh* staticMesh = static_cast<const NzStaticMesh*>(subMesh);
auto pair = opaqueModels.insert(std::make_pair(material, BatchedModelContainer::mapped_type())); auto it = opaqueModels.find(material);
if (pair.second) if (it == opaqueModels.end())
{
it = opaqueModels.insert(std::make_pair(material, BatchedModelContainer::mapped_type())).first;
material->AddResourceListener(this, ResourceType_Material); material->AddResourceListener(this, ResourceType_Material);
}
bool& used = std::get<0>(pair.first->second); bool& used = std::get<0>(it->second);
bool& enableInstancing = std::get<1>(pair.first->second); bool& enableInstancing = std::get<1>(it->second);
used = true; used = true;
auto& meshMap = std::get<3>(pair.first->second); auto& meshMap = std::get<3>(it->second);
auto pair2 = meshMap.insert(std::make_pair(staticMesh, BatchedStaticMeshContainer::mapped_type())); auto it2 = meshMap.find(staticMesh);
if (pair2.second) if (it2 == meshMap.end())
{
it2 = meshMap.insert(std::make_pair(staticMesh, BatchedStaticMeshContainer::mapped_type())).first;
staticMesh->AddResourceListener(this, ResourceType_StaticMesh); staticMesh->AddResourceListener(this, ResourceType_StaticMesh);
}
std::vector<StaticData>& staticDataContainer = pair2.first->second; std::vector<StaticData>& staticDataContainer = it2->second;
unsigned int instanceCount = staticDataContainer.size() + 1; unsigned int instanceCount = staticDataContainer.size() + 1;

22
src/Nazara/Graphics/ForwardRenderQueue.cpp
View File

@ -130,28 +130,32 @@ void NzForwardRenderQueue::AddSubMesh(const NzMaterial* material, const NzSubMes
} }
else else
{ {
auto pair = opaqueModels.insert(std::make_pair(material, BatchedModelContainer::mapped_type())); auto it = opaqueModels.find(material);
if (pair.second) if (it == opaqueModels.end())
{
it = opaqueModels.insert(std::make_pair(material, BatchedModelContainer::mapped_type())).first;
material->AddResourceListener(this, ResourceType_Material); material->AddResourceListener(this, ResourceType_Material);
}
bool& used = std::get<0>(pair.first->second); bool& used = std::get<0>(it->second);
bool& enableInstancing = std::get<1>(pair.first->second); bool& enableInstancing = std::get<1>(it->second);
used = true; used = true;
auto& meshMap = std::get<3>(pair.first->second); auto& meshMap = std::get<3>(it->second);
auto pair2 = meshMap.insert(std::make_pair(staticMesh, BatchedStaticMeshContainer::mapped_type())); auto it2 = meshMap.find(staticMesh);
if (pair2.second) if (it2 == meshMap.end())
{ {
it2 = meshMap.insert(std::make_pair(staticMesh, BatchedStaticMeshContainer::mapped_type())).first;
staticMesh->AddResourceListener(this, ResourceType_StaticMesh); staticMesh->AddResourceListener(this, ResourceType_StaticMesh);
NzSpheref& squaredBoundingSphere = pair2.first->second.first; NzSpheref& squaredBoundingSphere = it2->second.first;
squaredBoundingSphere.Set(staticMesh->GetAABB().GetSquaredBoundingSphere()); squaredBoundingSphere.Set(staticMesh->GetAABB().GetSquaredBoundingSphere());
///TODO: Écouter le StaticMesh pour repérer tout changement de géométrie ///TODO: Écouter le StaticMesh pour repérer tout changement de géométrie
} }
std::vector<StaticData>& staticDataContainer = pair2.first->second.second; std::vector<StaticData>& staticDataContainer = it2->second.second;
unsigned int instanceCount = staticDataContainer.size() + 1; unsigned int instanceCount = staticDataContainer.size() + 1;