TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

corrects a leak found with createcomposite

Browse source
This commit is contained in:
AzaezelX 2019-05-28 17:13:05 -05:00
parent 5c806d7183
commit 35ea209827
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/gfx/gfxTextureManager.cpp
View file

@ -1131,6 +1131,13 @@ GFXTextureObject *GFXTextureManager::createCompositeTexture(GBitmap*bmp[4], U32
return NULL; return NULL;
} }
GFXTextureObject* cacheHit = _lookupTexture(resourceName, profile);
if (cacheHit != NULL)
{
// Con::errorf("Cached texture '%s'", (resourceName.isNotEmpty() ? resourceName.c_str() : "unknown"));
return cacheHit;
}
U8 rChan, gChan, bChan, aChan; U8 rChan, gChan, bChan, aChan;
GBitmap *outBitmap = new GBitmap(); GBitmap *outBitmap = new GBitmap();
outBitmap->allocateBitmap(bmp[0]->getWidth(), bmp[0]->getHeight(),false, GFXFormatR8G8B8A8); outBitmap->allocateBitmap(bmp[0]->getWidth(), bmp[0]->getHeight(),false, GFXFormatR8G8B8A8);
@ -1160,19 +1167,14 @@ GFXTextureObject *GFXTextureManager::createCompositeTexture(GBitmap*bmp[4], U32
} }
} }
GFXTextureObject *cacheHit = _lookupTexture(resourceName, profile); if (deleteBmp)
if (cacheHit != NULL)
{ {
// Con::errorf("Cached texture '%s'", (resourceName.isNotEmpty() ? resourceName.c_str() : "unknown")); delete[] bmp;
if (deleteBmp)
{
delete outBitmap;
delete[] bmp;
}
return cacheHit;
} }
return _createTexture(outBitmap, resourceName, profile, deleteBmp, NULL); GFXTextureObject * ret= _createTexture(outBitmap, resourceName, profile, deleteBmp, NULL);
delete outBitmap;
return ret;
} }
GFXTextureObject* GFXTextureManager::_findPooledTexure( U32 width, GFXTextureObject* GFXTextureManager::_findPooledTexure( U32 width,