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

Update dfdutils-included vulkan_core.h. #783

Merged
merged 16 commits into from
Oct 27, 2023
Merged

Update dfdutils-included vulkan_core.h. #783

merged 16 commits into from
Oct 27, 2023

Conversation

MarkCallow
Copy link
Collaborator

@MarkCallow MarkCallow commented Oct 13, 2023

ASTC HDR and A4B4G4R4_UNORM formats are now core. Update all code to use the non _EXT names.

Add instructions and a script for regnerating vulkan_core.h.

@MarkCallow
Copy link
Collaborator Author

@aqnuep here is the updated Vulkan header. Some of the new tools tests are failing. I can't do any more tonight so I have pushed the branch and made a PR. I wanted to make this a work-in-progress PR but can't find the relevant control.

The test failures are most likely due to output strings. The ASTC HDR extension has become part of Vulkan core so there are now enums without the trailing _EXT in the name. This PR changes all the code to use the undecorated enums. I did not re-build the CTS tests as I have no time left.

Hope this helps.

@MarkCallow
Copy link
Collaborator Author

The test failures I've looked at so far have the form

331/626 Testing: ktxToolTests.info.invalid_file
331/626 Test: ktxToolTests.info.invalid_file
Command: "/Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/3.9/bin/python3.9" "clitest.py" "tests/info/invalid_file.json" "--executable-path" "/Users/mark/Projects/khronos/github/KTX-Software/build/macos/Release/ktx" "--ktxdiff-path" "/Users/mark/Projects/khronos/github/KTX-Software/build/macos/Release/ktxdiff"
Directory: /Users/mark/Projects/khronos/github/KTX-Software/tests/cts/clitests
"ktxToolTests.info.invalid_file" start time: Oct 14 14:25 JST
Output:
----------------------------------------------------------
Executing test case 'tests/info/invalid_file.json'...
Traceback (most recent call last):
  File "/Users/mark/Projects/khronos/github/KTX-Software/tests/cts/clitests/clitest.py", line 286, in <module>
    output_file = open(output_filename, 'w', newline='\n', encoding='utf-8')
FileNotFoundError: [Errno 2] No such file or directory: 'output/info/invalid_file.json.65.out'
<end of output>
Test time =   0.29 sec
----------------------------------------------------------
Test Failed.
"ktxToolTests.info.invalid_file" end time: Oct 14 14:25 JST
"ktxToolTests.info.invalid_file" time elapsed: 00:00:00

I don't see any output from the command being run (presumably ktx info in this case) so I'm not sure how to debug further. Please advise @aqnuep.

MarkCallow pushed a commit that referenced this pull request Oct 19, 2023
Improvements to clitests to allow @MarkCallow to more easily investigate
his issues in PR #783.

@MarkCallow, please merge CTS PR
KhronosGroup/KTX-Software-CTS#6 first.

It would also be great to get write access to the CTS repo in general.
@MarkCallow MarkCallow changed the title Update dfdutils included vulkan_core.h. Update dfdutils-included vulkan_core.h. Oct 19, 2023
@MarkCallow
Copy link
Collaborator Author

MarkCallow commented Oct 22, 2023

I've fixed all the tests. The open question is should the --format option to ktx create accept "_EXT" and core names? In this PR only the new names are accepted.

@aqnuep
Copy link
Collaborator

aqnuep commented Oct 24, 2023

The core changes look good, but I see a lot of seemingly unrelated changes. Is that all just cleanup, or should I take a deeper look into those too?

@MarkCallow
Copy link
Collaborator Author

I see a lot of seemingly unrelated changes.

Are you referring to the changes to the make file, test programs and doxy file in lib/dfdutils? That is cleanup to get the stuff to compile. It is not related to KTX-Software but will be needed when I push the updated code to the upstream repo. Frankly that is a mess and needs to be redone using CMake to build it as library, which can be used by our ktx target, and the test programs. That is very low priority though.

The reuse related change in .travis.yml came about because in updating the doxy file via doxygen to the current version, the copyright message was removed and looking for the error in the log revealed a huge number of deprecation warnings.

@aqnuep
Copy link
Collaborator

aqnuep commented Oct 24, 2023

Yes, I was referring to those changes. If all of those changes are intentional then it's all good.

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.

LGTM

@MarkCallow MarkCallow merged commit 9c223d9 into main Oct 27, 2023
15 checks passed
@MarkCallow MarkCallow deleted the update_vkheader branch October 27, 2023 07:43
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 21, 2024
ASTC HDR and A4B4G4R4_UNORM formats are now core. Update all code and
tests to use the non _EXT names. Make `ktx create --format` accept both
variants of the format name.

Fix mkvkformatfiles to add format aliases to `stringToVkFormat`.

Fix dfdutils scripts to not create duplicate cases for _{EXT,KHR} and
non-_{EXT,KHR} names.

Fix long standing bug in the dfdutils scripts where they were reading as input both
files given on the command line.

Add instructions and a script for regenerating vulkan_core.h from vk.xml.

Do not look for the VulkanSDK for mkvk target as it does not use the SDK's
vulkan_core.h and hasn't for some time.
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
ASTC HDR and A4B4G4R4_UNORM formats are now core. Update all code and
tests to use the non _EXT names. Make `ktx create --format` accept both
variants of the format name.

Fix mkvkformatfiles to add format aliases to `stringToVkFormat`.

Fix dfdutils scripts to not create duplicate cases for _{EXT,KHR} and
non-_{EXT,KHR} names.

Fix long standing bug in the dfdutils scripts where they were reading as input both
files given on the command line.

Add instructions and a script for regenerating vulkan_core.h from vk.xml.

Do not look for the VulkanSDK for mkvk target as it does not use the SDK's
vulkan_core.h and hasn't for some time.
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
ASTC HDR and A4B4G4R4_UNORM formats are now core. Update all code and
tests to use the non _EXT names. Make `ktx create --format` accept both
variants of the format name.

Fix mkvkformatfiles to add format aliases to `stringToVkFormat`.

Fix dfdutils scripts to not create duplicate cases for _{EXT,KHR} and
non-_{EXT,KHR} names.

Fix long standing bug in the dfdutils scripts where they were reading as input both
files given on the command line.

Add instructions and a script for regenerating vulkan_core.h from vk.xml.

Do not look for the VulkanSDK for mkvk target as it does not use the SDK's
vulkan_core.h and hasn't for some time.
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
ASTC HDR and A4B4G4R4_UNORM formats are now core. Update all code and
tests to use the non _EXT names. Make `ktx create --format` accept both
variants of the format name.

Fix mkvkformatfiles to add format aliases to `stringToVkFormat`.

Fix dfdutils scripts to not create duplicate cases for _{EXT,KHR} and
non-_{EXT,KHR} names.

Fix long standing bug in the dfdutils scripts where they were reading as input both
files given on the command line.

Add instructions and a script for regenerating vulkan_core.h from vk.xml.

Do not look for the VulkanSDK for mkvk target as it does not use the SDK's
vulkan_core.h and hasn't for some time.
KaperD pushed a commit to KaperD/KTX-Software that referenced this pull request Feb 22, 2024
ASTC HDR and A4B4G4R4_UNORM formats are now core. Update all code and
tests to use the non _EXT names. Make `ktx create --format` accept both
variants of the format name.

Fix mkvkformatfiles to add format aliases to `stringToVkFormat`.

Fix dfdutils scripts to not create duplicate cases for _{EXT,KHR} and
non-_{EXT,KHR} names.

Fix long standing bug in the dfdutils scripts where they were reading as input both
files given on the command line.

Add instructions and a script for regenerating vulkan_core.h from vk.xml.

Do not look for the VulkanSDK for mkvk target as it does not use the SDK's
vulkan_core.h and hasn't for some time.
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