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.

Sign up for GitHub

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

Jump to bottom

Move Vulkan includes to a central godot_vulkan.h header #97510

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Move Vulkan includes to a central godot_vulkan.h header #97510

merged 1 commit into from
Oct 1, 2024

Conversation

kisg
Copy link
Contributor

@kisg kisg commented Sep 26, 2024 •
edited
Loading

Also fixes Vulkan build problem with recent Clang.

Developed by Migeran, sponsored by Xibbon Inc.

Fixes #96918.

@kisg kisg requested review from a team as code owners September 26, 2024 20:09
@AThousandShips AThousandShips added this to the 4.4 milestone Sep 27, 2024
akien-mga
akien-mga approved these changes Sep 29, 2024
View reviewed changes
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, just left a minor nitpick.

@kisg
Move Vulkan includes to a central godot_vulkan.h header
146ba41 
Also fixes Vulkan build problem with recent Clang.
@akien-mga akien-mga changed the title Move Vulkan includes to a central godot_vulkan.h header Move Vulkan includes to a central godot_vulkan.h header Oct 1, 2024
@akien-mga akien-mga merged commit d66d056 into godotengine:master Oct 1, 2024
19 checks passed
@akien-mga
Copy link
Member

Thanks!

TCROC pushed a commit to Lange-Studios/godot that referenced this pull request Oct 3, 2024
@akien-mga @TCROC
Merge pull request godotengine#97510 from kisg/vulkan_build_fix
c40600d 
Move Vulkan includes to a central `godot_vulkan.h` header
@AThousandShips AThousandShips mentioned this pull request Oct 9, 2024
Closed
@AThousandShips AThousandShips added the cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release label Oct 10, 2024
SCEManny added a commit to SilverCreekEntertainment/godot that referenced this pull request Oct 14, 2024
@SCEManny
Cherry pick vulkan build fix for macos with new clang issue godotengi…
eba5269 
…ne#97510
@kisg kisg deleted the vulkan_build_fix branch October 15, 2024 22:29
@zaddok
Copy link

zaddok commented Dec 6, 2024

What is the best way for 4.3 users to use this as of today? scons fails to build on my Mac at the moment due to this error. 4.3 doesnt have an updated release, and 4.4 is not yet out.

@zaddok
Copy link

zaddok commented Dec 6, 2024 •
edited
Loading

Ive just done a git pull for 4.3, with an up to date 4.3 checkout to my local up to date Mac, I am still encountering this problem. Perhaps I am missing something basic, but it looks to me like its not possible to build with scons on Mac any more?

Are there plants to allow scons to be used on Mac with 4.3? It seems, as it stands, it's not possible to use scons on Mac with stable godot. Does anyone have a workaround for building on Mac for godot 4.3?

@zaddok zaddok mentioned this pull request Dec 6, 2024
Closed
@zaddok
Copy link

zaddok commented Dec 7, 2024

I have manually applied this patch to my checkout of the 4.3 branch and I can confirm for people on 4.3, that this patch does allow building on MacOS 15.1 using Xcode 16.1.

@akien-mga akien-mga mentioned this pull request Dec 16, 2024
Closed
@akien-mga
Copy link
Member

Cherry-picked for 4.3.1, 4.2.3, and 4.1.5.

@akien-mga akien-mga removed the cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release label Dec 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bruvzg bruvzg bruvzg left review comments

@akien-mga akien-mga akien-mga approved these changes

Assignees
No one assigned
Labels
bug topic:buildsystem
Projects
None yet
Milestone
4.4
Development

Successfully merging this pull request may close these issues.

Build problem with recent Clang releases
5 participants
@kisg @akien-mga @zaddok @bruvzg @AThousandShips