Update to latest icbc version.

src/nvtt/BlockCompressor.cpp

@@ -214,8 +214,8 @@ void FastCompressorDXT1::compressBlock(Vector4 colors[16], float weights[16], co
 }
 void CompressorDXT1::compressBlock(Vector4 colors[16], float weights[16], const CompressionOptions::Private & compressionOptions, void * output)
 {
-    bool hq = compressionOptions.quality > Quality_Normal;
-    icbc::compress_dxt1((float*)colors, weights, compressionOptions.colorWeight.component, /*three_color_mode*/true, hq, output);
+    auto quality_level = compressionOptions.quality > Quality_Normal ? icbc::Quality_Max : icbc::Quality_Default;
+    icbc::compress_dxt1(quality_level, (float*)colors, weights, compressionOptions.colorWeight.component, /*three_color_mode*/true, /*three_color_black*/true, output);
 }
 
 

src/nvtt/CompressorDXT5_RGBM.cpp

@@ -61,7 +61,7 @@ float nv::compress_dxt5_rgbm(const Vector4 input_colors[16], const float input_w
     float color_weights[3] = { 1.0f,1.0f,1.0f };
 
     // Compress RGB.
-    icbc::compress_dxt1((float *)input_colors_rgbm, rgb_weights, color_weights, /*three_color_mode=*/false, /*hq=*/false, &output->color);
+    icbc::compress_dxt1(icbc::Quality_Default, (float *)input_colors_rgbm, rgb_weights, color_weights, /*three_color_mode=*/false, /*hq=*/false, &output->color);
 
     // Decompress RGB/M block.
     nv::ColorBlock RGB;

src/nvtt/Context.cpp

@@ -69,7 +69,7 @@ Compressor::Compressor() : m(*new Compressor::Private())
 
     m.dispatcher = &m.defaultDispatcher;
 
-    icbc::init();
+    icbc::init_dxt1();
 }
 
 Compressor::~Compressor()

src/nvtt/icbc.cpp

@@ -1,2 +1,3 @@
 #define ICBC_IMPLEMENTATION
+#define ICBC_SIMD 2 // SSE4.1
 #include "icbc.h"

src/nvtt/tests/CMakeLists.txt

@@ -28,8 +28,8 @@ TARGET_LINK_LIBRARIES(cubemaptest nvcore nvmath nvimage nvtt)
 ADD_EXECUTABLE(nvhdrtest hdrtest.cpp)
 TARGET_LINK_LIBRARIES(nvhdrtest nvcore nvimage nvtt bc6h nvmath)
 
-ADD_EXECUTABLE(bc1enc bc1enc.cpp)
-TARGET_LINK_LIBRARIES(bc1enc nvcore nvimage nvmath squish CMP_Core)
+#ADD_EXECUTABLE(bc1enc bc1enc.cpp)
+#TARGET_LINK_LIBRARIES(bc1enc nvcore nvimage nvmath squish CMP_Core)
 
 INSTALL(TARGETS nvtestsuite nvhdrtest DESTINATION bin)