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

Port to Embree 4.x #2266

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from

Conversation

musicinmybrain
Copy link
Contributor

Description of Change(s)

Adjusts CMake scripts and #include paths to properly find version 4.x of Embree.

Adjusts for renaming of RTCIntersectContext to RTCRayQueryContext and modified rtcIntersect1/rtcOccluded signatures.

See Embree 4.0.0 changelog and upgrade notes.

Fixes Issue(s)

  • No issue filed.
  • I have verified that all unit tests pass with the proposed changes
  • I have submitted a signed Contributor License Agreement

I am not currently able to easily run the tests.

This PR, applied as a patch to USD 22.05b for the upcoming Fedora 38 and 39 releases, seems to make it compatible with Embree 4.x. At least, the library compiles.

@tallytalwar
Copy link
Contributor

Filed as internal issue #USD-8002

@nyabinary
Copy link

Filed as internal issue #USD-8002

Need this so we can drop this patch in nixpkgs :3

@jesschimein
Copy link
Collaborator

/AzurePipelines run

Copy link

Pull request contains merge conflicts.

@musicinmybrain
Copy link
Contributor Author

Rebased on v24.11.

@jesschimein
Copy link
Collaborator

/AzurePipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

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.

5 participants