Support embree 4 - #1141
Merged
Merged
Support embree 4#1141
Conversation
embree-config.cmake exports EMBREE_INCLUDE_DIRS (plural); the singular EMBREE_INCLUDE_DIR was always empty, so embree headers were resolved only through the compiler's default system include paths.
embree 4 moved the headers to `embree4/` subdirectory and replaced `RTCIntersectContext` with `RTCIntersectArguments` in the `rtcIntersect1` signature - see this commit for reference: RenderKit/embree@07ea5d3 CMake config changed to prefer embree 4 and fall back to embree 3.4 to keep `scripts/docker/pkg/embree.sh` working (it pins embree to 3.13.2). The API and include path is selected at compile time via the `TTK_EMBREE4` definition, derived from the `EMBREE_VERSION_MAJOR` CMake variable (exported by both embree 3 and embree 4 CMake config files). Closes topology-tool-kit#1122
Collaborator
|
Looks great, thanks a lot! |
Collaborator
|
(in principle, the CI stack should be updated to embree 4, but that can wait too) |
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.
This adds support for embree 4 - fixes #1122
I've kept support for embree 3 which is pinned in scripts/docker/pkg/embree.sh. The Docker image uses outdated versions across the entire stack (embree, ospray, openvkl, ispc, paraview, ...) and should be updated, but I will leave this to somebody else.