Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement the extended scope and further improvements for ktxtools #722

Merged
merged 3 commits into from
Jul 1, 2023

Conversation

VaderDev
Copy link
Contributor

@VaderDev VaderDev commented Jun 23, 2023

This PR completes the original and the extended scope of ktxtools. Some of the scope was already part of the previous PRs.

Briefs:

  • tools: Implement stdout support
  • tools: Implement stdin support
  • tools: Implement 4:2:2 support
  • tools: Implement support for 10X6 and 10X4 formats
  • tools: Implement support for B10G11R11_UFLOAT and E5B9G9R9_UFLOAT formats
  • tools: Complete support for Depth-Stencil formats
  • tools: Improvements, cleanup and bug fixes
  • extract: Implement fragment URI support
  • extract: Implement 4:2:2 sub-sampling
  • validate: Fix and extend padding byte validation checks
  • cts: Add support for stdin/stdout test cases (including binary IO)
  • cts: Add tests to cover new features and capabilities
  • cts: Extend existing tests to improve coverage
  • cts: Test runner now deletes matching output files (this enables easy packaging of mismatching files)
  • cts: Added a new cli arg to the runner script: --keep-matching-outputs to prevent the deletion of matching output files
  • dfdUtils: Implement 4:2:2 support
  • dfdUtils: Implement support for 10X6 and 10X4 formats
  • imageio: Fix stdin support
  • ktx: Add stringToVkFormat to mkvkformatfiles
  • ktx: Implement 3D BC support (ASTC 3D Blocks)
  • ktx: Implement 4:2:2 support
  • ktx: Complete support for Depth-Stencil formats
  • ktx: Improve interpretDFD
  • ktx: Improvements, cleanup and bug fixes
  • cmake: Add CMake generator expression for output directory on Mac

Please complete the final review of this scope including the CTS.

@VaderDev VaderDev self-assigned this Jun 23, 2023
Copy link
Collaborator

@MarkCallow MarkCallow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I have several questions. A couple may result in you making code changes.

While reviewing this I spotted another feature of toktx that has not been brought forward to the new tools.

infiles prefixed with '@' are read as text files
listing actual file names to process with one file path per line. Paths
must be absolute or relative to the current directory when toktx is run.
If '@@' is used instead, paths must be absolute or relative to the location
of the list file.

Let's see if we get complaints from early users. When I added this to toktx it was not very difficult so I may try to add it myself, at some point in the future, with tests of course.

tools/imageio/imageinput.cc Show resolved Hide resolved
tools/ktx/CMakeLists.txt Show resolved Hide resolved
tools/ktx/command.cpp Show resolved Hide resolved
tests/unittests/test_fragment_uri.cc Outdated Show resolved Hide resolved
tools/ktx/command.h Show resolved Hide resolved
tools/ktx/command_extract.cpp Show resolved Hide resolved
tools/ktx/command.h Outdated Show resolved Hide resolved
@MarkCallow MarkCallow merged commit 2189c54 into KhronosGroup:main Jul 1, 2023
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 21, 2024
…hronosGroup#722)

- tools: Implement stdout support
- tools: Implement stdin support
- tools: Implement 4:2:2 support
- tools: Implement support for 10X6 and 10X4 formats
- tools: Implement support for B10G11R11_UFLOAT and E5B9G9R9_UFLOAT formats
- tools: Complete support for Depth-Stencil formats
- tools: Improvements, cleanup and bug fixes
- extract: Implement fragment URI support
- extract: Implement 4:2:2 sub-sampling
- validate: Fix and extend padding byte validation checks
- cts: Add support for stdin/stdout test cases (including binary IO)
- cts: Add tests to cover new features and capabilities
- cts: Extend existing tests to improve coverage
- cts: Test runner now deletes matching output files (this enables easy packaging of mismatching files)
- cts: Added a new cli arg to the runner script: --keep-matching-outputs to prevent the deletion of matching output files
- dfdUtils: Implement 4:2:2 support
- dfdUtils: Implement support for 10X6 and 10X4 formats
- imageio: Fix stdin support
- ktx: Add stringToVkFormat to mkvkformatfiles
- ktx: Implement 3D BC support (ASTC 3D Blocks)
- ktx: Implement 4:2:2 support
- ktx: Complete support for Depth-Stencil formats
- ktx: Improve interpretDFD
- ktx: Improvements, cleanup and bug fixes
- cmake: Add CMake generator expression for output directory on Mac
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
…hronosGroup#722)

- tools: Implement stdout support
- tools: Implement stdin support
- tools: Implement 4:2:2 support
- tools: Implement support for 10X6 and 10X4 formats
- tools: Implement support for B10G11R11_UFLOAT and E5B9G9R9_UFLOAT formats
- tools: Complete support for Depth-Stencil formats
- tools: Improvements, cleanup and bug fixes
- extract: Implement fragment URI support
- extract: Implement 4:2:2 sub-sampling
- validate: Fix and extend padding byte validation checks
- cts: Add support for stdin/stdout test cases (including binary IO)
- cts: Add tests to cover new features and capabilities
- cts: Extend existing tests to improve coverage
- cts: Test runner now deletes matching output files (this enables easy packaging of mismatching files)
- cts: Added a new cli arg to the runner script: --keep-matching-outputs to prevent the deletion of matching output files
- dfdUtils: Implement 4:2:2 support
- dfdUtils: Implement support for 10X6 and 10X4 formats
- imageio: Fix stdin support
- ktx: Add stringToVkFormat to mkvkformatfiles
- ktx: Implement 3D BC support (ASTC 3D Blocks)
- ktx: Implement 4:2:2 support
- ktx: Complete support for Depth-Stencil formats
- ktx: Improve interpretDFD
- ktx: Improvements, cleanup and bug fixes
- cmake: Add CMake generator expression for output directory on Mac
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
…hronosGroup#722)

- tools: Implement stdout support
- tools: Implement stdin support
- tools: Implement 4:2:2 support
- tools: Implement support for 10X6 and 10X4 formats
- tools: Implement support for B10G11R11_UFLOAT and E5B9G9R9_UFLOAT formats
- tools: Complete support for Depth-Stencil formats
- tools: Improvements, cleanup and bug fixes
- extract: Implement fragment URI support
- extract: Implement 4:2:2 sub-sampling
- validate: Fix and extend padding byte validation checks
- cts: Add support for stdin/stdout test cases (including binary IO)
- cts: Add tests to cover new features and capabilities
- cts: Extend existing tests to improve coverage
- cts: Test runner now deletes matching output files (this enables easy packaging of mismatching files)
- cts: Added a new cli arg to the runner script: --keep-matching-outputs to prevent the deletion of matching output files
- dfdUtils: Implement 4:2:2 support
- dfdUtils: Implement support for 10X6 and 10X4 formats
- imageio: Fix stdin support
- ktx: Add stringToVkFormat to mkvkformatfiles
- ktx: Implement 3D BC support (ASTC 3D Blocks)
- ktx: Implement 4:2:2 support
- ktx: Complete support for Depth-Stencil formats
- ktx: Improve interpretDFD
- ktx: Improvements, cleanup and bug fixes
- cmake: Add CMake generator expression for output directory on Mac
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
…hronosGroup#722)

- tools: Implement stdout support
- tools: Implement stdin support
- tools: Implement 4:2:2 support
- tools: Implement support for 10X6 and 10X4 formats
- tools: Implement support for B10G11R11_UFLOAT and E5B9G9R9_UFLOAT formats
- tools: Complete support for Depth-Stencil formats
- tools: Improvements, cleanup and bug fixes
- extract: Implement fragment URI support
- extract: Implement 4:2:2 sub-sampling
- validate: Fix and extend padding byte validation checks
- cts: Add support for stdin/stdout test cases (including binary IO)
- cts: Add tests to cover new features and capabilities
- cts: Extend existing tests to improve coverage
- cts: Test runner now deletes matching output files (this enables easy packaging of mismatching files)
- cts: Added a new cli arg to the runner script: --keep-matching-outputs to prevent the deletion of matching output files
- dfdUtils: Implement 4:2:2 support
- dfdUtils: Implement support for 10X6 and 10X4 formats
- imageio: Fix stdin support
- ktx: Add stringToVkFormat to mkvkformatfiles
- ktx: Implement 3D BC support (ASTC 3D Blocks)
- ktx: Implement 4:2:2 support
- ktx: Complete support for Depth-Stencil formats
- ktx: Improve interpretDFD
- ktx: Improvements, cleanup and bug fixes
- cmake: Add CMake generator expression for output directory on Mac
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
…hronosGroup#722)

- tools: Implement stdout support
- tools: Implement stdin support
- tools: Implement 4:2:2 support
- tools: Implement support for 10X6 and 10X4 formats
- tools: Implement support for B10G11R11_UFLOAT and E5B9G9R9_UFLOAT formats
- tools: Complete support for Depth-Stencil formats
- tools: Improvements, cleanup and bug fixes
- extract: Implement fragment URI support
- extract: Implement 4:2:2 sub-sampling
- validate: Fix and extend padding byte validation checks
- cts: Add support for stdin/stdout test cases (including binary IO)
- cts: Add tests to cover new features and capabilities
- cts: Extend existing tests to improve coverage
- cts: Test runner now deletes matching output files (this enables easy packaging of mismatching files)
- cts: Added a new cli arg to the runner script: --keep-matching-outputs to prevent the deletion of matching output files
- dfdUtils: Implement 4:2:2 support
- dfdUtils: Implement support for 10X6 and 10X4 formats
- imageio: Fix stdin support
- ktx: Add stringToVkFormat to mkvkformatfiles
- ktx: Implement 3D BC support (ASTC 3D Blocks)
- ktx: Implement 4:2:2 support
- ktx: Complete support for Depth-Stencil formats
- ktx: Improve interpretDFD
- ktx: Improvements, cleanup and bug fixes
- cmake: Add CMake generator expression for output directory on Mac
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants