diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:27 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:03 +0000 |
commit | c9be277fb3b7ef2ea2bfcede972b91d91abe2e54 (patch) | |
tree | 83ae06c86a9bc461674c3ea42cb558cd5c8cc504 /meta/recipes-graphics/vulkan | |
parent | 16aa12c8da9feedb92ff2dbd99e859ab14f4ee40 (diff) | |
download | poky-c9be277fb3b7ef2ea2bfcede972b91d91abe2e54.tar.gz |
vulkan: upgrade 1.3.268.0 -> 1.3.275.0
Add vulkan-volk recipe to support building latest vulkan-tools.
(From OE-Core rev: d3d0375fa0b4809d2c69837faf5df297d92de683)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/vulkan')
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-headers_1.3.275.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-headers_1.3.268.0.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.3.268.0.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-tools_1.3.275.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-tools_1.3.268.0.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.275.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.268.0.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.275.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.268.0.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-volk_1.3.275.0.bb | 37 |
6 files changed, 45 insertions, 8 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.268.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.275.0.bb index a1a83317da..aacec8cab1 100644 --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.268.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.275.0.bb | |||
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0 & MIT" | |||
11 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" |
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" |
13 | 13 | ||
14 | SRCREV = "7b3466a1f47a9251ac1113efbe022ff016e2f95b" | 14 | SRCREV = "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.268.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.bb index 5a5749d40c..7caed67207 100644 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.268.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.bb | |||
@@ -9,8 +9,8 @@ SECTION = "libs" | |||
9 | 9 | ||
10 | LICENSE = "Apache-2.0" | 10 | LICENSE = "Apache-2.0" |
11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" |
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.268;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https" |
13 | SRCREV = "f4c838e2e7358fc450f8112119bbdbb5b03e03fa" | 13 | SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.268.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.275.0.bb index 78bd9b0e04..f86912c903 100644 --- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.268.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.275.0.bb | |||
@@ -7,7 +7,7 @@ SECTION = "libs" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" |
9 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https" | 9 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https" |
10 | SRCREV = "1532001f7edae559af1988293eec90bc5e2607d5" | 10 | SRCREV = "c86d42cf9eb620eeac377e3bff46ae342c5cd664" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
@@ -15,7 +15,7 @@ inherit cmake features_check pkgconfig | |||
15 | ANY_OF_DISTRO_FEATURES = "x11 wayland" | 15 | ANY_OF_DISTRO_FEATURES = "x11 wayland" |
16 | REQUIRED_DISTRO_FEATURES = "vulkan" | 16 | REQUIRED_DISTRO_FEATURES = "vulkan" |
17 | 17 | ||
18 | DEPENDS += "vulkan-headers vulkan-loader" | 18 | DEPENDS += "vulkan-headers vulkan-loader vulkan-volk" |
19 | 19 | ||
20 | EXTRA_OECMAKE = "\ | 20 | EXTRA_OECMAKE = "\ |
21 | -DBUILD_TESTS=OFF \ | 21 | -DBUILD_TESTS=OFF \ |
diff --git a/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.268.0.bb b/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.275.0.bb index fee4ba6cc9..759a03926b 100644 --- a/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.268.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.275.0.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" | |||
10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b" | 10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=main;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=main;protocol=https" |
13 | SRCREV = "c9ca4ac620a238a93c65d864f2eaa33954d74509" | 13 | SRCREV = "4cfc176e3242b4dbdfd3f6c5680c5d8f2cb7db45" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.268.0.bb b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.275.0.bb index 6c2715b041..239589108d 100644 --- a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.268.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.275.0.bb | |||
@@ -8,8 +8,8 @@ SECTION = "libs" | |||
8 | LICENSE = "Apache-2.0 & MIT" | 8 | LICENSE = "Apache-2.0 & MIT" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.268;protocol=https" | 11 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.275;protocol=https" |
12 | SRCREV = "3c64adb4e052062fc60b6580c365429fddfbcfbf" | 12 | SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-volk_1.3.275.0.bb b/meta/recipes-graphics/vulkan/vulkan-volk_1.3.275.0.bb new file mode 100644 index 0000000000..f4e6e89aac --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-volk_1.3.275.0.bb | |||
@@ -0,0 +1,37 @@ | |||
1 | SUMMARY = "A meta-loader for Vulkan" | ||
2 | DESCRIPTION = "Volk allows one to dynamically load entrypoints required \ | ||
3 | to use Vulkan without linking to vulkan-1.dll or statically linking Vulkan loader. \ | ||
4 | " | ||
5 | HOMEPAGE = "https://www.khronos.org/vulkan/" | ||
6 | BUGTRACKER = "https://github.com/zeux/volk" | ||
7 | SECTION = "libs" | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b2dd098d35668a801190a9d9d47461b0" | ||
11 | |||
12 | SRC_URI = "git://github.com/zeux/volk.git;branch=master;protocol=https" | ||
13 | SRCREV = "f2a16e3e19c2349b873343b2dc38a1d4c25af23a" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | REQUIRED_DISTRO_FEATURES = "vulkan" | ||
18 | |||
19 | DEPENDS = "vulkan-headers" | ||
20 | |||
21 | EXTRA_OECMAKE = "\ | ||
22 | -DVOLK_INSTALL=ON \ | ||
23 | " | ||
24 | |||
25 | inherit cmake features_check pkgconfig | ||
26 | |||
27 | # These recipes need to be updated in lockstep with each other: | ||
28 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, | ||
29 | # vulkan-validation-layers, spirv-headers, spirv-tools, | ||
30 | # vulkan-utility-libraries. | ||
31 | # The tags versions should always be sdk-x.y.z, as this is what | ||
32 | # upstream considers a release. | ||
33 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | ||
34 | |||
35 | do_install:append() { | ||
36 | sed -i -e 's,${STAGING_DIR_TARGET},,g' ${D}${libdir}/cmake/volk/volkTargets.cmake | ||
37 | } | ||