| Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 1 | From 663d51cd31fd98411e25f37aaf52b591d9639bf5 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
| 3 | Date: Mon, 30 Jul 2018 17:23:29 +0300 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 4 | Subject: [PATCH] Don't build demos with questionably licensed data |
| 5 | |
| 6 | Some of the models don't have open source compatible licenses: |
| 7 | don't build demos using those. Also don't build demos that need |
| 8 | resources that are not included. |
| 9 | |
| 10 | ssao: |
| 11 | scenerendering: |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 12 | Sibenik model, no license found |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 13 | |
| 14 | deferred: |
| 15 | deferredmultisampling: |
| 16 | deferredshadows: |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 17 | armor model, CC-BY-3.0 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 18 | |
| 19 | vulkanscene: |
| 20 | imgui: |
| 21 | shadowmapping: |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 22 | vulkanscene model, no license found |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | |
| 24 | indirectdraw: |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 25 | plant model, no license found |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 26 | |
| 27 | hdr: |
| 28 | pbribl: |
| 29 | pbrtexture: |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 30 | Require external Vulkan Asset Pack |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 31 | |
| 32 | Upstream-Status: Inappropriate [configuration] |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 33 | |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 34 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 35 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
| 36 | --- |
| 37 | examples/CMakeLists.txt | 14 -------------- |
| 38 | 1 file changed, 14 deletions(-) |
| 39 | |
| 40 | diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt |
| Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 41 | index a53c834..71a12e7 100644 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 42 | --- a/examples/CMakeLists.txt |
| 43 | +++ b/examples/CMakeLists.txt |
| Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 44 | @@ -55,9 +55,6 @@ set(EXAMPLES |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 45 | conditionalrender |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 46 | conservativeraster |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 47 | debugmarker |
| 48 | - deferred |
| 49 | - deferredmultisampling |
| 50 | - deferredshadows |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 51 | descriptorsets |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 52 | displacement |
| 53 | distancefieldfonts |
| Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 54 | @@ -65,9 +62,6 @@ set(EXAMPLES |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 55 | gears |
| 56 | geometryshader |
| Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 57 | gltfscene |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 58 | - hdr |
| 59 | - imgui |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 60 | - indirectdraw |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 61 | inlineuniformblocks |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 62 | inputattachments |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 63 | instancing |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 64 | @@ -83,23 +77,16 @@ set(EXAMPLES |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 65 | parallaxmapping |
| 66 | particlefire |
| 67 | pbrbasic |
| 68 | - pbribl |
| 69 | - pbrtexture |
| 70 | pipelines |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 71 | pipelinestatistics |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 72 | pushconstants |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 73 | pushdescriptors |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 74 | radialblur |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 75 | renderheadless |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 76 | - scenerendering |
| 77 | screenshot |
| 78 | - shadowmapping |
| 79 | - shadowmappingomni |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 80 | - shadowmappingcascade |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 81 | skeletalanimation |
| 82 | specializationconstants |
| 83 | sphericalenvmapping |
| 84 | - ssao |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 85 | stencilbuffer |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 86 | subpasses |
| 87 | terraintessellation |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 88 | @@ -113,7 +100,6 @@ set(EXAMPLES |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 89 | texturesparseresidency |
| 90 | triangle |
| 91 | viewportarray |
| 92 | - vulkanscene |
| 93 | ) |
| 94 | |
| 95 | buildExamples() |
| Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 96 | -- |
| 97 | 2.17.1 |
| 98 | |