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 load tests to Vulkan SDK version 1.3.290. #931

Merged
merged 53 commits into from
Aug 6, 2024
Merged

Conversation

MarkCallow
Copy link
Collaborator

@MarkCallow MarkCallow commented Aug 1, 2024

1.3.290 is the first release of official iOS support and first with support for
Windows arm64.

Stop using binaries of SDL2, assimp and glew libraries stored in repo
because an updated SDL2 is needed for 1.3.290 and more platforms are
now supported. Dependencies for iOS, macOS and Windows are now obtained
through vcpkg. Those for Linux through the package manager as before.

Thus remove other_lib, other_include/{SDL2,assimp} and
other_include/GL/{glew,glxew,wglew}.h. Move the modified Vulkan
manifest files to tests/loadtests/appfwSDL/VulkanAppSDL.
This incidentally fixes #763.

These changes plus removal of the hacks for finding the iOS components
in older Vulkan SDKs means a major revamp of the load tests-related CMake
files.

vcpkg is used in manifest mode so installation of dependencies is automatic
once vcpkg is installted. This use of vcpkg led to a reshuffle of the root
CMakeLists.txt to put some options before the project() comment so their
values can be used to set VCPKG-related variables.

Deployment target for iOS is bumped to 12.0 and for macOS to 11.0 to match
what is supported by this Vulkan SDK.

The PR also fixes some unrelated problems:

  1. A syntax error in scripts/mkversion most likely introduced by PR Allow KTX_VERSION_FULL to be manually specified #922. It is
    unclear why CI did not fail with this.
  2. Use of a query in `scripts/build_win.ps1 that returned process architecture
    not machine architecture. VS2022 Developer PowerShells are x86 processes
    leading to failure with the old query. Use Get-ComputerInfo instead.
  3. Also in scripts/build_win.ps1, a warning when PYTHON is defined on the
    CMake configure command line if FEATURE_PYTHON is not ON.

This has first release of official iOS support and first Windows arm64 SDK.

Stop using binaries of SDL2, assimp and glew libraries stored in repo
because an updated SDL2 is needed for 1.3.290 and more platforms are
now supported. Dependencies for iOS, macOS and Windows are now obtained
through vcpkg.

These changes plus removal of the hacks for finding the iOS in older
Vulkan SDKs means a major revamp of the load tests-related CMake files.
* Use ./ so bootstrap script is found.
* Add CMAKE_TOOLCHAIN_FILE setting to iOS build.
* Simplify formatting of first cmake_args line.
Add x64 simulator triplet file.
Needed for some filesystem features used in imageio.
to match the Vulkan SDK we are using.
in attempt to populate vcpkg cache.
It is not clear how CI was passing with this error.
not process architecture. VS2022 Developer PowerShells
are x86 processes leading to failure when previous script
was used there.
@MarkCallow MarkCallow merged commit a545f00 into main Aug 6, 2024
18 checks passed
@MarkCallow MarkCallow deleted the update_vksdk branch August 6, 2024 00:22
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.

Can you make an artifact for a release that does not include the gigantic other_lib directory?
1 participant