birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update o3de to use new packages of ISPCTexComp and squish-ccr (#3556)

Browse Source 
Update package name and hash
Add compressor names.
Update ImageProcessingAtom unit tests.
Removed some unused test assets under ImageProcessingAtom
Enalbe ISPC to all the platforms.
Better error message with compression/decompression
Add temp folder to git ignore
added ispccompressor for all platform. valid it with linux
Update windows package hashes.
Removed AZ_TRAIT_IMAGEPROCESSING_USE_ISPC_TEXTURE_COMPRESSOR
Minor refactor with image processing unit tests.

Signed-off-by: qingtao <qingtao@amazon.com>
This commit is contained in:
Qing Tao
2021-08-27 10:09:58 -07:00
committed by GitHub
parent 9e5ef08229
commit 9fac26e6a6
44 changed files with 173 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
+17 -5
View File
@@ -6,6 +6,7 @@
*
*/
#include <AzCore/std/time.h>
#include <Processing/ImageFlags.h>
#include <Processing/ImageObjectImpl.h>
@@ -97,9 +98,18 @@ namespace ImageProcessingAtom
else
{
IImageObjectPtr dstImage = nullptr;
const PixelFormatInfo* compressedInfo = CPixelFormats::GetInstance().GetPixelFormatInfo(compressedFmt);
if (isSrcUncompressed)
{
AZ::u64 startTime = AZStd::GetTimeUTCMilliSecond();
dstImage = compressor->CompressImage(Get(), fmtDst, &m_compressOption);
AZ::u64 endTime = AZStd::GetTimeUTCMilliSecond();
[[maybe_unused]] double processTime = static_cast<double>(endTime - startTime) / 1000.0;
if (dstImage)
{
AZ_TracePrintf("Image Processing", "Image [%dx%d] was compressed to [%s] format by [%s] in %.3f seconds\n",
Get()->GetWidth(0), Get()->GetHeight(0), compressedInfo->szName, compressor->GetName(), processTime);
}
}
else
{
@@ -107,11 +117,13 @@ namespace ImageProcessingAtom
}
Set(dstImage);
}
if (Get() == nullptr)
{
AZ_Error("Image Processing", false, "The selected compressor failed to compress this image");
if (dstImage == nullptr)
{
AZ_Error("Image Processing", false, "Failed to use [%s] to %s [%s] format", compressor->GetName(),
isSrcUncompressed ? "compress" : "decompress",
compressedInfo->szName);
}
}
}
}