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

[skia] Fix vulkan #29448

Merged
merged 2 commits into from
Feb 6, 2023
Merged

[skia] Fix vulkan #29448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0fa42a
[skia] Fix vulkan
dg0yt Feb 4, 2023
8256b7d
Use vulkan-memory-allocator
dg0yt Feb 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/skia/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ if("metal" IN_LIST FEATURES)
endif()

if("vulkan" IN_LIST FEATURES)
string(APPEND OPTIONS "${OPTIONS} skia_use_vulkan=true")
string(APPEND OPTIONS " skia_use_vulkan=true")
file(COPY "${CURRENT_INSTALLED_DIR}/include/vk_mem_alloc.h" DESTINATION "${SOURCE_PATH}/third_party/vulkanmemoryallocator")
endif()

if("direct3d" IN_LIST FEATURES)
Expand Down
5 changes: 3 additions & 2 deletions ports/skia/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "skia",
"version": "0.36.0",
"port-version": 6,
"port-version": 7,
"description": [
"Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.",
"It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.",
Expand Down Expand Up @@ -136,7 +136,8 @@
"vulkan": {
"description": "Vulkan support for skia",
"dependencies": [
"vulkan"
"vulkan",
"vulkan-memory-allocator"
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7170,7 +7170,7 @@
},
"skia": {
"baseline": "0.36.0",
"port-version": 6
"port-version": 7
},
"skyr-url": {
"baseline": "1.13.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/skia.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "508710af38e0b50675532741bf899ec4c3f20c3b",
"version": "0.36.0",
"port-version": 7
},
{
"git-tree": "0458cf18e0a28b607b8d3a2ca9fba56395d5f147",
"version": "0.36.0",
Expand Down