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

Took out debugging code.

Browse Source
This commit is contained in:
Josh Yelon 2008-02-26 19:42:00 +00:00
parent 975c234375
commit b70b3d7102
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7116,8 +7116,6 @@ upload_texture_image(CLP(TextureContext) *gtc,
} }
int highest_level = 0; int highest_level = 0;
report_my_gl_errors();
if (!gtc->_already_applied || if (!gtc->_already_applied ||
gtc->_uses_mipmaps != uses_mipmaps || gtc->_uses_mipmaps != uses_mipmaps ||
@ -7213,7 +7211,6 @@ upload_texture_image(CLP(TextureContext) *gtc,
highest_level = n; highest_level = n;
} }
report_my_gl_errors();
} else { } else {
// We can reload the image over the previous image, possibly // We can reload the image over the previous image, possibly
// saving on texture memory fragmentation. // saving on texture memory fragmentation.
@ -7292,16 +7289,13 @@ upload_texture_image(CLP(TextureContext) *gtc,
highest_level = n; highest_level = n;
} }
report_my_gl_errors();
} }
report_my_gl_errors();
if (is_at_least_version(1, 2)) { if (is_at_least_version(1, 2)) {
if (load_ram_mipmaps) { if (load_ram_mipmaps) {
// By the time we get here, we have successfully loaded a certain // By the time we get here, we have successfully loaded a certain
// number of mipmap levels. Tell the GL that's all it's going to // number of mipmap levels. Tell the GL that's all it's going to
// get. // get.
cerr << " 1 texture_target=" << texture_target << " hi level = " << highest_level << " mip bias = " << mipmap_bias << "\n";
GLP(TexParameteri)(texture_target, GL_TEXTURE_MAX_LEVEL, highest_level - mipmap_bias); GLP(TexParameteri)(texture_target, GL_TEXTURE_MAX_LEVEL, highest_level - mipmap_bias);
} else if (uses_mipmaps) { } else if (uses_mipmaps) {
@ -7312,7 +7306,6 @@ upload_texture_image(CLP(TextureContext) *gtc,
GLP(TexParameteri)(texture_target, GL_TEXTURE_MAX_LEVEL, tex->get_expected_num_mipmap_levels() - mipmap_bias - 1); GLP(TexParameteri)(texture_target, GL_TEXTURE_MAX_LEVEL, tex->get_expected_num_mipmap_levels() - mipmap_bias - 1);
} }
} }
report_my_gl_errors();
// Report the error message explicitly if the GL texture creation // Report the error message explicitly if the GL texture creation
// failed. // failed.