Merge pull request #243 from thecelloman/updatesquish

Update squish
This commit is contained in:
SilentMike 2013-03-10 11:36:02 -07:00
commit 17c750b19a
14 changed files with 99 additions and 247 deletions

View file

@ -88,10 +88,7 @@ bool DDSUtil::squishDDS( DDSFile *srcDDS, const GFXFormat dxtFormat )
PROFILE_START(SQUISH_DXT_COMPRESS);
// Compress with Squish
//
// squish::CompressImageOMP will call squish::CompressImage if OpenMP is
// not enabled.
squish::CompressImageOMP( srcBits, srcDDS->getWidth(i), srcDDS->getHeight(i),
squish::CompressImage( srcBits, srcDDS->getWidth(i), srcDDS->getHeight(i),
dstBits, squishFlags );
PROFILE_END();