summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch')
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch51
1 files changed, 29 insertions, 22 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
index d32c8f2803..93bcfbf851 100644
--- 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
@@ -1,6 +1,6 @@
1From 55770fb07c42fe410cf8d09f8f5976babc89b9ef Mon Sep 17 00:00:00 2001 1From 0a27144d43b70121f57f6036514d069ca9d2b971 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 4 Jul 2017 17:13:45 +0300 3Date: Mon, 30 Jul 2018 17:23:29 +0300
4Subject: [PATCH] Don't build demos with questionably licensed data 4Subject: [PATCH] Don't build demos with questionably licensed data
5 5
6Some of the models don't have open source compatible licenses: 6Some of the models don't have open source compatible licenses:
@@ -9,43 +9,46 @@ resources that are not included.
9 9
10ssao: 10ssao:
11scenerendering: 11scenerendering:
12 Sibenik model, no license found 12 Sibenik model, no license found
13 13
14deferred: 14deferred:
15deferredmultisampling: 15deferredmultisampling:
16deferredshadows: 16deferredshadows:
17 armor model, CC-BY-3.0 17 armor model, CC-BY-3.0
18 18
19vulkanscene: 19vulkanscene:
20imgui: 20imgui:
21shadowmapping: 21shadowmapping:
22 vulkanscene model, no license found 22 vulkanscene model, no license found
23 23
24indirectdraw: 24indirectdraw:
25 plant model, no license found 25 plant model, no license found
26 26
27hdr: 27hdr:
28pbribl: 28pbribl:
29pbrtexture: 29pbrtexture:
30 Require external Vulkan Asset Pack 30 Require external Vulkan Asset Pack
31 31
32Upstream-Status: Inappropriate [configuration] 32Upstream-Status: Inappropriate [configuration]
33
33Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 34Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
35Signed-off-by: Maxin B. John <maxin.john@intel.com>
34--- 36---
35 CMakeLists.txt | 13 ------------- 37 examples/CMakeLists.txt | 14 --------------
36 1 file changed, 13 deletions(-) 38 1 file changed, 14 deletions(-)
37 39
38diff --git a/CMakeLists.txt b/CMakeLists.txt 40diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
39index 4958fff..0f9d3e4 100644 41index 8eee3a4..698d3b3 100644
40--- a/CMakeLists.txt 42--- a/examples/CMakeLists.txt
41+++ b/CMakeLists.txt 43+++ b/examples/CMakeLists.txt
42@@ -150,17 +150,11 @@ set(EXAMPLES 44@@ -47,18 +47,12 @@ set(EXAMPLES
43 computeparticles
44 computeshader 45 computeshader
46 conservativeraster
45 debugmarker 47 debugmarker
46- deferred 48- deferred
47- deferredmultisampling 49- deferredmultisampling
48- deferredshadows 50- deferredshadows
51 descriptorsets
49 displacement 52 displacement
50 distancefieldfonts 53 distancefieldfonts
51 dynamicuniformbuffer 54 dynamicuniformbuffer
@@ -53,32 +56,36 @@ index 4958fff..0f9d3e4 100644
53 geometryshader 56 geometryshader
54- hdr 57- hdr
55- imgui 58- imgui
56- indirectdraw 59- indirectdraw
60 inputattachments
57 instancing 61 instancing
58 mesh 62 mesh
59 multisampling 63@@ -70,8 +64,6 @@ set(EXAMPLES
60@@ -170,20 +164,14 @@ set(EXAMPLES
61 parallaxmapping 64 parallaxmapping
62 particlefire 65 particlefire
63 pbrbasic 66 pbrbasic
64- pbribl 67- pbribl
65- pbrtexture 68- pbrtexture
66 pipelines 69 pipelines
70 pipelinestatistics
67 pushconstants 71 pushconstants
72@@ -79,15 +71,10 @@ set(EXAMPLES
68 radialblur 73 radialblur
69 raytracing 74 raytracing
75 renderheadless
70- scenerendering 76- scenerendering
71 screenshot 77 screenshot
72- shadowmapping 78- shadowmapping
73- shadowmappingomni 79- shadowmappingomni
80- shadowmappingcascade
74 skeletalanimation 81 skeletalanimation
75 specializationconstants 82 specializationconstants
76 sphericalenvmapping 83 sphericalenvmapping
77- ssao 84- ssao
85 stencilbuffer
78 subpasses 86 subpasses
79 terraintessellation 87 terraintessellation
80 tessellation 88@@ -101,7 +88,6 @@ set(EXAMPLES
81@@ -196,7 +184,6 @@ set(EXAMPLES
82 texturesparseresidency 89 texturesparseresidency
83 triangle 90 triangle
84 viewportarray 91 viewportarray
@@ -87,5 +94,5 @@ index 4958fff..0f9d3e4 100644
87 94
88 buildExamples() 95 buildExamples()
89-- 96--
902.13.2 972.4.0
91 98