Cleanup simple compressors. Move code from FastCompress to QuickCompress.

This commit is contained in:
castano
2008-03-20 01:39:02 +00:00
parent cc8656f12b
commit 065c5f0689
5 changed files with 280 additions and 914 deletions

View File

@ -29,7 +29,7 @@
#include <nvimage/BlockDXT.h>
#include <nvtt/CompressionOptions.h>
#include <nvtt/OutputOptions.h>
#include <nvtt/FastCompressDXT.h>
#include <nvtt/QuickCompressDXT.h>
#include "CudaCompressDXT.h"
#include "CudaUtils.h"
@ -230,7 +230,7 @@ void CudaCompressor::compressDXT3(const Image * image, const OutputOptions::Priv
for (uint i = 0; i < count; i++)
{
ColorBlock rgba(blockLinearImage + (bn + i) * 16);
compressBlock(rgba, alphaBlocks + i);
QuickCompress::compressDXT3A(rgba, alphaBlocks + i);
}
// Check for errors.
@ -314,7 +314,7 @@ void CudaCompressor::compressDXT5(const Image * image, const OutputOptions::Priv
for (uint i = 0; i < count; i++)
{
ColorBlock rgba(blockLinearImage + (bn + i) * 16);
compressBlock_Iterative(rgba, alphaBlocks + i);
QuickCompress::compressDXT5A(rgba, alphaBlocks + i);
}
// Check for errors.