RTXNTC v0.9.1

Alexey Panteleev · Alexey Panteleev · commit c73f78e99810 · 2025-12-18T14:32:17.000-08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,8 +20,6 @@ set(NVTT3_SEARCH_PATH "" CACHE PATH "Custom search path for NVTT3")
 option(NTC_WITH_RENDERER "Include the Renderer sample" ON)
 option(NTC_DEBUG_SHADERS "Compile NTC shaders with debug information" OFF)
 
-option(DONUT_WITH_LZ4 "" OFF)
-option(DONUT_WITH_MINIZ "" OFF)
 option(DONUT_WITH_DX11 "" OFF)
 if (WIN32)
     option(DONUT_WITH_DX12 "" ON)
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,29 @@
 # RTX Neural Texture Compression SDK Change Log
 
+## 0.9.1 BETA
+
+### LibNTC
+
+- Improved accuracy of DP4a based decompression and made it more consistent across GPUs and graphics APIs.
+
+### Command-Line Tool
+
+- Added `--no-dithering` option that disables color dithering when saving images after graphics API decompression.
+
+### Testing Infrastructure
+
+- Fixed reporting of PSNR values for mip chains in ImageDiff.
+- Updated the BC transcoding tests to use much lower tolerances.
+
+### Other
+
+- Updated the Donut framework to reduce the number of external library dependencies.
+
+### Known Issues
+
+Please see the [Known Issues](/README.md#known-issues) section of the main Readme file.
+
+
 ## 0.9.0 BETA
 
 ### Breaking Changes
diff --git a/ThirdPartyLicenses.txt b/ThirdPartyLicenses.txt
@@ -273,38 +273,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------------------------------
 
 
-################################################################################
-#####                                                                      #####
-#####                              TaskFlow                                #####
-#####                https://github.com/taskflow/taskflow                  #####
-################################################################################
-
-Taskflow LICENSE
-
-Copyright (c) 2018-2021 T.-W. Huang, C.-X. Lin, G. Guo, and M. Wong
-
-University of Utah, Salt Lake City, UT, USA
-University of Illinois at Urbana-Champaign, IL, USA
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ################################################################################
 #####                                                                      #####
 #####                              tinyexr                                 #####
diff --git a/assets/testfiles/PavingStones070_5bpp.ntc b/assets/testfiles/PavingStones070_5bpp.ntc
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccddd663663228822f6c451d97cc1bd248cbe2e0aab5028785c1a18efe9ff51c
-size 3298020
+oid sha256:7f2dd9e31716cdc399e1cf4668bca0d22496ac0f4aeb9b06728ef618c9f86bd6
+size 3298668
diff --git a/assets/testfiles/PavingStones070_5bpp_DDS/AmbientOcclusion.dds b/assets/testfiles/PavingStones070_5bpp_DDS/AmbientOcclusion.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64b1bc710e6fa10b65e2ced5a17acecb415e8e6fe5bd1ae7b39f6b26fd59c4ee
+oid sha256:6071f5f5674868021e8f89dd3359a2860b719944c8c4889038d64e9d317a3366
 size 2796364
diff --git a/assets/testfiles/PavingStones070_5bpp_DDS/Color.dds b/assets/testfiles/PavingStones070_5bpp_DDS/Color.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be35d09a7db7a95d4d055fe43b95048d6d0a84f060f330b9900bc84e8dd947f4
+oid sha256:26f76f164a700e53fedbbec5ef3e1a0593129cea202f718c42c0aad2d20512f3
 size 5592580
diff --git a/assets/testfiles/PavingStones070_5bpp_DDS/Displacement.dds b/assets/testfiles/PavingStones070_5bpp_DDS/Displacement.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:735bac4bbbe07e2bca5bf471fd3a93da7aea389c8716d030101a244a30985875
+oid sha256:a6558db6b654e5711bfe9283531e6b6ccec5104a12664f9d5906a5de6a1f8d19
 size 2796364
diff --git a/assets/testfiles/PavingStones070_5bpp_DDS/NormalDX.dds b/assets/testfiles/PavingStones070_5bpp_DDS/NormalDX.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:388f27dabe06e53112f64985d62cae10d09c67bdc8bc229805fb1d762091b452
+oid sha256:36c6d2efc291d53fd3ba1b2c23cef0fc1fa42209532730e58c91e068050f5bee
 size 5592580
diff --git a/assets/testfiles/PavingStones070_5bpp_DDS/Roughness.dds b/assets/testfiles/PavingStones070_5bpp_DDS/Roughness.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:461345af6e57f433dedf15551405520f6f47ed82994a2e8aac305622f713802d
+oid sha256:121a5298dd7b8b9a9517908e826595f05046ab1b9b67b23b9eebd187faf1b1dd
 size 2796364
diff --git a/external/donut b/external/donut
@@ -1 +1 @@
-Subproject commit 8c2fde5b382e267aab1f8de05e9a314cc5d5b0ec
+Subproject commit e26041e552dd89a3000541e75d347ce1bbba9b71
diff --git a/libraries/RTXNTC-Library b/libraries/RTXNTC-Library
@@ -1 +1 @@
-Subproject commit b96f1af09fb0282a08a7f6faeb5cfa17bfa7cc12
+Subproject commit a64b2308bb4f4f5e011366de640e1f801c419e52
diff --git a/libraries/ntc-utils/src/Manifest.cpp b/libraries/ntc-utils/src/Manifest.cpp
@@ -12,9 +12,7 @@
 
 #include <ntc-utils/Manifest.h>
 #include <filesystem>
-#include <json/value.h>
-#include <json/reader.h>
-#include <json/writer.h>
+#include <json/json.h>
 #include <algorithm>
 #include <fstream>
 #include <iostream>
diff --git a/libraries/ntc.py b/libraries/ntc.py
@@ -79,6 +79,7 @@ class Arguments:
 
     # Inverse feature toggles - these map to '--no-coopVec' etc.
     noCoopVec: bool = False
+    noDithering: bool = False
     
     # All the below parameters are passed directly as command line arguments to ntc-cli
     adapter: Optional[int] = None
@@ -145,6 +146,8 @@ def get_command_line(self) -> List[str]:
                 elif value != '': raise ValueError(f'Unrecognized graphicsApi = {value}')
             elif name == 'noCoopVec':
                 if value: result.append('--no-coopVec')
+            elif name == 'noDithering':
+                if value: result.append('--no-dithering')
             else:
                 # Generic fields - decide what to do based on the data type
                 if value is None or value == '':
diff --git a/samples/renderer/NtcSceneRenderer.cpp b/samples/renderer/NtcSceneRenderer.cpp
@@ -212,13 +212,11 @@ class DummyTextureCache : public engine::TextureCache
         return nullptr;
     }
 
-#ifdef DONUT_WITH_TASKFLOW
     std::shared_ptr<engine::LoadedTexture> LoadTextureFromFileAsync(const std::filesystem::path& path, bool sRGB,
-        tf::Executor& executor) override
+        donut::engine::ThreadPool& threadPool) override
     {
         return nullptr;
     }
-#endif
 };
 
 enum class AntiAliasingMode
diff --git a/support/tests/imagediff/ImageDiff.cpp b/support/tests/imagediff/ImageDiff.cpp
@@ -250,6 +250,7 @@ bool CompareTwoImages(nvrhi::IDevice* device, nvrhi::ICommandList* commandList,
         ntc::MakeImageDifferenceComputePassParameters imageDifferenceParams = {};
         imageDifferenceParams.extent.width = int(mipWidth);
         imageDifferenceParams.extent.height = int(mipHeight);
+        imageDifferenceParams.outputOffset = imageDifferencePass.GetOffsetForQuery(mipLevel);
         ntc::ComputePassDesc computePass = {};
         ntc::Status ntcStatus = ntcContext->MakeImageDifferenceComputePass(imageDifferenceParams, &computePass);
         CHECK_NTC_RESULT(MakeImageDifferenceComputePass);
diff --git a/support/tests/make_test_ntc_files.py b/support/tests/make_test_ntc_files.py
@@ -38,6 +38,7 @@
     compress=True,
     decompress=True,
     bitsPerPixel=5.0,
+    randomSeed=1,
     optimizeBC=True,
     graphicsApi='vk',
     saveCompressed=ntcFileName,
@@ -56,6 +57,7 @@ def ready1(task: ntc.Arguments, result: ntc.Result, originalTaskCount: int, task
     loadCompressed=ntcFileName,
     decompress=True,
     noCoopVec=True,
+    noDithering=True,
     graphicsApi='vk',
     saveImages=ddsDir,
     saveMips=True
diff --git a/support/tests/test.py b/support/tests/test.py
@@ -436,21 +436,17 @@ def runTest(self):
             saveImages=decompressedDir,
             saveMips=True,
             noCoopVec=True,
+            noDithering=True,
             graphicsApi=self.api
         )
 
         result = ntc.run(args)
         
-        # TODO: The PSNR values should be much higher than these thresholds.
-        # Currently, they are 'inf' on Vulkan (because the reference files were encoded on Vulkan)
-        # and just above these threshold values on DX12 without CoopVec.
-        # With CoopVec, they are lower/worse, but this is sort of expected because CoopVec uses FP8 math instead of INT8.
-        #
-        # Also note: we're not testing all files here, just a representative subset using different BC formats.
+        # Note: we're not testing all files here, just a representative subset using different BC formats.
         outputFileNamesAndTolerances = [
-            ('AmbientOcclusion.dds', 49.0), # BC1
-            ('Color.dds', 44.0),            # BC7
-            ('Roughness.dds', 50.0)         # BC4
+            ('AmbientOcclusion.dds', 90), # BC1
+            ('Color.dds', 60),            # BC7
+            ('Roughness.dds', 70)         # BC4
         ]
 
         inputFiles = []
@@ -466,10 +462,12 @@ def runTest(self):
         mipLevels = 12
         self.assertEqual(len(compareResults), len(outputFileNamesAndTolerances) * mipLevels)
 
+        #print()
         for pair, mipLevel, mse, psnr in compareResults:
             name, tolerance = outputFileNamesAndTolerances[pair]
             if psnr < tolerance:
                 self.fail(f'Image mismatch for {name} at MIP {mipLevel}: MSE={mse}, PSNR={psnr} dB, Expected PSNR >= {tolerance} dB')
+            #print(f'{name} MIP {mipLevel}: {psnr} dB')
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
diff --git a/tools/cli/GraphicsPasses.cpp b/tools/cli/GraphicsPasses.cpp
@@ -192,6 +192,7 @@ bool DecompressTextureSetWithGraphicsAPI(
     ntc::ITextureSetMetadata* metadata,
     ntc::IStream* inputFile,
     int mipLevels,
+    bool enableDithering,
     GraphicsResourcesForTextureSet const& graphicsResources)
 {
     // In some cases, this function is called without a file - which means we reuse the previously uploaded data.
@@ -242,12 +243,41 @@ bool DecompressTextureSetWithGraphicsAPI(
     // Decompress each mip level in a loop
     for (int mipLevel = 0; mipLevel < mipLevels; ++mipLevel)
     {
+        std::vector<ntc::OutputTextureDesc> outputs;
+        for (int textureIndex = 0; textureIndex < numTextures; ++textureIndex)
+        {
+            ntc::ITextureMetadata const* textureMetadata = metadata->GetTexture(textureIndex);
+            ntc::OutputTextureDesc& outputDesc = outputs.emplace_back();
+
+            outputDesc.descriptorIndex = textureIndex;
+
+            textureMetadata->GetChannels(outputDesc.firstChannel, outputDesc.numChannels);
+            outputDesc.rgbColorSpace = textureMetadata->GetRgbColorSpace();
+            outputDesc.alphaColorSpace = textureMetadata->GetAlphaColorSpace();
+
+            if (textureMetadata->GetChannelFormat() == ntc::ChannelFormat::UNORM8)
+            {
+                if (enableDithering)
+                {
+                    outputDesc.ditherScale = 1.f / 255.f;
+                }
+                else
+                {
+                    // Assume that if the user has requested no dithering, they also want the output
+                    // most closely matching the original image, so enable explicit quantization.
+                    outputDesc.quantizationScale = 1.f / 255.f;
+                }
+            }
+        }
+
         // Obtain the compute pass description and constant buffer data from NTC
         ntc::MakeDecompressionComputePassParameters params;
         params.textureSetMetadata = metadata;
         params.mipLevel = mipLevel;
         params.firstOutputDescriptorIndex = mipLevel * numTextures;
         params.weightType = weightType;
+        params.numOutputTextures = numTextures;
+        params.pOutputTextures = outputs.data();
         ntc::ComputePassDesc computePass{};
         ntc::Status ntcStatus = context->MakeDecompressionComputePass(params, &computePass);
         CHECK_NTC_RESULT("MakeDecompressionComputePass");
diff --git a/tools/cli/GraphicsPasses.h b/tools/cli/GraphicsPasses.h
@@ -57,6 +57,7 @@ bool DecompressTextureSetWithGraphicsAPI(
     ntc::ITextureSetMetadata* metadata,
     ntc::IStream* inputFile,
     int mipLevels,
+    bool enableDithering,
     GraphicsResourcesForTextureSet const& graphicsResources);
 
 bool CopyTextureSetDataIntoGraphicsTextures(
diff --git a/tools/cli/NtcCommandLine.cpp b/tools/cli/NtcCommandLine.cpp
@@ -59,6 +59,7 @@ struct
     bool enableCoopVec = true;
     bool enableGpuDeflate = false;
     bool printVersion = false;
+    bool enableDithering = true;
     int gridSizeScale = 2;
     int numFeatures = NTC_MLP_FEATURES;
     int adapterIndex = -1;
@@ -127,6 +128,7 @@ bool ProcessCommandLine(int argc, const char** argv)
         OPT_STRING ('B', "bcFormat", &bcFormatString, "Set or override the BCn encoding format, BC1-BC7"),
         OPT_STRING ('F', "imageFormat", &imageFormatString, "Set the output file format for color images: Auto (default), BMP, JPG, TGA, PNG, PNG16, EXR"),
         OPT_STRING (0,   "dimensions", &dimensionsString, "Set the dimensions of the NTC texture set before compression, in the 'WxH' format"),
+        OPT_BOOLEAN(0,   "dithering", &g_options.enableDithering, "Enable dithering for 8-bit output textures when decompressing with graphics APIs (default on, use --no-dithering)"),
         
         OPT_GROUP("Advanced settings:"),
         OPT_FLOAT  (0,   "bcPsnrThreshold", &g_options.bcPsnrThreshold, "PSNR loss threshold for BC7 optimization, in dB, default value is 0.2"),
@@ -2070,7 +2072,8 @@ int main(int argc, const char** argv)
         {
             bool const decompressSucceeded = DecompressTextureSetWithGraphicsAPI(device, commandList,
                 timerQuery, gdp, gdeflateFeatures.get(),
-                context, metadata, iteration == 0 ? inputFile.Get() : nullptr, mipLevels, graphicsResources);
+                context, metadata, iteration == 0 ? inputFile.Get() : nullptr, mipLevels, g_options.enableDithering,
+                graphicsResources);
 
             if (!decompressSucceeded)
                 return 1;
diff --git a/tools/cli/Utils.cpp b/tools/cli/Utils.cpp
@@ -12,13 +12,13 @@
 
 #include "Utils.h"
 #include <lodepng.h>
-#include <taskflow/taskflow.hpp>
+#include <donut/engine/ThreadPool.h>
 #include <algorithm>
 #include <stb_image_write.h>
 #include <tinyexr.h>
 #include <ntc-utils/Manifest.h>
 
-static tf::Executor g_Executor;
+static donut::engine::ThreadPool g_ThreadPool;
 
 static const BcFormatDefinition c_BlockCompressedFormats[] = {
     { ntc::BlockCompressedFormat::BC1, DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB, nvrhi::Format::BC1_UNORM,    8, 4 },
@@ -139,12 +139,12 @@ bool SavePNG(uint8_t* data, int mipWidth, int mipHeight, int numChannels, bool i
 
 void StartAsyncTask(std::function<void()> function)
 {
-    g_Executor.async(function);
+    g_ThreadPool.AddTask(function);
 }
 
 void WaitForAllTasks()
 {
-    g_Executor.wait_for_all();
+    g_ThreadPool.WaitForTasks();
 }
 
 std::optional<ImageContainer> ParseImageContainer(char const* container)
diff --git a/tools/explorer/NtcExplorer.cpp b/tools/explorer/NtcExplorer.cpp
