TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

pgraph: Fix texture replacement creating unique TextureAttrib

Browse Source 
This needs a more thorough fix (probably on master), but the implicit sort is incrementing every time, and it is being included in the hash/compare, so every time the same texture is replaced on the same TextureAttrib, it will be a unique TextureAttrib, causing garbage to accumulate and the state system to be generally less effective.
This commit is contained in:
rdb 2020-06-29 11:30:07 +02:00
parent 86cfbc22b1
commit d1ab940e93
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
panda/src/pgraph/textureAttrib.cxx
View File

@ -109,12 +109,18 @@ add_on_stage(TextureStage *stage, Texture *tex, int override) const {
nassertr(tex != nullptr, this); nassertr(tex != nullptr, this);
TextureAttrib *attrib = new TextureAttrib(*this); TextureAttrib *attrib = new TextureAttrib(*this);
Stages::iterator si = attrib->_on_stages.insert(StageNode(stage)).first; auto result = attrib->_on_stages.insert(StageNode(stage));
(*si)._override = override; StageNode &sn = *result.first;
(*si)._texture = tex; sn._override = override;
(*si)._implicit_sort = attrib->_next_implicit_sort; sn._texture = tex;
(*si)._has_sampler = false; sn._has_sampler = false;
++(attrib->_next_implicit_sort);
// Only bump this if it doesn't already have the highest implicit sort.
// This prevents replacing a texture from creating a unique TextureAttrib.
if (result.second || sn._implicit_sort + 1 != attrib->_next_implicit_sort) {
sn._implicit_sort = attrib->_next_implicit_sort;
++(attrib->_next_implicit_sort);
}
return return_new(attrib); return return_new(attrib);
} }
@ -128,13 +134,19 @@ add_on_stage(TextureStage *stage, Texture *tex, const SamplerState &sampler, int
nassertr(tex != nullptr, this); nassertr(tex != nullptr, this);
TextureAttrib *attrib = new TextureAttrib(*this); TextureAttrib *attrib = new TextureAttrib(*this);
Stages::iterator si = attrib->_on_stages.insert(StageNode(stage)).first; auto result = attrib->_on_stages.insert(StageNode(stage));
(*si)._override = override; StageNode &sn = *result.first;
(*si)._texture = tex; sn._override = override;
(*si)._sampler = sampler; sn._texture = tex;
(*si)._implicit_sort = attrib->_next_implicit_sort; sn._sampler = sampler;
(*si)._has_sampler = true; sn._has_sampler = true;
++(attrib->_next_implicit_sort);
// Only bump this if it doesn't already have the highest implicit sort.
// This prevents replacing a texture from creating a unique TextureAttrib.
if (result.second || sn._implicit_sort + 1 != attrib->_next_implicit_sort) {
sn._implicit_sort = attrib->_next_implicit_sort;
++(attrib->_next_implicit_sort);
}
return return_new(attrib); return return_new(attrib);
} }