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 assertion error in get_num_unused_states()

Browse Source 
Fixes #1172
This commit is contained in:
rdb 2021-07-02 15:11:33 +02:00
parent 388ddda9d7
commit 1415ccca61
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/pgraph/renderState.cxx
View File

@ -752,6 +752,14 @@ get_num_unused_states() {
for (size_t si = 0; si < size; ++si) {
const RenderState *state = _states->get_key(si);
std::pair<StateCount::iterator, bool> ir =
state_count.insert(StateCount::value_type(state, 1));
if (!ir.second) {
// If the above insert operation fails, then it's already in the
// cache; increment its value.
(*(ir.first)).second++;
}
size_t i;
size_t cache_size = state->_composition_cache.get_num_entries();
for (i = 0; i < cache_size; ++i) {
@ -1865,6 +1873,7 @@ init_states() {
// is declared globally, and lives forever.
RenderState *state = new RenderState;
state->local_object();
state->cache_ref_only();
state->_saved_entry = _states->store(state, nullptr);
_empty_state = state;
}

8
panda/src/pgraph/transformState.cxx
View File

@ -1025,6 +1025,14 @@ get_num_unused_states() {
for (size_t si = 0; si < size; ++si) {
const TransformState *state = _states->get_key(si);
std::pair<StateCount::iterator, bool> ir =
state_count.insert(StateCount::value_type(state, 1));
if (!ir.second) {
// If the above insert operation fails, then it's already in the
// cache; increment its value.
(*(ir.first)).second++;
}
size_t i;
size_t cache_size = state->_composition_cache.get_num_entries();
for (i = 0; i < cache_size; ++i) {