[skia] Fix vulkan feature #32740
Merged
[skia] Fix vulkan feature #32740
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use vendored copies of headers and tools, as already done by feature 'dawn'. Guard vulkan inclusion in vulkanmemoryallocator as would be done in vendored copy.
Closed
|
CC @jimwang118 |
7 tasks
JonLiu1993
added
the
category:port-bug
|
I have an idea how to devendor vulkan-headers. |
jimwang118
reviewed
Jul 25, 2023
Comment on lines
+188
to
+191
| vcpkg_replace_string("${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include/vk_mem_alloc.h" | ||
| "#include <vulkan/vulkan.h>" | ||
| "#ifndef VULKAN_H_\n #include <vulkan/vulkan.h>\n#endif" | ||
| ) |
There was a problem hiding this comment.
Check third_party\vulkanmemoryallocator\BUILD.gn, the #include <vulkan/vulkan.h> used in vk_mem_alloc.h should come from the /include/third_party/vulkan path, but it is strange that the header file inclusion path is set in .gn, but it does not work during the compilation process.
There was a problem hiding this comment.
Note the link in the initial post why this is needed.
There was a problem hiding this comment.
Note the link in the initial post why this is needed.
Actually not that link, but the comment in front of these lines:
Cf. third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:25
which is
There was a problem hiding this comment.
Ok, then I have no problem.
|
Testing |
|
@dg0yt, thanks for your contribution, when I test the usage of usageTest.cpp Config: build: |
|
Note: I will be converting your PR to draft status. When you respond, please revert to "ready for review". That way, I can be aware that you've responded since you can't modify the tags. |
|
Test feature
|
|
@JonLiu1993 Error or successful? AFAIU you need to use C++17 - this is what the error message says, and this is what skia is using. This usage requirement isn't exposed by the CMake config, but this is not a regression. |
|
Ok, I successfully tested usage when I added |
JonLiu1993
approved these changes
Jul 27, 2023
|
Thanks for debugging tricky cases for us @dg0yt @jimwang118 and @JonLiu1993 ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use vcpkg port vulkan-headers instead of vendored copy.
Use vendored copies of
headers andtools for featurevulkan, as already done by featuredawn.Fix in-source location of vulkanmemoryallocator.
Guard vulkan inclusion in vulkanmemoryallocator as would be done in the vendored copy:
https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/+/7de5cc00de50e71a3aab22dea52fbb7ff4efceb6/include/vk_mem_alloc.h#129
Fixes #32706. Amends #29448. Alternative to #32715.
./vcpkg x-add-version --alland committing the result.