Update load tests to Vulkan SDK version 1.3.290. #931
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Raise fatal error if cpu is x86.
Avoids warning from cmake.
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.
Don't add vulkan directory to RESOURCE property.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
unclear why CI did not fail with this.
not machine architecture. VS2022 Developer PowerShells are x86 processes
leading to failure with the old query. Use Get-ComputerInfo instead.
scripts/build_win.ps1, a warning whenPYTHONis defined on theCMake configure command line if FEATURE_PYTHON is not ON.