mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 00:32:13 +02:00
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>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
2a157f114c
commit
a9973bb87d
@@ -712,9 +712,9 @@ RECIPE_MAINTAINER_pn-vim-tiny = "Tom Rini <trini@konsulko.com>"
|
||||
RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin <alex.kanavin@gmail.com>"
|
||||
RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <Qi.Chen@windriver.com>"
|
||||
RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-vulkan-demos = "Ross Burton <ross.burton@arm.com>"
|
||||
RECIPE_MAINTAINER_pn-vulkan-headers = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-vulkan-loader = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-vulkan-samples = "Ross Burton <ross.burton@arm.com>"
|
||||
RECIPE_MAINTAINER_pn-vulkan-tools = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-waffle = "Ross Burton <ross.burton@arm.com>"
|
||||
RECIPE_MAINTAINER_pn-watchdog = "Alexander Kanavin <alex.kanavin@gmail.com>"
|
||||
|
||||
@@ -1,98 +0,0 @@
|
||||
From 663d51cd31fd98411e25f37aaf52b591d9639bf5 Mon Sep 17 00:00:00 2001
|
||||
From: "Maxin B. John" <maxin.john@intel.com>
|
||||
Date: Mon, 30 Jul 2018 17:23:29 +0300
|
||||
Subject: [PATCH] Don't build demos with questionably licensed data
|
||||
|
||||
Some of the models don't have open source compatible licenses:
|
||||
don't build demos using those. Also don't build demos that need
|
||||
resources that are not included.
|
||||
|
||||
ssao:
|
||||
scenerendering:
|
||||
Sibenik model, no license found
|
||||
|
||||
deferred:
|
||||
deferredmultisampling:
|
||||
deferredshadows:
|
||||
armor model, CC-BY-3.0
|
||||
|
||||
vulkanscene:
|
||||
imgui:
|
||||
shadowmapping:
|
||||
vulkanscene model, no license found
|
||||
|
||||
indirectdraw:
|
||||
plant model, no license found
|
||||
|
||||
hdr:
|
||||
pbribl:
|
||||
pbrtexture:
|
||||
Require external Vulkan Asset Pack
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Signed-off-by: Maxin B. John <maxin.john@intel.com>
|
||||
---
|
||||
examples/CMakeLists.txt | 14 --------------
|
||||
1 file changed, 14 deletions(-)
|
||||
|
||||
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
|
||||
index a53c834..71a12e7 100644
|
||||
--- a/examples/CMakeLists.txt
|
||||
+++ b/examples/CMakeLists.txt
|
||||
@@ -55,9 +55,6 @@ set(EXAMPLES
|
||||
conditionalrender
|
||||
conservativeraster
|
||||
debugmarker
|
||||
- deferred
|
||||
- deferredmultisampling
|
||||
- deferredshadows
|
||||
descriptorsets
|
||||
displacement
|
||||
distancefieldfonts
|
||||
@@ -65,9 +62,6 @@ set(EXAMPLES
|
||||
gears
|
||||
geometryshader
|
||||
gltfscene
|
||||
- hdr
|
||||
- imgui
|
||||
- indirectdraw
|
||||
inlineuniformblocks
|
||||
inputattachments
|
||||
instancing
|
||||
@@ -83,23 +77,16 @@ set(EXAMPLES
|
||||
parallaxmapping
|
||||
particlefire
|
||||
pbrbasic
|
||||
- pbribl
|
||||
- pbrtexture
|
||||
pipelines
|
||||
pipelinestatistics
|
||||
pushconstants
|
||||
pushdescriptors
|
||||
radialblur
|
||||
renderheadless
|
||||
- scenerendering
|
||||
screenshot
|
||||
- shadowmapping
|
||||
- shadowmappingomni
|
||||
- shadowmappingcascade
|
||||
skeletalanimation
|
||||
specializationconstants
|
||||
sphericalenvmapping
|
||||
- ssao
|
||||
stencilbuffer
|
||||
subpasses
|
||||
terraintessellation
|
||||
@@ -113,7 +100,6 @@ set(EXAMPLES
|
||||
texturesparseresidency
|
||||
triangle
|
||||
viewportarray
|
||||
- vulkanscene
|
||||
)
|
||||
|
||||
buildExamples()
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
DESCRIPTION = "Collection of Vulkan examples"
|
||||
LICENSE = "MIT"
|
||||
DEPENDS = "zlib"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dcf473723faabf17baa9b5f2207599d0 \
|
||||
file://examples/triangle/triangle.cpp;endline=12;md5=bccd1bf9cadd9e10086cf7872157e4fa"
|
||||
|
||||
SRCREV_glm = "1ad55c5016339b83b7eec98c31007e0aee57d2bf"
|
||||
SRCREV_ktx = "726d14d02c95bb21ec9e43807751b491d295dd3c"
|
||||
|
||||
SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \
|
||||
git://github.com/g-truc/glm;destsuffix=git/external/glm;name=glm \
|
||||
git://github.com/KhronosGroup/KTX-Software;destsuffix=git/external/ktx;name=ktx;lfs=0 \
|
||||
file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
SRCREV = "4818f85916bf88c1ca8c2ed1a46e0e758651489e"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = 'vulkan'
|
||||
|
||||
inherit cmake features_check
|
||||
DEPENDS = "vulkan-loader assimp wayland-protocols wayland-native"
|
||||
|
||||
do_install_append () {
|
||||
# Remove assets that have uncertain licenses
|
||||
rm ${D}${datadir}/vulkan-demos/models/armor/* \
|
||||
${D}${datadir}/vulkan-demos/models/sibenik/* \
|
||||
${D}${datadir}/vulkan-demos/models/vulkanscene* \
|
||||
${D}${datadir}/vulkan-demos/models/plants.dae \
|
||||
${D}${datadir}/vulkan-demos/textures/texturearray_plants*
|
||||
|
||||
mv ${D}${bindir}/screenshot ${D}${bindir}/vulkan-screenshot
|
||||
}
|
||||
|
||||
EXTRA_OECMAKE = "-DRESOURCE_INSTALL_DIR=${datadir}/vulkan-demos"
|
||||
|
||||
ANY_OF_DISTRO_FEATURES = "x11 wayland"
|
||||
|
||||
# Can only pick one of [wayland,xcb]
|
||||
PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'xcb', d)}"
|
||||
PACKAGECONFIG[wayland] = "-DUSE_WAYLAND_WSI=ON, -DUSE_WAYLAND_WSI=OFF, wayland"
|
||||
PACKAGECONFIG[xcb] = ",,libxcb"
|
||||
@@ -0,0 +1,29 @@
|
||||
From 5fb216d35b6846074196e80421f3162df3b9c8cd Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Sun, 1 Nov 2020 23:19:22 +0000
|
||||
Subject: [PATCH] CMakeLists.txt: do not hardcode 'lib' as installation target
|
||||
|
||||
Upstream-Status: Inappropriate [already fixed in newer versions]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e00f8c77..f9896eed 100644
|
||||
--- a/third_party/spirv-cross/CMakeLists.txt
|
||||
+++ b/third_party/spirv-cross/CMakeLists.txt
|
||||
@@ -67,8 +67,8 @@ macro(spirv_cross_add_library name config_name)
|
||||
install(TARGETS ${name}
|
||||
EXPORT ${config_name}Config
|
||||
RUNTIME DESTINATION bin
|
||||
- LIBRARY DESTINATION lib
|
||||
- ARCHIVE DESTINATION lib
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
PUBLIC_HEADER DESTINATION include/spirv_cross)
|
||||
install(FILES ${hdrs} DESTINATION include/spirv_cross)
|
||||
install(EXPORT ${config_name}Config DESTINATION share/${config_name}/cmake)
|
||||
--
|
||||
2.17.1
|
||||
|
||||
19
meta/recipes-graphics/vulkan/vulkan-samples_git.bb
Normal file
19
meta/recipes-graphics/vulkan/vulkan-samples_git.bb
Normal file
@@ -0,0 +1,19 @@
|
||||
DESCRIPTION = "The Vulkan Samples is collection of resources to help develop optimized Vulkan applications."
|
||||
LICENSE = "Apache-2.0"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
|
||||
|
||||
SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \
|
||||
file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
SRCREV = "f52361d3cd6ac8c30fc3365a464b4e220c32cfd6"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = 'vulkan'
|
||||
|
||||
inherit cmake features_check
|
||||
|
||||
FILES_${PN} += "${datadir}"
|
||||
Reference in New Issue
Block a user