TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Release memory

Browse source
This commit is contained in:
Johan Mattsson 2023-03-04 21:55:39 +01:00 • committed by GitHub
parent 18ca6c406a
commit 390be98140
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/gfx/bitmap/ddsFile.cpp
View file

@ -123,7 +123,7 @@ U32 DDSFile::getSurfaceSize( U32 height, U32 width, U32 mipLevel ) const
if(mFlags.test(CompressedData)) if(mFlags.test(CompressedData))
{ {
// From the directX docs: // From the directX docs:
// max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5) // max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5)
U32 sizeMultiple = 0; U32 sizeMultiple = 0;
@ -178,7 +178,7 @@ U32 DDSFile::getSizeInBytes( GFXFormat format, U32 height, U32 width, U32 mipLev
"DDSFile::getSizeInBytes - Must be a Block Compression format!" ); "DDSFile::getSizeInBytes - Must be a Block Compression format!" );
// From the directX docs: // From the directX docs:
// max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5) // max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5)
U32 sizeMultiple = 0; U32 sizeMultiple = 0;
if ( format == GFXFormatBC1 || format == GFXFormatBC1_SRGB || format == GFXFormatBC4) if ( format == GFXFormatBC1 || format == GFXFormatBC1_SRGB || format == GFXFormatBC4)
@ -744,6 +744,7 @@ DDSFile *DDSFile::createDDSCubemapFileFromGBitmaps(GBitmap **gbmps)
GFXFormat fmt = pBitmap->getFormat(); GFXFormat fmt = pBitmap->getFormat();
if (fmt != GFXFormatR8G8B8A8 && fmt != GFXFormatR16G16B16A16F) if (fmt != GFXFormatR8G8B8A8 && fmt != GFXFormatR16G16B16A16F)
{ {
delete ret;
Con::errorf("createDDSCubemapFileFromGBitmaps: unsupported format"); Con::errorf("createDDSCubemapFileFromGBitmaps: unsupported format");
return NULL; return NULL;
} }
@ -807,4 +808,4 @@ DefineEngineFunction( getActiveDDSFiles, S32, (),,
"@ingroup Rendering\n" ) "@ingroup Rendering\n" )
{ {
return DDSFile::smActiveCopies; return DDSFile::smActiveCopies;
} }