ATOM-16320 Remove PVRTC and ETC compressor (#4557)
Signed-off-by: Qing Tao <qingtao@amazon.com>
This commit is contained in:
Qing Tao
GitHub
@@ -426,60 +426,6 @@ namespace UnitTest
|
||||
return isDifferent;
|
||||
}
|
||||
|
||||
|
||||
bool CompareDDSImage(const QString& imagePath1, const QString& imagePath2, QString& output)
|
||||
{
|
||||
IImageObjectPtr image1, alphaImage1, image2, alphaImage2;
|
||||
|
||||
|
||||
image1 = IImageObjectPtr(DdsLoader::LoadImageFromFileLegacy(imagePath1.toUtf8().constData()));
|
||||
if (image1 && image1->HasImageFlags(EIF_AttachedAlpha))
|
||||
{
|
||||
if (image1->HasImageFlags(EIF_Splitted))
|
||||
{
|
||||
alphaImage1 = IImageObjectPtr(DdsLoader::LoadImageFromFileLegacy(QString(imagePath1 + ".a").toUtf8().constData()));
|
||||
}
|
||||
else
|
||||
{
|
||||
alphaImage1 = IImageObjectPtr(DdsLoader::LoadAttachedImageFromDdsFileLegacy(imagePath1.toUtf8().constData(), image1));
|
||||
}
|
||||
}
|
||||
|
||||
image2 = IImageObjectPtr(DdsLoader::LoadImageFromFileLegacy(imagePath2.toUtf8().constData()));
|
||||
if (image2 && image2->HasImageFlags(EIF_AttachedAlpha))
|
||||
{
|
||||
if (image2->HasImageFlags(EIF_Splitted))
|
||||
{
|
||||
alphaImage2 = IImageObjectPtr(DdsLoader::LoadImageFromFileLegacy(QString(imagePath2 + ".a").toUtf8().constData()));
|
||||
}
|
||||
else
|
||||
{
|
||||
alphaImage2 = IImageObjectPtr(DdsLoader::LoadAttachedImageFromDdsFileLegacy(imagePath2.toUtf8().constData(), image2));
|
||||
}
|
||||
}
|
||||
|
||||
if (!image1 && !image2)
|
||||
{
|
||||
output += "Cannot load both image file! ";
|
||||
return false;
|
||||
}
|
||||
bool isDifferent = false;
|
||||
|
||||
isDifferent = GetComparisonResult(image1, image2, output);
|
||||
|
||||
|
||||
QFileInfo fi(imagePath1);
|
||||
AZStd::string imageName = fi.baseName().toUtf8().constData();
|
||||
SaveImageToFile(image1, imageName + "_new");
|
||||
SaveImageToFile(image2, imageName + "_old");
|
||||
|
||||
if (alphaImage1 || alphaImage2)
|
||||
{
|
||||
isDifferent |= GetComparisonResult(alphaImage1, alphaImage2, output);
|
||||
}
|
||||
|
||||
return isDifferent;
|
||||
}
|
||||
};
|
||||
|
||||
// test CPixelFormats related functions
|
||||
@@ -487,34 +433,6 @@ namespace UnitTest
|
||||
{
|
||||
CPixelFormats& pixelFormats = CPixelFormats::GetInstance();
|
||||
|
||||
//verify names which was used for legacy rc.ini
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("BC7t") == ePixelFormat_BC7t);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("ETC2A") == ePixelFormat_ETC2a);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("PVRTC4") == ePixelFormat_PVRTC4);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("BC1") == ePixelFormat_BC1);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("ETC2") == ePixelFormat_ETC2);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("BC1a") == ePixelFormat_BC1a);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("BC3") == ePixelFormat_BC3);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("BC7") == ePixelFormat_BC7);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("BC5s") == ePixelFormat_BC5s);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("EAC_RG11") == ePixelFormat_EAC_RG11);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("BC4") == ePixelFormat_BC4);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("EAC_R11") == ePixelFormat_EAC_R11);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("A8R8G8B8") == ePixelFormat_R8G8B8A8);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("BC6UH") == ePixelFormat_BC6UH);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("R9G9B9E5") == ePixelFormat_R9G9B9E5);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("X8R8G8B8") == ePixelFormat_R8G8B8X8);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("A16B16G16R16F") == ePixelFormat_R16G16B16A16F);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("G8R8") == ePixelFormat_R8G8);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("G16R16") == ePixelFormat_R16G16);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("G16R16F") == ePixelFormat_R16G16F);
|
||||
|
||||
//some legacy format need to be mapping to new format.
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("DXT1") == ePixelFormat_BC1);
|
||||
ASSERT_TRUE(pixelFormats.FindPixelFormatByLegacyName("DXT5") == ePixelFormat_BC3);
|
||||
|
||||
//calculate mipmap count. no cubemap support at this moment
|
||||
|
||||
//for all the non-compressed textures, if there minimum required texture size is 1x1
|
||||
for (uint32 i = 0; i < ePixelFormat_Count; i++)
|
||||
{
|
||||
@@ -543,13 +461,6 @@ namespace UnitTest
|
||||
}
|
||||
|
||||
//check function IsImageSizeValid && EvaluateImageDataSize function
|
||||
ASSERT_TRUE(pixelFormats.IsImageSizeValid(ePixelFormat_PVRTC4, 2, 1, false) == false);
|
||||
ASSERT_TRUE(pixelFormats.IsImageSizeValid(ePixelFormat_PVRTC4, 4, 4, false) == false);
|
||||
ASSERT_TRUE(pixelFormats.IsImageSizeValid(ePixelFormat_PVRTC4, 16, 16, false) == true);
|
||||
ASSERT_TRUE(pixelFormats.IsImageSizeValid(ePixelFormat_PVRTC4, 16, 32, false) == false);
|
||||
ASSERT_TRUE(pixelFormats.IsImageSizeValid(ePixelFormat_PVRTC4, 34, 34, false) == false);
|
||||
ASSERT_TRUE(pixelFormats.IsImageSizeValid(ePixelFormat_PVRTC4, 256, 256, false) == true);
|
||||
|
||||
ASSERT_TRUE(pixelFormats.IsImageSizeValid(ePixelFormat_BC1, 2, 1, false) == false);
|
||||
ASSERT_TRUE(pixelFormats.IsImageSizeValid(ePixelFormat_BC1, 16, 16, false) == true);
|
||||
ASSERT_TRUE(pixelFormats.IsImageSizeValid(ePixelFormat_BC1, 16, 32, false) == true);
|
||||
@@ -834,9 +745,7 @@ namespace UnitTest
|
||||
if (formatInfo->bCompressed)
|
||||
{
|
||||
// skip ASTC formats which are tested in TestConvertASTCCompressor
|
||||
if (!IsASTCFormat(pixelFormat)
|
||||
&& pixelFormat != ePixelFormat_PVRTC2 && pixelFormat != ePixelFormat_PVRTC4
|
||||
&& !IsETCFormat(pixelFormat)) // skip ETC since it's very slow
|
||||
if (!IsASTCFormat(pixelFormat))
|
||||
{
|
||||
compressedFormats.push_back(pixelFormat);
|
||||
}
|
||||
@@ -1112,55 +1021,6 @@ namespace UnitTest
|
||||
}
|
||||
}
|
||||
|
||||
TEST_F(ImageProcessingTest, DISABLED_CompareOutputImage)
|
||||
{
|
||||
AZStd::string curretTextureFolder = "../TestAssets/TextureAssets/assets_new/textures";
|
||||
AZStd::string oldTextureFolder = "../TestAssets/TextureAssets/assets_old/textures";
|
||||
bool outputOnlyDifferent = false;
|
||||
QDirIterator it(curretTextureFolder.c_str(), QStringList() << "*.dds", QDir::Files, QDirIterator::Subdirectories);
|
||||
QFile f("../texture_comparison_output.csv");
|
||||
f.open(QIODevice::ReadWrite | QIODevice::Truncate);
|
||||
// Write a header for csv file
|
||||
f.write("Texture Name, Path, Mip new/old, MipDiff, Format new/old, Flag new/old, MemSize new/old, MemDiff, Error, AlphaMip new/old, AlphaMipDiff, AlphaFormat new/old, AlphaFlag new/old, AlphaMemSize new/old, AlphaMemDiff, AlphaError\r\n");
|
||||
int i = 0;
|
||||
while (it.hasNext())
|
||||
{
|
||||
i++;
|
||||
it.next();
|
||||
|
||||
QString fileName = it.fileName();
|
||||
QString newFilePath = it.filePath();
|
||||
QString sharedPath = QString(newFilePath).remove(curretTextureFolder.c_str());
|
||||
QString oldFilePath = QString(oldTextureFolder.c_str()) + sharedPath;
|
||||
QString output;
|
||||
if (QFile::exists(oldFilePath))
|
||||
{
|
||||
bool isDifferent = CompareDDSImage(newFilePath, oldFilePath, output);
|
||||
if (outputOnlyDifferent && !isDifferent)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
f.write(fileName.toUtf8().constData());
|
||||
f.write(",");
|
||||
f.write(sharedPath.toUtf8().constData());
|
||||
f.write(output.toUtf8().constData());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
f.write(fileName.toUtf8().constData());
|
||||
f.write(",");
|
||||
f.write(sharedPath.toUtf8().constData());
|
||||
output += ",No old file for comparison!";
|
||||
f.write(output.toUtf8().constData());
|
||||
}
|
||||
f.write("\r\n");
|
||||
}
|
||||
f.close();
|
||||
}
|
||||
|
||||
TEST_F(ImageProcessingTest, TextureSettingReflect_SerializingModernDataInAndOut_WritesAndParsesFileAccurately)
|
||||
{
|
||||
AZStd::string filepath = "test.xml";
|
||||
|
||||
Reference in New Issue
Block a user