TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

pgraph: Don't dupe shared GeomVertexData when premunging Geom

Browse Source 
Fixes #1185
This commit is contained in:
rdb 2022-01-02 11:45:33 +01:00
parent 2aac58b5ab
commit f058bad802
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
panda/src/pgraph/geomNode.cxx
View File

@ -876,17 +876,36 @@ do_premunge(GraphicsStateGuardianBase *gsg,
GeomTransformer &transformer) {
Thread *current_thread = Thread::get_current_thread();
// Cache munged vertex data, so that we don't duplicate vertex data
// unnecessarily.
std::map<CPT(GeomVertexData), CPT(GeomVertexData)> munged_vdata;
OPEN_ITERATE_CURRENT_AND_UPSTREAM(_cycler, current_thread) {
CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
GeomList::iterator gi;
PT(GeomList) geoms = cdata->modify_geoms();
for (gi = geoms->begin(); gi != geoms->end(); ++gi) {
GeomEntry &entry = (*gi);
for (GeomEntry &entry : *geoms) {
CPT(RenderState) geom_state = node_state->compose(entry._state);
CPT(Geom) geom = entry._geom.get_read_pointer();
PT(GeomMunger) munger = gsg->get_geom_munger(geom_state, current_thread);
entry._geom = transformer.premunge_geom(geom, munger);
CPT(GeomVertexData) vdata = geom->get_vertex_data();
auto it = munged_vdata.find(vdata);
if (it != munged_vdata.end()) {
vdata = it->second;
} else {
CPT(GeomVertexData) old_vdata = std::move(vdata);
vdata = munger->premunge_data(old_vdata);
munged_vdata[std::move(old_vdata)] = vdata;
}
CPT(Geom) pgeom = geom;
munger->premunge_geom(pgeom, vdata);
PT(Geom) geom_copy = pgeom->make_copy();
geom_copy->set_vertex_data(vdata);
entry._geom = std::move(geom_copy);
}
}
CLOSE_ITERATE_CURRENT_AND_UPSTREAM(_cycler);