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

Do not use CUDA to compress small mipmaps.

Browse Source
This commit is contained in:
castano 2009-03-02 09:09:05 +00:00
parent 3a52923697
commit 3df66be089
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvtt/Context.cpp
View File

@ -951,6 +951,8 @@ bool Compressor::Private::compressMipmap(const Mipmap & mipmap, const InputOptio
SlowCompressor slow;
slow.setImage(image, inputOptions.alphaMode);
const bool useCuda = cudaEnabled && image->width() * image->height() >= 1024;
if (compressionOptions.format == Format_DXT1)
{
#if defined(HAVE_S3QUANT)
@ -983,7 +985,7 @@ bool Compressor::Private::compressMipmap(const Mipmap & mipmap, const InputOptio
}
else
{
if (cudaEnabled)
if (useCuda)
{
nvDebugCheck(cudaSupported);
cuda->setImage(image, inputOptions.alphaMode);
@ -1004,7 +1006,7 @@ bool Compressor::Private::compressMipmap(const Mipmap & mipmap, const InputOptio
}
else
{
if (cudaEnabled)
if (useCuda)
{
nvDebugCheck(cudaSupported);
/*cuda*/slow.compressDXT1a(compressionOptions, outputOptions);
@ -1017,7 +1019,7 @@ bool Compressor::Private::compressMipmap(const Mipmap & mipmap, const InputOptio
}
else if (compressionOptions.format == Format_DXT1n)
{
if (cudaEnabled)
if (useCuda)
{
nvDebugCheck(cudaSupported);
cuda->setImage(image, inputOptions.alphaMode);
@ -1036,7 +1038,7 @@ bool Compressor::Private::compressMipmap(const Mipmap & mipmap, const InputOptio
}
else
{
if (cudaEnabled)
if (useCuda)
{
nvDebugCheck(cudaSupported);
cuda->setImage(image, inputOptions.alphaMode);
@ -1056,7 +1058,7 @@ bool Compressor::Private::compressMipmap(const Mipmap & mipmap, const InputOptio
}
else
{
if (cudaEnabled)
if (useCuda)
{
nvDebugCheck(cudaSupported);
cuda->setImage(image, inputOptions.alphaMode);
@ -1076,7 +1078,7 @@ bool Compressor::Private::compressMipmap(const Mipmap & mipmap, const InputOptio
}
else
{
/*if (cudaEnabled)
/*if (useCuda)
{
nvDebugCheck(cudaSupported);
cuda->setImage(image, inputOptions.alphaMode);
@ -1098,7 +1100,7 @@ bool Compressor::Private::compressMipmap(const Mipmap & mipmap, const InputOptio
}
else if (compressionOptions.format == Format_CTX1)
{
if (cudaEnabled)
if (useCuda)
{
nvDebugCheck(cudaSupported);
cuda->setImage(image, inputOptions.alphaMode);