[skia] Fix vulkan (#29448)

* [skia] Fix vulkan

* Use vulkan-memory-allocator
This commit is contained in:
Kai Pastor 2023-02-06 20:53:39 +01:00 committed by GitHub
parent 6b91ca9f46
commit 873263a7c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions

View File

@ -178,7 +178,8 @@ if("metal" IN_LIST FEATURES)
endif() endif()
if("vulkan" IN_LIST FEATURES) 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() endif()
if("direct3d" IN_LIST FEATURES) if("direct3d" IN_LIST FEATURES)

View File

@ -1,7 +1,7 @@
{ {
"name": "skia", "name": "skia",
"version": "0.36.0", "version": "0.36.0",
"port-version": 6, "port-version": 7,
"description": [ "description": [
"Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "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.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.",
@ -136,7 +136,8 @@
"vulkan": { "vulkan": {
"description": "Vulkan support for skia", "description": "Vulkan support for skia",
"dependencies": [ "dependencies": [
"vulkan" "vulkan",
"vulkan-memory-allocator"
] ]
} }
} }

View File

@ -7170,7 +7170,7 @@
}, },
"skia": { "skia": {
"baseline": "0.36.0", "baseline": "0.36.0",
"port-version": 6 "port-version": 7
}, },
"skyr-url": { "skyr-url": {
"baseline": "1.13.0", "baseline": "1.13.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "508710af38e0b50675532741bf899ec4c3f20c3b",
"version": "0.36.0",
"port-version": 7
},
{ {
"git-tree": "0458cf18e0a28b607b8d3a2ca9fba56395d5f147", "git-tree": "0458cf18e0a28b607b8d3a2ca9fba56395d5f147",
"version": "0.36.0", "version": "0.36.0",