Add BCn encoders/decoders with RDO support - #1167
Conversation
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
*Add encode/decode tests (that use both CompressBCn/DecodeBCn) *Add BCn ktx2 test files (transcoded from tests/resources/ktx2/color_grid_uastc_zstd_5.ktx2) *Cleanup BCn test fixtures *Remove `std::cout` statement Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
|
There are also a lot of compiler warnings from bc7enc_rdo dependency. These should be straightforward to address directly in copied files from bc7enc_rdo. |
*Add BC1, BC3, BC4, BC5, and BC7 encoding support to "ktx encode" command. *Cleanup ktxBCnParams and add BC1/BC3 quality and mode params. *Add docstrings/documentation to newly added enums/structs in ktx.h. Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
|
@walcht, Thank you for this. Can you view the build logs? One issue I notice immediately is that there are no changes to Regarding RDO and multi-threading, the UASTC encoder also has separate multi-threading options for the encoder and for the RDO step. You can follow the same model. If we need to fix warnings in the encoder I suggest forking the encoder then incorporating the fork here by way of Re. SIMD and ISPC, be careful how you support this. We need to support building and running on arm64 processors. Also compile flags to enable SSE or other SIMD options are not compatible with straightforward use of universal build tool chains, which is why this project does not do universal builds. Better is use of compiler pre-defined macros and run-time queries to discover what the software is being compiled for and running on. However since we aren't doing universal builds there is no need to obsess over this last detail. |
|
@MarkCallow - Concerning the Concerning the build/CI logs: they are mostly failing because of bc7enc_rdo compiler warnings which should be suppressed. They will also fail because I haven't re-generated the golden files yet for ktx CTS (e.g.,
Please do so (as far as I understood, this will be forked under the KhronosGroup and any updates here will be pushed there via the Concerning SIMD and ISPC: I think it makes sense to leave this for another PR, do you agree? (reasoning is this: I have to get the basics working properly, add proper testsuite that covers all supported BCn formats, etc. Once that is done, I can open another PR for SIMD performance improvements). Or I will leave this to very end (last in TODO list above). |
*Suppress bc7enc_rdo warnings like unused-variables, memset'ing a non-trivial class (in this case the class is obviously trivial hence a void* cast is used to suppress this warning). Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
*Some CIs report further unused variables/functions that are not reported when building locally. Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
|
Updates about CI jobs:
|
|
You will need to rebase to or merge current main to get the fix for the NSIS issue on Windows. I have created a fork of https://github.com/richgel999/bc7enc_rdo. To incorporate it in your add-BCn-decoder branch do the following in the repo root directory: You can make changes in this subdirectory, as you are now, and when everything is working I can push the changes to the fork.
I agree. I wanted to make you aware that arm64 is a build target. Re. reuse, you have to add an entry to REUSE.toml to get external/bc7enc_rdo ignored. It is better to do that than add SPDX comments to all the files. The entry in REUSE.toml will have to mention a license. Use the MIT license option. Here are a few high level points.
|
|
Re the macOS build failure, because the output from the Xcode build is so voluminous it is run through a script, xcpretty, to prettify it. On a past CI service, without this, the logs exceeded the maximum allowed. Recently, for reasons I have yet to investigate, it has started swallowing compile errors. You can turn it off by editing scripts/install_macos.sh and commenting out the line that installs |
*Add BCn encoder support for `ktx create` command. *Add missing tests for `ktx encode`, `ktx extract`, and `ktx create`. *Expose BC1/BC3 approximation mode option to ktx CLIs *Misc cleanups (still early-stage PR) Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
Agree. I wasn't initially aware of this. Apparently bc7f is significantly faster that the bc7 encoder used here (also the added benefit of being continuously maintained). I will integrate this right now since this seems to be straightforward (bc7enc_rdo also seems a bit not-longer-maintained so l think it's better to just integrate it now rather than waiting for it to be integrated into bc7enc_rdo repo). Concerning the decoding API: I added BCn decoders for VkUpload/GLUpload as a TODO (will follow same API as in etcunpack). Might also open a PR to add it for ASTC since I have already spent some time getting familiar with this code base.
Will add it in this PR. Will add it at the very end though since I have to finalize current formats.
I will try to address CI issues now (It is fine if I incrementally commit here to see if certain jobs pass?). |
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
…Group/bc7enc_rdo.git external/bc7enc_rdo subrepo: subdir: "external/bc7enc_rdo" merged: "dbe416d2" upstream: origin: "https://github.com/KhronosGroup/bc7enc_rdo.git" branch: "changes_for_ktx" commit: "dbe416d2" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "5e0f401"
*Before this commit, bc7enc_rdo dependency was manually copied to external/bc7enc_rdo directory (only needed files were copied). This was not ideal for a lot of reasons (mainly that we are introducing changes that may be streamed back to the original repo and having a subrepo/submodule is better suited for that than manually copying dependency files). *Add bc7enc_rdo to REUSE.toml with MIT license. *Git ignore compile_commands.json file (used by clangd LSP) Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
|
The integrated basisu_transcoder is a bit outdated (actually, significantly) and doesn't contain |
|
I was not aware that bc7f is included in basisu_transcoder. By pure coincidence I have just completed integration of Basis Universal release 2.1.0. See the Neither the KTX-Software code nor our golden files required any updates for our extensive test suite to pass with BU 2.1.0. I am therefore amenable to merging it now but will have to discuss within the Khronos WG and can't make any promises. The single image decoders used by GLUpload/VkUpload should be exposed in the library API but must be independent of the ktxTexture* classes. Software reading a KTX file incrementally will find them useful. Regarding the current ETC decoder, please note that it does not have a recognized open source license so might not be suitable for your OIIO work. |
*Add initial RDO post processing step for BC1, BC3, and BC7 but without ultrasmooth blocks support see: https://richg42.blogspot.com/2021/02/updated-bc7encrdo-with-improved-smooth.html *Fix encoder in case input texture does not have multiple-of-4 dimensions. This was reading beyond std::vector size before this commit. *Add initial RDO params to BCnParams with verbose explanation/description comments. *Misc refactoring/adjustments. Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
|
@MarkCallow - please don't approve the CI workflow yet (it will fail because I haven't updated the golden test files yet).
Will add bc7f once I finish RDO post processing. |
|
I have just merged PR #1170 so you will now find bc7f in One other thing re. |
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
…//github.com/walcht/bc7enc_rdo.git external/bc7enc_rdo/ subrepo: subdir: "external/bc7enc_rdo" merged: "2268ddf" upstream: origin: "https://github.com/walcht/bc7enc_rdo.git" branch: "restructure-for-bcn-encoder-decoder" commit: "2268ddf" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "5e0f401"
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
* GIMP only supports exporting to UNORM DDS. Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
|
I added I added BC2 decoder tests (which were missing) and fixed some comments. The CI fails because I removed (by mistake why merging with main) the |
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
* Prior to this commit, it was wrongly assumed that RDO only works on sRGB inputs (i.e., produces wrong results for UNORM inputs). That assumption is incorrect and RDO is simply not-sRGB aware nor is it aware of any other colorspace (the error metric is simply MSE). Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
You mean if unnormalized vectors are given in 3 component input and --normal-mode is used then we normalize them before before applying BC5 (then as usual in shader the Z component is easily computed from X and Y). I think I might be misunderstanding your request here (I'm not too versed in normal mapping/non-color compression).
I have verified and there are no explicit normal-map mode (or non-color data) parameters. I'm almost certain the all encoders don't have special parameters for normal maps encoding. Encoding normal maps (or any non-color data) using BC1/BC2/BC3 or BC7 is either way a bad idea (more artifacts, RGB are not separated, etc.). |
From ktx create documentation for
3-component normals are assumed to be normalized. If the user thinks they are not, he or she should use
The bit in parentheses describes treatment for 4-component compressed formats. For BC5 I think it is common to put X in the R component and Y in the G component but I am not certain. Specifying
This is the main reason for |
|
Thank you for the detailed explanation. This phrase explains everything for me I was finishing my guide about using BCn within KTX and now it is finalized (there are probably typos + minor fixes here and there). It is significantly much better now with better comparisons, PSNR metrics (albeit that metric is not that good, I believe), more comparisons for more parametes/knobs, etc: https://walcht.github.io/walcht/guides/ktx-bcn-playground.html Feel free to copy this as a new Wiki page here if you want (it is set under MIT license). Now what remains: --normal-mode (fairly straightforward) and usage documentation example. |
* add missing ktxTexture2 pointer initialization (causes memory leak in case of texture creation failure). * fix smooth block filtering debug images Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
Signed-off-by: Walid Chtioui <walid.chtioui.main@gmail.com>
I am far from knowing enough of the ins and outs of the various BCn formats to be able to judge if this is worthwhile. It may well be sufficient just to require I am looking forward to reading your guide about using BCn. |
|
Binomial have announced v2.5 of Basis Universal. I believe this includes the bc7g encoder. At some point we will likely update our basis_universal subrepo clone to 2.5. Please take a look and estimate the size of the job of updating this BCn encoder to bc7g. I do not plan to update basis_universal before this PR is released. |
|
Please hold off any more commits until I finish reviewing the latest code. When I'm done you'll see the review here. |
I cloned the basis repo and searched for bc7g and I couldn't find anything. If it is added (or will be added), integrating it in this PR (or after) is almost certainly straightforward (some BC7-specific params might change, I think). There is a mention of bc7e which is (probably?) Intel-based ISPC. Will look more into this. Is there a
I can't confidently answer this (my general knowledge of graphics and hardware support is average at best). I know that on all desktops I did graphics on, BC5 was always supported. E.g., to quote the Unity Engine's documentation I think we should add |
I thought I saw mention in one of the announcements. I could be wrong. Release notes are reportedly at https://github.com/BinomialLLC/basis_universal/wiki/Release-Notes. |
|
Before I forget, I want to fix UASTC multi-threaded RDO in the same way you fixed the bc7 RDO. Have you done that yet? If not, it's fine to later. It should be a separate PR from this. |
|
I haven't touched the UASTC multi-threading RDO yet (because, as you stated, I wanted it to be a separate PR). I will fix it in another PR (I think it should be straigh-forward; it's all about how work is dispatched to threads). |
MarkCallow
left a comment
There was a problem hiding this comment.
37 comments including some change requests. I have now reviewed everything to date.
Thanks for this impressive effort on this codec.
| * Not enough memory to carry out decoding. | ||
| * Not enough memory to carry out decoding. | ||
| * @exception KTX_UNSUPPORTED_FEATURE | ||
| * Unsupported supercompression scheme. |
There was a problem hiding this comment.
Only two schemes are valid for BCn: zlib or zstd. Both are supported in libktx. Anything else is handled by the FILE_DATA_ERROR above. When could this error happen?
| option( LIBKTX_FEATURE_VK_UPLOAD "Enable Vulkan texture upload." ON ) | ||
| option( LIBKTX_FEATURE_GL_UPLOAD "Enable OpenGL texture upload." ON ) | ||
| option( LIBKTX_FEATURE_ETC_UNPACK "ETC decoding support." ON ) | ||
| option( LIBKTX_FEATURE_BCN_DECODER "BCn decoding support." ON ) |
There was a problem hiding this comment.
As long as it is done before this is released, another PR is okay.
As for how the library is expected to be used, my preference is to provide a consistent set of functionality in the library. The ETC_UNPACK option was put in primarily because of pushback about the weird license for the ETC unpacker.
| // Allowed formats | ||
| break; | ||
| default: | ||
| fatal_usage("Only RGB16 SFLOAT can be encoded to BC6HU, but format is {}.", |
There was a problem hiding this comment.
Probably should allow R16G16B16A16 input as well, dropping the A. Doesn't the BC6H encoder already support that?
|
Thank you for the detailed review (I will push the commits that address this probably tomorrow). There is a very important note:
I really thought, initially, that I should do this (after all, almost always when one reads sRGB, it should be converted to linear, do math, then convert back). The thing is, the original repo |
The key parameter in basis_universal is called There are two other Basis compress parameters with |
|
Update on this:
I spent some hours understanding the RDO code and apparently I was initially wrong about this being fixed and I think there is just no way to make multi-threaded RDO deterministic (i.e., running ST vs. MT yields same results). Why? Because running RDO on the whole image (single-threaded mode) means that each block N depends on previously RDO'ed M blocks (with M influenced by the window/dict size). In MT mode, image is divided into regions (one region per thread) and RDO is ran on these separately. I'm currently updating my guide, the no-multithreading parameter description, and a bunch of other things to reflect this. I also see that a lot of improvements can be done on the RDO function but I will postpone these to after when this PR gets merged. If you want, I can open a PR to add a comment and documentation about this with UASTC RDO (or any other RDO that is used). |
|
Thank you for your study.
The problem we originally observed was that the MT results were non-deterministic between runs. It wasn't investigated; there is still an open issue on the basis_universal repo. Do you think with the changes you have made MT will at least be deterministic between runs? We can certainly live with ST and MT giving different results provided we explain it in the docs. An obvious question is which produces the result with the least entropy (i.e. which will deflate best with zstd): ST or MT? Is the dictionary shared between the threads and would that affect the result.
Sounds good. When you have time, please give me a summary of the possible improvements.
That will be terrific. I'd like to get this in for v5.0.0. It would have to cover BasisLZ, UASTC LDR 4x4 and UASTC HDR 6x6 Intermediate. |
I just couldn't figure out how to make Doxygen generate a reference inside a C-code comment that is isn't supposed to consume... |
This is a markdown page being processed by Doxygen. According to https://www.doxygen.nl/manual/markdown.html to link a documented entity you can use |
As discussed in #1159:
ktxTexture2_CompressBCnandktxTexture2_DecodeBCnare introduced in this PR to allow libktx users/consumers to encode/decode BCn textures from/to raw decompressed formats.https://github.com/richgel999/bc7enc_rdo does not support BC6HU/BC6HS encoding/decoding and also no BC2 (this format is essentially dead since BC3 replaces it).
Please feel free to give feedback, edit, and nitpick as much as possible.
Some context: I am adding KTX2 support to OIIO (PR: AcademySoftwareFoundation/OpenImageIO#5185) and having libktx encode/decode BCn formats significantly simplifies things (also ETC encoding/decoding which I can also open a PR for - if approved).
I haven't updated the KTX-Software-CTS with the added BCn test files.
Once this is finalized, this will fix #587.
Current TODOs:
[x] BC2 mode RDOBC2 is rarely used (I don't see any reason why to use it instead of BC3). Postponed or not planned to be implemented at all.BC6H mode RDO (HDR). I don't know if this is possible. If not, then I will not adjust the ert::reduce_entropy function for the moment.postponed (too much work/overload to include in this PR).ktx encodecommandktx extractcommandktx createcommandktxBCnParamsstruct (apparently there are many and I am not qualified to know which subset to expose or to expose them all). For the moment I will just expose them all.We agreed on using same parameters as UASTC RDO and adding additional ones if they make sense (I haven't benchmarked skip 0 MSE error option so I might remove it if it useless).
enable SIMD acceleration for BC7 encoder (using ISPC - see https://github.com/ispc/ispc) (this should be straightforward and should be enabled by default via a CMake flag; e.g., BC7_SIMD).=> since we are planning to use bc7f we will be planning to use bc7g once it is released (this is the SIMD equivalent of bc7f).LIBKTX_FEATURE_BCN_DECODERCMake flag optioncopied from MIT Licensed https://github.com/iOrange/bcdecfrom basisu)[x] add BC2 encoderpostponed/aborted (rarely used).--bcn-rdoparam.Note1: no LLMs/AI coding tools were used in any capacity whatsoever in writing or aiding in the writing of this PR.
Note2: I am an individual contributor (main reason I am contributing here is to add support for KTX2 in Blender).
Edit: TODO list edits