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

Allow A8B8G8R8 formats. #861

Merged
merged 23 commits into from
Feb 24, 2024
Merged

Allow A8B8G8R8 formats. #861

merged 23 commits into from
Feb 24, 2024

Conversation

MarkCallow
Copy link
Collaborator

@MarkCallow MarkCallow commented Feb 14, 2024

Fixes issue #860.

Updates the switches used by the the GL loader to those generated by generate_format_switches.rb in the KTX-Specification repo as a way to get them updated for these and some other recently added Vulkan formats. The glloader now loads the newly allowed formats.

VkFormat declarations for Java and Python are now generated by mkvkformatfiles which has been moved to ci_scripts since it now generates files outside the lib directory. The alternative was to hand edit these files to add the newly allowed formats.

CI testing of vkformat-related file generation (mkvk) has been moved to a dedicated GitHub workflow and removed from the main CI builds. This is because testing now requires a clone of the KTX-Specification repo.

The change to createdfd.c is to remove a duplicated line of code and is unrelated to the purpose of this PR.

KhronosGroup/KTX-Software-CTS#19 removes the tests for these as prohibited and adds new tests for the formats.

@MarkCallow MarkCallow linked an issue Feb 17, 2024 that may be closed by this pull request
@MarkCallow MarkCallow marked this pull request as draft February 17, 2024 03:54
Switches are generated by the KTX-Specification's
generate_format_switches.rb. This is instead of updating
the existing switches manually with newly allowed formats.
Add new workflow file to test build this target and remove mkvk
checks from windows.yml and .travis.yml due to mkvk now needing
a clone of the KTX-Specification repo.
Has been done by generating the source files from mkvkformatfiles
which has been moved to ci_scripts as it no longer generates files
just in the lib directory. Due to this vkformat_list.inl has been
moved to tests/unittests which is where it is used.
@MarkCallow MarkCallow marked this pull request as ready for review February 22, 2024 11:42
@MarkCallow
Copy link
Collaborator Author

Please review soon. I want to get this merged.

Copy link
Collaborator

@aqnuep aqnuep left a comment

Choose a reason for hiding this comment

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

The changes look reasonable.

@MarkCallow MarkCallow merged commit 5ac5cf1 into main Feb 24, 2024
18 checks passed
@MarkCallow MarkCallow deleted the issue860 branch February 24, 2024 00:00
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 26, 2024
Fixes issue KhronosGroup#860.

Updates the switches used by the the GL loader to those generated by
`generate_format_switches.rb` in the KTX-Specification repo as a way to
get them updated for these and some other recently added Vulkan formats.
The glloader now loads the newly allowed formats.

VkFormat declarations for Java and Python are now generated by
`mkvkformatfiles` which has been moved to ci_scripts since it now
generates files outside the `lib` directory. The unattractive alternative
was to hand edit these files to add the newly allowed formats.

CI testing of vkformat-related file generation (`mkvk`) has been moved
to a dedicated GitHub workflow and removed from the main CI builds. This
is because testing now requires a clone of the KTX-Specification repo due
to the use of `generate_format_switches.rb`.

The change to `createdfd.c` is to remove a duplicated line of code and
is unrelated to the purpose of this PR.

KhronosGroup/KTX-Software-CTS#19 removes the
tests for these as prohibited and adds new tests for the formats.
@javagl javagl mentioned this pull request Sep 10, 2024
9 tasks
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.

Allow A8B8G8R8 PACK32 formats
2 participants