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

vulkan: Sync loader, headers and glslang to sdk-1.2.154.0 #42817

Merged
merged 1 commit into from Oct 26, 2020
Merged

vulkan: Sync loader, headers and glslang to sdk-1.2.154.0 #42817

merged 1 commit into from Oct 26, 2020

Conversation

akien-mga
Copy link
Member

Actually sdk-1.2.154.1 for Vulkan-Loader.

glslang is updated to bacaef3237c515e40d1a24722be48c0a0b30f75f which is the
known-good version for Vulkan-ValidationLayers 1.2.154.0.

COPYRIGHT.txt was synced with the current version of the glslang LICENSE.txt,
and glslang/register_types.cpp now uses the upstream definition for its
default builtin resource instead of hardcoding it.

@bruvzg Could you check that it works fine on macOS?

BTW I saw that VkMemAlloc has some fixes for macOS SDK 11.0 in its master branch, but they're not in any tagged release yet. We might want to update to latest master for compatibility: GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator#137.

@akien-mga akien-mga added this to the 4.0 milestone Oct 15, 2020
@akien-mga
Copy link
Member Author

Looks like my local build picked up headers from /usr/include, I'll have to uninstall build deps and fix it.

@bruvzg
Copy link
Member

bruvzg commented Oct 15, 2020

With the dummy build_info.h (seems to be used only to print version info, I have defined random values of GLSLANG_VERSION_... macros), it is working.

@akien-mga
vulkan: Sync loader, headers and glslang to sdk-1.2.154.0
148ad49 
Actually sdk-1.2.154.1 for Vulkan-Loader.

glslang is updated to bacaef3237c515e40d1a24722be48c0a0b30f75f which is the
known-good version for Vulkan-ValidationLayers 1.2.154.0.

COPYRIGHT.txt was synced with the current version of the glslang LICENSE.txt,
and `glslang/register_types.cpp` now uses the upstream definition for its
default builtin resource instead of hardcoding it.
@akien-mga
Copy link
Member Author

Added missing build_info.h (generated by cmake . && make, includes version numbers parsed from CHANGES.md).

@bruvzg
Copy link
Member

bruvzg commented Oct 15, 2020

Rechecked with the proper build_info.h in case it's not just for print, also works fine.

@bruvzg
Copy link
Member

bruvzg commented Oct 15, 2020

BTW I saw that VkMemAlloc has some fixes for macOS SDK 11.0 in its master branch, but they're not in any tagged release yet. We might want to update to latest master for compatibility: GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator#137.

Seems like this is relevant only when targeting 10.15 with 10.15 SDK, but we are targeting 10.12 for x86_64 and 11.0 for arm64.

@akien-mga akien-mga merged commit 825ab3b into godotengine:master Oct 26, 2020
@akien-mga akien-mga deleted the vulkan-sdk-1.2.154.0 branch October 26, 2020 14:15
@bruvzg bruvzg mentioned this pull request Oct 26, 2020
Closed
@KoBeWi KoBeWi mentioned this pull request Oct 26, 2020
Closed
@jacobcoughenour jacobcoughenour mentioned this pull request Dec 20, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reduz reduz Awaiting requested review from reduz

@bruvzg bruvzg Awaiting requested review from bruvzg

Assignees
No one assigned
Labels
enhancement needs testing topic:buildsystem topic:rendering
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@akien-mga @bruvzg