TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix RenderEffects cache problem

Browse Source
This commit is contained in:
David Rose 2007-07-16 18:02:28 +00:00
parent 0510edc734
commit 7b0bb21bbe
4 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -510,7 +510,18 @@ validate_states() {
while (snext != _states->end()) { while (snext != _states->end()) {
if (!(*(*si) < *(*snext))) { if (!(*(*si) < *(*snext))) {
pgraph_cat.error() pgraph_cat.error()
<< "RenderEffectss out of order!\n"; << "RenderEffects out of order!\n";
(*si)->write(pgraph_cat.error(false), 2);
(*snext)->write(pgraph_cat.error(false), 2);
return false;
}
if ((*(*snext) < *(*si))) {
pgraph_cat.error()
<< "RenderEffects::operator < not defined properly!\n";
pgraph_cat.error(false)
<< "a < b: " << (*(*si) < *(*snext)) << "\n";
pgraph_cat.error(false)
<< "b < a: " << (*(*snext) < *(*si)) << "\n";
(*si)->write(pgraph_cat.error(false), 2); (*si)->write(pgraph_cat.error(false), 2);
(*snext)->write(pgraph_cat.error(false), 2); (*snext)->write(pgraph_cat.error(false), 2);
return false; return false;
@ -650,6 +661,31 @@ release_new() {
nassertv(_states_lock->debug_is_locked()); nassertv(_states_lock->debug_is_locked());
if (_saved_entry != _states->end()) { if (_saved_entry != _states->end()) {
/*
if (_states->find(this) != _saved_entry) {
nassertv(*_saved_entry == this);
cerr << "States wrong!\n";
cerr << "validate = " << validate_states() << "\n";
if (!_states->empty()) {
States::iterator si;
si = _states->begin();
cerr << (*si) << ": " << *(*si) << "\n";
States::iterator ni = si;
++ni;
while (ni != _states->end()) {
if (*(*si) < *(*ni)) {
cerr << " ok, " << (*(*ni) < *(*si)) << "\n";
} else {
cerr << " **wrong! " << (*(*ni) < *(*si)) << "\n";
}
si = ni;
cerr << (*si) << ": " << *(*si) << "\n";
++ni;
}
}
}
*/
nassertv(_states->find(this) == _saved_entry); nassertv(_states->find(this) == _saved_entry);
_states->erase(_saved_entry); _states->erase(_saved_entry);
_saved_entry = _states->end(); _saved_entry = _states->end();

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

@ -1052,6 +1052,17 @@ validate_states() {
(*snext)->write(pgraph_cat.error(false), 2); (*snext)->write(pgraph_cat.error(false), 2);
return false; return false;
} }
if ((*(*snext) < *(*si))) {
pgraph_cat.error()
<< "RenderStates::operator < not defined properly!\n";
pgraph_cat.error(false)
<< "a < b: " << (*(*si) < *(*snext)) << "\n";
pgraph_cat.error(false)
<< "b < a: " << (*(*snext) < *(*si)) << "\n";
(*si)->write(pgraph_cat.error(false), 2);
(*snext)->write(pgraph_cat.error(false), 2);
return false;
}
si = snext; si = snext;
++snext; ++snext;
nassertr((*si)->get_ref_count() > 0, false); nassertr((*si)->get_ref_count() > 0, false);

2
panda/src/pgraph/texProjectorEffect.cxx
View File

@ -292,7 +292,7 @@ compare_to_impl(const RenderEffect *other) const {
} }
} }
if (bi != _stages.end()) { if (bi != ta->_stages.end()) {
// a ran out first; b was longer. // a ran out first; b was longer.
return -1; return -1;
} }

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

@ -1221,6 +1221,17 @@ validate_states() {
(*snext)->write(pgraph_cat.error(false), 2); (*snext)->write(pgraph_cat.error(false), 2);
return false; return false;
} }
if ((*(*snext) < *(*si))) {
pgraph_cat.error()
<< "TransformState::operator < not defined properly!\n";
pgraph_cat.error(false)
<< "a < b: " << (*(*si) < *(*snext)) << "\n";
pgraph_cat.error(false)
<< "b < a: " << (*(*snext) < *(*si)) << "\n";
(*si)->write(pgraph_cat.error(false), 2);
(*snext)->write(pgraph_cat.error(false), 2);
return false;
}
si = snext; si = snext;
++snext; ++snext;
nassertr((*si)->get_ref_count() > 0, false); nassertr((*si)->get_ref_count() > 0, false);