Port to Embree 4.x

[musicinmybrain]

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

• [X] 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]

Filed as internal issue #USD-8002

[nyabinary]

Filed as internal issue #USD-8002

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

[jesschimein]

/AzurePipelines run

[azure-pipelines[bot]]

Pull request contains merge conflicts.

[musicinmybrain]

Rebased on v24.11.

[jesschimein]

/AzurePipelines run

[azure-pipelines[bot]]

Azure Pipelines successfully started running 1 pipeline(s).

[yzx9]

Hi, any updates on this patch?

[musicinmybrain]

Hi, any updates on this patch?

Well, I’ve been using this PR as a patch for the usd package in Fedora. I just rebased this on dev in order to keep using the patch for the 25.05 release.

There’s another PR at https://github.com/PixarAnimationStudios/OpenUSD/pull/2313 that might be a bit more thorough. Among other things, it only allows Embree 4 rather than requiring it, and the author of that PR seems to be putting more effort into freshening and updating it than I am putting into this one. I haven’t reviewed the differences between the two PR’s in great detail, though.

I haven’t seen any feedback from the OpenUSD team on either PR, nor do I have any idea whether there is a concrete plan or timeline for supporting Embree 4.

[musicinmybrain]

I haven’t seen any feedback from the OpenUSD team on either PR, nor do I have any idea whether there is a concrete plan or timeline for supporting Embree 4.

I’ll clarify that https://github.com/PixarAnimationStudios/OpenUSD/pull/2266#issuecomment-1428347084 does indicate this is planned in some form, but obviously I can’t see internal issue trackers.

[jesschimein]

/AzurePipelines run

[musicinmybrain]

Closing in favor of https://github.com/PixarAnimationStudios/OpenUSD/pull/2313, which was merged (https://github.com/PixarAnimationStudios/OpenUSD/pull/2313#issuecomment-3090158160).