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.

Sign up for GitHub

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

Jump to bottom

Add option to enable mkvk targets (VkFormat-related file generation). #840

Merged
merged 32 commits into from
Jan 19, 2024
Merged

Add option to enable mkvk targets (VkFormat-related file generation). #840

merged 32 commits into from
Jan 19, 2024

Conversation

MarkCallow
Copy link
Collaborator

The option defaults to OFF. Only project developers need to regenerate these files.

Fixes #834.

Other included related fixes:

  • Modify mkvkformatfiles to write CRLF on Windows.
  • Stop using unix2dos in mkvk custom commands and remove near
    duplicate WIN32 custom commands. Developers must ensure they
    use a Windows native Perl to get the correct line endings when
    generating dfdutils' *.inl files.
  • Generate dfdutils .inl files from vulkan_core not vkformat_enum
    to remove dependency on the latter's generation.
  • Add CI jobs to test generation on all platforms since main builds
    will no longer be building those targets.

Unrelated fixes:

  • Set HOMEBREW_NO_AUTO_UPDATE for macOS Travis CI jobs
    to finally stop the auto update and shave more than 1 hour off the
    total build time.
  • Bracket the whole script section of .travis.yml with set -e and set +e
    instead of piecemeal in various if clauses.

@MarkCallow
Don't include mkvk targets unless option is set.
48f968e 
* Modify mkvkformatfiles to write CRLF on Windows.
* Stop using unix2dos in mkvk custom commands.
* Generate dfdutils .inl files from vulkan_core not vkformat_enum
  to remove dependency on the latter's generation.
@MarkCallow
Remove near duplicate WIN32 custom commands.
3141cd3
@MarkCallow
Use Vulkan_INCLUDE_DIR passed to mkvkformatfiles.
4da4592
@MarkCallow
Add comments
2c9a712 
re clean side-effects and requiring packages.
@MarkCallow
Work around limitations of CMake command quoting.
81e7eb5
@MarkCallow
Don't attempt to use Git4Windows Perl.
6ad14fa
@MarkCallow
Add jobs to test mkvk scripts.
0eeea47
@MarkCallow
Do not run install when only testing mkvk.
ec05e9f
@MarkCallow
Fix typo.
b809561
@MarkCallow
Remove extra "cmake".
dc6a4b8
@MarkCallow
Turn on KTX_GENERATE_VK_FILES.
8068210
@MarkCallow
Add -e to mkvk test. Move macOS job as a test.
1ff15ff
@MarkCallow
Test without CHECK_MKVK=ONLY job. Add debug for mkvk check run.
e60eea0
@MarkCallow
Uncomment 2nd macOS config.
bf022a8
@MarkCallow
More debugging for mkvk check. Comment out all macOS jobs.
da7a497
@MarkCallow
More debugging.
ee6663a
@MarkCallow
Use git diff-index instead of git diff.
ed6da1f
@MarkCallow
Add script for checking mkvk.
394eb46
@MarkCallow
Move check_mkvk to a script.
745bdb5
@MarkCallow
Enable -e.
907d238
@MarkCallow
Bracket whole script with +-e. Remove debug messages.
929c277
@MarkCallow
Do --clean-first to force generating all files.
877c6ff
@MarkCallow
Comment out MKVK env setting for debug.
ed3cd67
@MarkCallow
Renable CHECK_MKVK in global environment.
a9d5ca0
@MarkCallow
Renable CHECK_MKVK job.
100b340
@MarkCallow
Renable the remaining macOS jobs.
40944e5
@MarkCallow
Try setting HOMEBREW_NO_AUTO_UPDATE.
d90fcb1
@MarkCallow
Don't run install_macos when doing CHECK_MKVK.
ea1777d
@MarkCallow
Fix syntax error.
2f16aa1
@MarkCallow
Add mkvk check to Windows CI.
6f2a25a
@MarkCallow MarkCallow merged commit e77a531 into main Jan 19, 2024
29 checks passed
@MarkCallow MarkCallow deleted the issue834 branch January 19, 2024 01:22
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 21, 2024
@MarkCallow
Add option to enable mkvk targets (VkFormat-related file generation). (…
26108f9 
…KhronosGroup#840)

The option defaults to OFF. Only project developers need to regenerate
these files.

Fixes KhronosGroup#834.

Other included related fixes:
* Modify mkvkformatfiles to write CRLF on Windows.
* Stop using unix2dos in mkvk custom commands and remove near
  duplicate WIN32 custom commands. Developers must ensure they
  use a Windows native Perl to get the correct line endings when
  generating dfdutils' `*.inl` files.
* Generate dfdutils .inl files from vulkan_core not vkformat_enum
  to remove dependency on the latter's generation.
* Add CI jobs to test generation on all platforms since main builds
  will no longer be building those targets.

Unrelated fixes:
* Set `HOMEBREW_NO_AUTO_UPDATE` for macOS Travis CI jobs
  to finally stop the auto update and shave more than 1 hour off the
  total build time.
* Bracket the whole `script` section of `.travis.yml` with `set -e` and
`set +e`
  instead of piecemeal in various `if` clauses.
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
@MarkCallow
Add option to enable mkvk targets (VkFormat-related file generation). (…
4b7ef6a 
…KhronosGroup#840)

The option defaults to OFF. Only project developers need to regenerate
these files.

Fixes KhronosGroup#834.

Other included related fixes:
* Modify mkvkformatfiles to write CRLF on Windows.
* Stop using unix2dos in mkvk custom commands and remove near
  duplicate WIN32 custom commands. Developers must ensure they
  use a Windows native Perl to get the correct line endings when
  generating dfdutils' `*.inl` files.
* Generate dfdutils .inl files from vulkan_core not vkformat_enum
  to remove dependency on the latter's generation.
* Add CI jobs to test generation on all platforms since main builds
  will no longer be building those targets.

Unrelated fixes:
* Set `HOMEBREW_NO_AUTO_UPDATE` for macOS Travis CI jobs
  to finally stop the auto update and shave more than 1 hour off the
  total build time.
* Bracket the whole `script` section of `.travis.yml` with `set -e` and
`set +e`
  instead of piecemeal in various `if` clauses.
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
@MarkCallow
Add option to enable mkvk targets (VkFormat-related file generation). (…
6a6f467 
…KhronosGroup#840)

The option defaults to OFF. Only project developers need to regenerate
these files.

Fixes KhronosGroup#834.

Other included related fixes:
* Modify mkvkformatfiles to write CRLF on Windows.
* Stop using unix2dos in mkvk custom commands and remove near
  duplicate WIN32 custom commands. Developers must ensure they
  use a Windows native Perl to get the correct line endings when
  generating dfdutils' `*.inl` files.
* Generate dfdutils .inl files from vulkan_core not vkformat_enum
  to remove dependency on the latter's generation.
* Add CI jobs to test generation on all platforms since main builds
  will no longer be building those targets.

Unrelated fixes:
* Set `HOMEBREW_NO_AUTO_UPDATE` for macOS Travis CI jobs
  to finally stop the auto update and shave more than 1 hour off the
  total build time.
* Bracket the whole `script` section of `.travis.yml` with `set -e` and
`set +e`
  instead of piecemeal in various `if` clauses.
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
@MarkCallow
Add option to enable mkvk targets (VkFormat-related file generation). (…
78e5069 
…KhronosGroup#840)

The option defaults to OFF. Only project developers need to regenerate
these files.

Fixes KhronosGroup#834.

Other included related fixes:
* Modify mkvkformatfiles to write CRLF on Windows.
* Stop using unix2dos in mkvk custom commands and remove near
  duplicate WIN32 custom commands. Developers must ensure they
  use a Windows native Perl to get the correct line endings when
  generating dfdutils' `*.inl` files.
* Generate dfdutils .inl files from vulkan_core not vkformat_enum
  to remove dependency on the latter's generation.
* Add CI jobs to test generation on all platforms since main builds
  will no longer be building those targets.

Unrelated fixes:
* Set `HOMEBREW_NO_AUTO_UPDATE` for macOS Travis CI jobs
  to finally stop the auto update and shave more than 1 hour off the
  total build time.
* Bracket the whole `script` section of `.travis.yml` with `set -e` and
`set +e`
  instead of piecemeal in various `if` clauses.
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
@MarkCallow
Add option to enable mkvk targets (VkFormat-related file generation). (…
72cdc7b 
…KhronosGroup#840)

The option defaults to OFF. Only project developers need to regenerate
these files.

Fixes KhronosGroup#834.

Other included related fixes:
* Modify mkvkformatfiles to write CRLF on Windows.
* Stop using unix2dos in mkvk custom commands and remove near
  duplicate WIN32 custom commands. Developers must ensure they
  use a Windows native Perl to get the correct line endings when
  generating dfdutils' `*.inl` files.
* Generate dfdutils .inl files from vulkan_core not vkformat_enum
  to remove dependency on the latter's generation.
* Add CI jobs to test generation on all platforms since main builds
  will no longer be building those targets.

Unrelated fixes:
* Set `HOMEBREW_NO_AUTO_UPDATE` for macOS Travis CI jobs
  to finally stop the auto update and shave more than 1 hour off the
  total build time.
* Bracket the whole `script` section of `.travis.yml` with `set -e` and
`set +e`
  instead of piecemeal in various `if` clauses.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

When compiling under Windows, it prompts unix2dos: command not found.
1 participant
@MarkCallow