drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable support for DXT3 and DXT5 accelerated compressors.

Browse Source
This commit is contained in:
castano
2007-07-09 10:31:54 +00:00
parent 31c9ef0413
commit 1548c2ed80
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvimage/nvtt/dxtlib.cpp
View File

@ -186,15 +186,15 @@ static bool compressMipmap(const Image * image, const OutputOptions & outputOpti
} }
else else
#endif #endif
if (compressionOptions.useCuda && nv::cuda::isHardwarePresent()) if (compressionOptions.quality == Quality_Fastest)
{ {
cudaCompressDXT1(image, outputOptions, compressionOptions); fastCompressDXT1(image, outputOptions);
} }
else else
{ {
if (compressionOptions.quality == Quality_Fastest) if (compressionOptions.useCuda && nv::cuda::isHardwarePresent())
{ {
fastCompressDXT1(image, outputOptions); cudaCompressDXT1(image, outputOptions, compressionOptions);
} }
else else
{ {
@ -210,7 +210,14 @@ static bool compressMipmap(const Image * image, const OutputOptions & outputOpti
} }
else else
{ {
compressDXT3(image, outputOptions, compressionOptions); if (compressionOptions.useCuda && nv::cuda::isHardwarePresent())
{
cudaCompressDXT3(image, outputOptions, compressionOptions);
}
else
{
compressDXT3(image, outputOptions, compressionOptions);
}
} }
} }
else if (compressionOptions.format == Format_DXT5) else if (compressionOptions.format == Format_DXT5)
@ -221,7 +228,14 @@ static bool compressMipmap(const Image * image, const OutputOptions & outputOpti
} }
else else
{ {
compressDXT5(image, outputOptions, compressionOptions); if (compressionOptions.useCuda && nv::cuda::isHardwarePresent())
{
cudaCompressDXT5(image, outputOptions, compressionOptions);
}
else
{
compressDXT5(image, outputOptions, compressionOptions);
}
} }
} }
else if (compressionOptions.format == Format_DXT5n) else if (compressionOptions.format == Format_DXT5n)