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

Fixed bug in prepare_for_deletion

Browse Source
This commit is contained in:
Josh Yelon 2006-03-09 23:08:30 +00:00
parent 79cf7493de
commit d1ea4b3570
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
panda/src/display/graphicsOutput.cxx
View File

@ -1002,31 +1002,22 @@ end_frame(FrameMode mode) {
void GraphicsOutput::
prepare_for_deletion() {
// I'll remove this permanently in a few days. - Josh
// HOWEVER - it might be nice to add this functionality to the
// new module. It's not in there yet.
_active = false;
_delete_flag = true;
// We have to be sure to remove all of the display regions
// immediately, so that circular reference counts can be cleared
// up (each display region keeps a pointer to a CullResult,
// which can hold all sorts of pointers).
remove_all_display_regions();
// But when show-buffers mode is enabled, we want to keep the
// window around until the user has a chance to see the texture.
// So we don't do most of the following in show-buffers mode.
// if (!show_buffers) {
// _active = false;
// _delete_flag = true;
//
// // We have to be sure to remove all of the display regions
// // immediately, so that circular reference counts can be cleared
// // up (each display region keeps a pointer to a CullResult,
// // which can hold all sorts of pointers).
// remove_all_display_regions();
//
// // If we were rendering directly to texture, we can't delete the
// // buffer until the texture is gone too.
// for (int i=0; i<count_textures(); i++) {
// if (get_rtm_mode(i) == RTM_bind_or_copy) {
// _hold_textures.push_back(get_texture(i));
// }
// }
// }
// If we were rendering directly to texture, we can't delete the
// buffer until the texture is gone too.
for (int i=0; i<count_textures(); i++) {
if (get_rtm_mode(i) == RTM_bind_or_copy) {
_hold_textures.push_back(get_texture(i));
}
}
// We have to be sure to clear the _textures pointers, though, or
// we'll end up holding a reference to the textures forever.