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

Update to latest icbc version.

Browse Source
This commit is contained in:
Ignacio 2020-06-07 20:02:14 -07:00
parent 0f98a936f8
commit fdfbfb2552
6 changed files with 3843 additions and 3925 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvtt/BlockCompressor.cpp
View File

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

2
src/nvtt/CompressorDXT5_RGBM.cpp
View File

@ -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 }; float color_weights[3] = { 1.0f,1.0f,1.0f };
// Compress RGB. // 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. // Decompress RGB/M block.
nv::ColorBlock RGB; nv::ColorBlock RGB;

2
src/nvtt/Context.cpp
View File

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

1
src/nvtt/icbc.cpp
View File

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

7755
src/nvtt/icbc.h
View File

File diff suppressed because it is too large Load Diff

4
src/nvtt/tests/CMakeLists.txt
View File

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