diff --git a/src/nvtt/CompressDXT.cpp b/src/nvtt/CompressDXT.cpp index 08178df..cc38b8f 100644 --- a/src/nvtt/CompressDXT.cpp +++ b/src/nvtt/CompressDXT.cpp @@ -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); diff --git a/src/nvtt/nvtt.cpp b/src/nvtt/nvtt.cpp index 7c59f3c..af76cf5 100644 --- a/src/nvtt/nvtt.cpp +++ b/src/nvtt/nvtt.cpp @@ -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); } } } diff --git a/src/nvtt/squish/colourset.cpp b/src/nvtt/squish/colourset.cpp index 1c34fb6..e66161a 100644 --- a/src/nvtt/squish/colourset.cpp +++ b/src/nvtt/squish/colourset.cpp @@ -43,7 +43,7 @@ ColourSet::ColourSet( u8 const* rgba, int flags ) { m_remap[i] = -1; m_transparent = true; - continue; + // continue; } #if 1