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

Incomplete DXT1a support.

Browse Source
This commit is contained in:
castano 2008-01-07 07:35:43 +00:00
parent 2903886498
commit c02a5bb51f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvtt/CompressDXT.cpp
View File

@ -241,8 +241,8 @@ void nv::compressDXT1a(const Image * image, const OutputOptions::Private & outpu
rgba.init(image, x, y);
// Compress color.
squish::ColourSet colours((uint8 *)rgba.colors(), 0);
squish::WeightedClusterFit fit(&colours, squish::kDxt1);
squish::ClusterFit fit(&colours, squish::kDxt1);
fit.setMetric(compressionOptions.colorWeight.x(), compressionOptions.colorWeight.y(), compressionOptions.colorWeight.z());
fit.Compress(&block);

4
src/nvtt/nvtt.cpp
View File

@ -224,11 +224,11 @@ static bool compressMipmap(const Image * image, const OutputOptions::Private & o
{
if (compressionOptions.useCuda && nv::cuda::isHardwarePresent())
{
/*cuda*/compressDXT1a(image, outputOptions);
/*cuda*/compressDXT1a(image, outputOptions, compressionOptions);
}
else
{
compressDXT1a(image, outputOptions);
compressDXT1a(image, outputOptions, compressionOptions);
}
}
}

2
src/nvtt/squish/colourset.cpp
View File

@ -43,7 +43,7 @@ ColourSet::ColourSet( u8 const* rgba, int flags )
{
m_remap[i] = -1;
m_transparent = true;
continue;
// continue;
}
#if 1