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

Fix arm64/Windows build. #91360

Merged
merged 1 commit into from Apr 30, 2024
Merged

Fix arm64/Windows build. #91360

merged 1 commit into from Apr 30, 2024

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Apr 30, 2024

  • Fixes typo in the PNG driver SCsub
  • Disables unsupported raycast/embree for arm64/Windows.

@akien-mga akien-mga modified the milestones: 4.x, 4.3 Apr 30, 2024
@akien-mga akien-mga added cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Apr 30, 2024
@akien-mga akien-mga merged commit d282e4f into godotengine:master Apr 30, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label May 1, 2024
@akien-mga
Copy link
Member

Might be worth checking if some of these changes are needed for 3.x too. I suspect at least the raycast one, but there might be more.

@aaronfranke
Copy link
Member

Note: We can re-enable Embree if we apply this patch: RenderKit/embree#483

I did not submit it here yet because I was hoping it would be accepted by upstream in a timely manner.

@akien-mga
Copy link
Member

Looks pretty good to me. I think we can include it downstream, together with a patch file in thirdparty/embree/patches/ that documents the downstream changes.

@aaronfranke
Copy link
Member

Here's a branch with a patch file: https://github.com/aaronfranke/godot/tree/embree-win-arm64-msvc

Unfortunately it fails linking, I'm not sure what to do to fix it. @bruvzg Want to take a look?

@bruvzg
Copy link
Member Author

bruvzg commented May 1, 2024

Unfortunately it fails linking, I'm not sure what to do to fix it.

I'll check it.

@bruvzg
Copy link
Member Author

bruvzg commented May 1, 2024

Note: We can re-enable Embree if we apply this patch

I do not think it will work. USE_SOFT_INTRINSICS seems to only do something if you use softintrin.h (or generic intrin.h) instead of *mmintrin.h, and it does not have all required stuff implemented.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release platform:windows topic:buildsystem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants