RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix minor ordering issues

This commit is contained in:
David Rose 2006-03-17 00:31:09 +00:00
parent 847259e346
commit 706ce05aa8
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/display/graphicsStateGuardian.cxx
View File

@ -988,7 +988,6 @@ begin_frame() {
////////////////////////////////////////////////////////////////////
bool GraphicsStateGuardian::
begin_scene() {
_prepared_objects->end_frame();
return true;
}
@ -1058,6 +1057,7 @@ end_scene() {
////////////////////////////////////////////////////////////////////
void GraphicsStateGuardian::
end_frame() {
_prepared_objects->end_frame();
}
////////////////////////////////////////////////////////////////////

33
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -1207,6 +1207,24 @@ begin_frame() {
////////////////////////////////////////////////////////////////////
void CLP(GraphicsStateGuardian)::
end_frame() {
#ifdef DO_PSTATS
// Check for textures, etc., that are no longer resident. These
// calls might be measurably expensive, and they don't have any
// benefit unless we are actually viewing PStats, so don't do them
// unless we're connected. That will just mean that we'll count
// everything as resident until the user connects PStats, at which
// point it will then correct the assessment. No harm done.
if (PStatClient::is_connected()) {
check_nonresident_texture(_prepared_objects->_texture_residency.get_inactive_resident());
check_nonresident_texture(_prepared_objects->_texture_residency.get_active_resident());
// OpenGL provides no methods for querying whether a buffer object
// (vertex buffer) is resident. In fact, the API appears geared
// towards the assumption that such buffers are always resident.
// OK.
}
#endif
GraphicsStateGuardian::end_frame();
// Now is a good time to delete any pending display lists.
@ -1236,17 +1254,6 @@ end_frame() {
GLP(Flush)();
}
#ifdef DO_PSTATS
// Check for textures, etc., that are no longer resident.
check_nonresident_texture(_prepared_objects->_texture_residency.get_inactive_resident());
check_nonresident_texture(_prepared_objects->_texture_residency.get_active_resident());
// OpenGL provides no methods for querying whether a buffer object
// (vertex buffer) is resident. In fact, the API appears geared
// towards the assumption that such buffers are always resident.
// OK.
#endif
report_my_gl_errors();
}
@ -6751,6 +6758,10 @@ get_texture_memory_size(Texture *tex) const {
void CLP(GraphicsStateGuardian)::
check_nonresident_texture(BufferContextChain &chain) {
size_t num_textures = chain.get_count();
if (num_textures == 0) {
return;
}
CLP(TextureContext) **gtc_list = (CLP(TextureContext) **)alloca(num_textures * sizeof(CLP(TextureContext) *));
GLuint *texture_list = (GLuint *)alloca(num_textures * sizeof(GLuint));
size_t ti = 0;