Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'shyotl/V2MultiWear' into AltCompilers

Browse Source
This commit is contained in:
Drake Arconis
2012-07-16 17:20:47 -04:00
parent 93d7a4938a 3cee90fe8b
commit 32b24a98ca
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llrender/llimagegl.cpp
View File

@@ -330,7 +330,6 @@ S32 LLImageGL::updateBoundTexMem(const S32 mem, const S32 ncomponents, S32 categ
//static //static
void LLImageGL::destroyGL(BOOL save_state) void LLImageGL::destroyGL(BOOL save_state)
{ {
deleteDeadTextures(); //Dump unimportant textures.
for (S32 stage = 0; stage < gGLManager.mNumTextureUnits; stage++) for (S32 stage = 0; stage < gGLManager.mNumTextureUnits; stage++)
{ {
gGL.getTexUnit(stage)->unbind(LLTexUnit::TT_TEXTURE); gGL.getTexUnit(stage)->unbind(LLTexUnit::TT_TEXTURE);
@@ -364,7 +363,6 @@ void LLImageGL::destroyGL(BOOL save_state)
} }
llinfos << "Storing " << stored_count << " images..." << llendl; llinfos << "Storing " << stored_count << " images..." << llendl;
sAllowReadBackRaw = false ; sAllowReadBackRaw = false ;
deleteDeadTextures();//Now, actually call glDeleteTextures for everything.
} }
//static //static
@@ -1528,7 +1526,7 @@ void LLImageGL::deleteDeadTextures()
{ {
bool reset = false; bool reset = false;
for(U32 i=0;i<LLTexUnit::TT_NONE;++i) /*for(U32 i=0;i<LLTexUnit::TT_NONE;++i)
{ {
for(dead_texturelist_t::iterator it=sDeadTextureList[i].begin();it!=sDeadTextureList[i].end();++it) for(dead_texturelist_t::iterator it=sDeadTextureList[i].begin();it!=sDeadTextureList[i].end();++it)
{ {
@@ -1554,7 +1552,7 @@ void LLImageGL::deleteDeadTextures()
stop_glerror(); stop_glerror();
} }
} }
} }*/
if (reset) if (reset)
{ {