Several maintenance items#1178
Merged
Merged
Conversation
By upgrading to the latest vcpkg and removing an overlay port.
…nt' into works-on-mac-with-cmake4
The test was moving the camera in such a way that that the tile was no longer in the view frustum. The only reason it was passing on any platform was because the camera would still be just inside the tile, and so the rule that we don't cull tiles under the camera would apply. But on ARM64 macOS, the camera ends up being very very slightly outside the tile instead of very slightly inside, and so the test fails. The change here is to keep the tile inside the frustum, as was intended in the first place.
Contributor
|
Thanks @kring ! I don't have a Mac to this, but at least I don't see any unexpected changes here on Windows. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
vcpkg upgrade
The vcpkg release we were using, 2024.11.16, doesn't work with CMake 4. On most platforms, this isn't too hard to work around by installing CMake 3.31 or by setting the
CMAKE_POLICY_VERSION_MINIMUMenvironment variable to3.5. But on macOS, homebrew makes it hard to install an old cmake, and setting that environment variable isn't sufficient due to a separate problem on macOS. We need to upgrade to at least 2025.04.09 to get the fix for both of these problems.However, 2025.04.09 has a problem in the
ktxport. I opened a PR to fix this, and the vcpkg folks merged it, but it hasn't gone out in an official release yet. I've been waiting for a new vcpkg release, but it has been longer than I expected, and in the meantime using CMake 4, especially on a Mac, is really annoying.So this PR updates our vcpkg version to the current head. We'll switch to an official release in a separate PR as soon as one comes out.
Use Ubuntu 24.04 for documentation builds
Previously we were using 22.04. ada-url in the latest vcpkg release doesn't seem to like 22.04's version of GCC. Moving off the old Ubuntu release is an easy fix.
Doxygen version
Previously, we were using Doxygen 1.13.2 to build doc as part of the normal process, but then using 1.12.0 to build for production. Not what we want. Now it's all 1.13.2.
Overlay ports and triplets
I removed the now-unnecessary
ktxvcpkg overlay port. And had to add README files in the ports and triplets directories to prevent vcpkg from complaining that they don't exist.