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

Merge changes from the witness.

Browse Source 
Fix parallel cluster fit compressor.
Luma compression experiment.
This commit is contained in:
castano
2012-04-30 23:03:44 +00:00
parent b130487c2a
commit fa4ba97f6d
11 changed files with 219 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvtt/Context.cpp
View File

@ -690,7 +690,7 @@ CompressorInterface * Compressor::Private::chooseCpuCompressor(const Compression
return new FastCompressorDXT1;
}
return new NormalCompressorDXT1;
return new CompressorDXT1;
}
else if (compressionOptions.format == Format_DXT1a)
{
@ -699,7 +699,7 @@ CompressorInterface * Compressor::Private::chooseCpuCompressor(const Compression
return new FastCompressorDXT1a;
}
return new NormalCompressorDXT1a;
return new CompressorDXT1a;
}
else if (compressionOptions.format == Format_DXT1n)
{
@ -712,7 +712,7 @@ CompressorInterface * Compressor::Private::chooseCpuCompressor(const Compression
return new FastCompressorDXT3;
}
return new NormalCompressorDXT3;
return new CompressorDXT3;
}
else if (compressionOptions.format == Format_DXT5)
{
@ -726,7 +726,7 @@ CompressorInterface * Compressor::Private::chooseCpuCompressor(const Compression
return new FastCompressorDXT5;
}
return new NormalCompressorDXT5;
return new CompressorDXT5;
}
else if (compressionOptions.format == Format_DXT5n)
{
@ -735,7 +735,7 @@ CompressorInterface * Compressor::Private::chooseCpuCompressor(const Compression
return new FastCompressorDXT5n;
}
return new NormalCompressorDXT5n;
return new CompressorDXT5n;
}
else if (compressionOptions.format == Format_BC4)
{