summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/vulkan
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-11-02 17:47:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-03 08:21:10 +0000
commita9973bb87db8968ca1cf9ed4a9484b0bfa214b2a (patch)
tree074509e8d17c3ec3e7afe39533cb10b07f588602 /meta/recipes-graphics/vulkan
parent2a157f114c0fd956bbaf004f1c5bee8a7d42ecf0 (diff)
downloadpoky-a9973bb87db8968ca1cf9ed4a9484b0bfa214b2a.tar.gz
vulkan-samples: replace vulkan-demos
vulkan-samples is the official collection, and vulkan-demos author has stated that he will be mostly contributing there: https://github.com/SaschaWillems/Vulkan#Khronossamples (From OE-Core rev: 76a25391d09de06f832c1053d3dbc901dee3b912) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/vulkan')
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch98
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-demos_git.bb44
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch29
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-samples_git.bb19
4 files changed, 48 insertions, 142 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch b/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch
deleted file mode 100644
index 153e662733..0000000000
--- a/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch
+++ /dev/null
@@ -1,98 +0,0 @@
1From 663d51cd31fd98411e25f37aaf52b591d9639bf5 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Mon, 30 Jul 2018 17:23:29 +0300
4Subject: [PATCH] Don't build demos with questionably licensed data
5
6Some of the models don't have open source compatible licenses:
7don't build demos using those. Also don't build demos that need
8resources that are not included.
9
10ssao:
11scenerendering:
12 Sibenik model, no license found
13
14deferred:
15deferredmultisampling:
16deferredshadows:
17 armor model, CC-BY-3.0
18
19vulkanscene:
20imgui:
21shadowmapping:
22 vulkanscene model, no license found
23
24indirectdraw:
25 plant model, no license found
26
27hdr:
28pbribl:
29pbrtexture:
30 Require external Vulkan Asset Pack
31
32Upstream-Status: Inappropriate [configuration]
33
34Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
35Signed-off-by: Maxin B. John <maxin.john@intel.com>
36---
37 examples/CMakeLists.txt | 14 --------------
38 1 file changed, 14 deletions(-)
39
40diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
41index a53c834..71a12e7 100644
42--- a/examples/CMakeLists.txt
43+++ b/examples/CMakeLists.txt
44@@ -55,9 +55,6 @@ set(EXAMPLES
45 conditionalrender
46 conservativeraster
47 debugmarker
48- deferred
49- deferredmultisampling
50- deferredshadows
51 descriptorsets
52 displacement
53 distancefieldfonts
54@@ -65,9 +62,6 @@ set(EXAMPLES
55 gears
56 geometryshader
57 gltfscene
58- hdr
59- imgui
60- indirectdraw
61 inlineuniformblocks
62 inputattachments
63 instancing
64@@ -83,23 +77,16 @@ set(EXAMPLES
65 parallaxmapping
66 particlefire
67 pbrbasic
68- pbribl
69- pbrtexture
70 pipelines
71 pipelinestatistics
72 pushconstants
73 pushdescriptors
74 radialblur
75 renderheadless
76- scenerendering
77 screenshot
78- shadowmapping
79- shadowmappingomni
80- shadowmappingcascade
81 skeletalanimation
82 specializationconstants
83 sphericalenvmapping
84- ssao
85 stencilbuffer
86 subpasses
87 terraintessellation
88@@ -113,7 +100,6 @@ set(EXAMPLES
89 texturesparseresidency
90 triangle
91 viewportarray
92- vulkanscene
93 )
94
95 buildExamples()
96--
972.17.1
98
diff --git a/meta/recipes-graphics/vulkan/vulkan-demos_git.bb b/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
deleted file mode 100644
index 4175a56157..0000000000
--- a/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
+++ /dev/null
@@ -1,44 +0,0 @@
1DESCRIPTION = "Collection of Vulkan examples"
2LICENSE = "MIT"
3DEPENDS = "zlib"
4
5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dcf473723faabf17baa9b5f2207599d0 \
6 file://examples/triangle/triangle.cpp;endline=12;md5=bccd1bf9cadd9e10086cf7872157e4fa"
7
8SRCREV_glm = "1ad55c5016339b83b7eec98c31007e0aee57d2bf"
9SRCREV_ktx = "726d14d02c95bb21ec9e43807751b491d295dd3c"
10
11SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \
12 git://github.com/g-truc/glm;destsuffix=git/external/glm;name=glm \
13 git://github.com/KhronosGroup/KTX-Software;destsuffix=git/external/ktx;name=ktx;lfs=0 \
14 file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \
15 "
16UPSTREAM_CHECK_COMMITS = "1"
17SRCREV = "4818f85916bf88c1ca8c2ed1a46e0e758651489e"
18UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
19S = "${WORKDIR}/git"
20
21REQUIRED_DISTRO_FEATURES = 'vulkan'
22
23inherit cmake features_check
24DEPENDS = "vulkan-loader assimp wayland-protocols wayland-native"
25
26do_install_append () {
27 # Remove assets that have uncertain licenses
28 rm ${D}${datadir}/vulkan-demos/models/armor/* \
29 ${D}${datadir}/vulkan-demos/models/sibenik/* \
30 ${D}${datadir}/vulkan-demos/models/vulkanscene* \
31 ${D}${datadir}/vulkan-demos/models/plants.dae \
32 ${D}${datadir}/vulkan-demos/textures/texturearray_plants*
33
34 mv ${D}${bindir}/screenshot ${D}${bindir}/vulkan-screenshot
35}
36
37EXTRA_OECMAKE = "-DRESOURCE_INSTALL_DIR=${datadir}/vulkan-demos"
38
39ANY_OF_DISTRO_FEATURES = "x11 wayland"
40
41# Can only pick one of [wayland,xcb]
42PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'xcb', d)}"
43PACKAGECONFIG[wayland] = "-DUSE_WAYLAND_WSI=ON, -DUSE_WAYLAND_WSI=OFF, wayland"
44PACKAGECONFIG[xcb] = ",,libxcb"
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch
new file mode 100644
index 0000000000..90fe277a41
--- /dev/null
+++ b/meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch
@@ -0,0 +1,29 @@
1From 5fb216d35b6846074196e80421f3162df3b9c8cd Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sun, 1 Nov 2020 23:19:22 +0000
4Subject: [PATCH] CMakeLists.txt: do not hardcode 'lib' as installation target
5
6Upstream-Status: Inappropriate [already fixed in newer versions]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 CMakeLists.txt | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/CMakeLists.txt b/CMakeLists.txt
13index e00f8c77..f9896eed 100644
14--- a/third_party/spirv-cross/CMakeLists.txt
15+++ b/third_party/spirv-cross/CMakeLists.txt
16@@ -67,8 +67,8 @@ macro(spirv_cross_add_library name config_name)
17 install(TARGETS ${name}
18 EXPORT ${config_name}Config
19 RUNTIME DESTINATION bin
20- LIBRARY DESTINATION lib
21- ARCHIVE DESTINATION lib
22+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
23+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
24 PUBLIC_HEADER DESTINATION include/spirv_cross)
25 install(FILES ${hdrs} DESTINATION include/spirv_cross)
26 install(EXPORT ${config_name}Config DESTINATION share/${config_name}/cmake)
27--
282.17.1
29
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
new file mode 100644
index 0000000000..241a313a7b
--- /dev/null
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -0,0 +1,19 @@
1DESCRIPTION = "The Vulkan Samples is collection of resources to help develop optimized Vulkan applications."
2LICENSE = "Apache-2.0"
3
4LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
5
6SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \
7 file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \
8 "
9UPSTREAM_CHECK_COMMITS = "1"
10SRCREV = "f52361d3cd6ac8c30fc3365a464b4e220c32cfd6"
11
12UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
13S = "${WORKDIR}/git"
14
15REQUIRED_DISTRO_FEATURES = 'vulkan'
16
17inherit cmake features_check
18
19FILES_${PN} += "${datadir}"