3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 02:11:58 +08:00
Code Issues Projects Releases Wiki Activity

[skia] Fix and test vulkan (#35828)

Browse Source 
* [vcpkg-ci-skia] Use vulkan

* [skia] Fix vulkan on windows

* Require vcpkg-ci-skia pass

* Fixup
This commit is contained in:
Kai Pastor 2023-12-28 09:11:17 +01:00 committed by GitHub
parent 77df385ff6
commit c415be64bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/skia/portfile.cmake
View File

@ -194,7 +194,8 @@ if("vulkan" IN_LIST FEATURES)
vulkan-tools
)
string(APPEND OPTIONS " skia_use_vulkan=true")
file(COPY "${CURRENT_INSTALLED_DIR}/include/vk_mem_alloc.h" DESTINATION "${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include")
find_file(vk_mem_alloc_h "vk_mem_alloc.h" PATHS "${CURRENT_INSTALLED_DIR}/include" PATH_SUFFIXES "vma" REQUIRED)
file(COPY "${vk_mem_alloc_h}" DESTINATION "${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include")
# Cf. third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:25
vcpkg_replace_string("${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include/vk_mem_alloc.h"
"#include <vulkan/vulkan.h>"

4
ports/skia/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "skia",
"version": "0.38.2",
"port-version": 1,
"port-version": 2,
"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.",
@ -57,7 +57,7 @@
},
{
"name": "gl",
"platform": "!uwp"
"platform": "!(windows & arm) & !uwp"
},
{
"name": "harfbuzz",

12
scripts/ci.baseline.txt
View File

@ -1333,6 +1333,18 @@ vcpkg-ci-paraview:x64-windows-static-md=pass
vcpkg-ci-paraview:x64-windows-static=pass
vcpkg-ci-paraview:x64-windows=pass
vcpkg-ci-paraview:x86-windows=pass
vcpkg-ci-skia:arm-neon-android=pass
vcpkg-ci-skia:arm64-android=pass
vcpkg-ci-skia:arm64-uwp=pass
vcpkg-ci-skia:arm64-windows=pass
vcpkg-ci-skia:x64-android=pass
vcpkg-ci-skia:x64-linux=pass
vcpkg-ci-skia:x64-osx=pass
vcpkg-ci-skia:x64-uwp=pass
vcpkg-ci-skia:x64-windows-static-md=pass
vcpkg-ci-skia:x64-windows-static=pass
vcpkg-ci-skia:x64-windows=pass
vcpkg-ci-skia:x86-windows=pass
vcpkg-ci-soci:x64-linux=pass
vcpkg-ci-soci:x64-osx=pass
vcpkg-ci-soci:x64-windows=pass

10
scripts/test_ports/vcpkg-ci-skia/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "vcpkg-ci-skia",
"version-date": "2023-11-12",
"version-date": "2023-12-22",
"description": "Builds an app in order to validate the skia port.",
"license": "BSD-3-Clause",
"dependencies": [
@ -8,6 +8,14 @@
"name": "skia",
"default-features": false
},
{
"name": "skia",
"default-features": false,
"features": [
"vulkan"
],
"platform": "linux | osx | (windows & !uwp)"
},
{
"name": "vcpkg-cmake",
"host": true

2
versions/baseline.json
View File

@ -7938,7 +7938,7 @@
},
"skia": {
"baseline": "0.38.2",
"port-version": 1
"port-version": 2
},
"skyr-url": {
"baseline": "1.13.0",

5
versions/s-/skia.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce919437fcbcbfe2c364757efdc117a286f44fa2",
"version": "0.38.2",
"port-version": 2
},
{
"git-tree": "7363d84372c8a2a6e3c06a7fcc6c1ef1d1b7b97a",
"version": "0.38.2",