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

[3.x] Switch to embree-aarch64 #48455

Merged
merged 1 commit into from
May 5, 2021
Merged

Conversation

JFonS
Copy link
Contributor

@JFonS JFonS commented May 4, 2021

Switch the embree library for the ARM64 compatible version embree-aarch64. I also included some minor fixes to the SCsub so that 3.x and master use basically the same SCsub file.

@JFonS JFonS added this to the 3.3 milestone May 4, 2021
@JFonS JFonS requested a review from akien-mga May 4, 2021 14:46
@JFonS JFonS requested review from a team as code owners May 4, 2021 14:46
@akien-mga akien-mga changed the title [3.2] Switch to embree-aarch64 [3.x] Switch to embree-aarch64 May 4, 2021
@akien-mga akien-mga modified the milestones: 3.3, 3.4 May 4, 2021
@akien-mga
Copy link
Member

Remember to update thirdparty/README.md too.

And I notice that we didn't add thirdparty/embree to COPYRIGHT.txt, but we should add thirdparty/embree-aarch64 now.

@JFonS
Copy link
Contributor Author

JFonS commented May 4, 2021

I forgot about that, will update in a bit.

@JFonS JFonS force-pushed the 3.x_embree_aarch64 branch from ce774ac to c852800 Compare May 4, 2021 15:21
@JFonS JFonS force-pushed the 3.x_embree_aarch64 branch from c852800 to 73e2ccd Compare May 4, 2021 16:59
@akien-mga akien-mga merged commit b8d198e into godotengine:3.x May 5, 2021
@akien-mga
Copy link
Member

Thanks!

@akien-mga
Copy link
Member

Cherry-picked for 3.3.1.

akien-mga added a commit that referenced this pull request May 18, 2021
…n on macOS"

This reverts commit 47f869b.

This is no longer needed after #48455.
akien-mga added a commit that referenced this pull request May 18, 2021
…n on macOS"

This reverts commit 1e31661.

This is no longer needed after #48455.
akien-mga added a commit to akien-mga/godot that referenced this pull request May 20, 2021
Re-do of godotengine#45380 lost in godotengine#48455.
Rediff patch on current embree-aarch64 upstream.

Fixes godotengine#48822.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants