diff options
Diffstat (limited to 'meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch')
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch b/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch new file mode 100644 index 0000000000..3cf241d62a --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch | |||
@@ -0,0 +1,106 @@ | |||
1 | commit f63cbe944107b5cd8f150ceaaec43b26099d5688 | ||
2 | Author: Adam Jackson <ajax@redhat.com> | ||
3 | Date: Tue Feb 16 10:05:25 2016 -0500 | ||
4 | |||
5 | demos: Don't build tri or cube | ||
6 | |||
7 | There are more interesting demos, all we really want here is vulkaninfo. | ||
8 | This helps because we don't need to pre-build glslang/llvm/lunarglass | ||
9 | just to get the loader and layers. | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
13 | |||
14 | --- a/demos/CMakeLists.txt | ||
15 | +++ b/demos/CMakeLists.txt | ||
16 | @@ -61,46 +61,6 @@ | ||
17 | else() | ||
18 | endif() | ||
19 | |||
20 | -if(WIN32) | ||
21 | - # For Windows, since 32-bit and 64-bit items can co-exist, we build each in its own build directory. | ||
22 | - # 32-bit target data goes in build32, and 64-bit target data goes into build. So, include/link the | ||
23 | - # appropriate data at build time. | ||
24 | - if (CMAKE_CL_64) | ||
25 | - set (BUILDTGT_DIR build) | ||
26 | - else () | ||
27 | - set (BUILDTGT_DIR build32) | ||
28 | - endif() | ||
29 | - | ||
30 | - # Use static MSVCRT libraries | ||
31 | - foreach(configuration in CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO | ||
32 | - CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO) | ||
33 | - if(${configuration} MATCHES "/MD") | ||
34 | - string(REGEX REPLACE "/MD" "/MT" ${configuration} "${${configuration}}") | ||
35 | - endif() | ||
36 | - endforeach() | ||
37 | - | ||
38 | - add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv | ||
39 | - COMMAND ${GLSLANG_VALIDATOR} -s -V -o ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert | ||
40 | - DEPENDS cube.vert ${GLSLANG_VALIDATOR} | ||
41 | - ) | ||
42 | - add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv | ||
43 | - COMMAND ${GLSLANG_VALIDATOR} -s -V -o ${CMAKE_BINARY_DIR}/demos/cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag | ||
44 | - DEPENDS cube.frag ${GLSLANG_VALIDATOR} | ||
45 | - ) | ||
46 | - file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) | ||
47 | - file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos) | ||
48 | -else() | ||
49 | - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) | ||
50 | - add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv | ||
51 | - COMMAND ${GLSLANG_VALIDATOR} -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert | ||
52 | - DEPENDS cube.vert ${GLSLANG_VALIDATOR} | ||
53 | - ) | ||
54 | - add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv | ||
55 | - COMMAND ${GLSLANG_VALIDATOR} -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag | ||
56 | - DEPENDS cube.frag ${GLSLANG_VALIDATOR} | ||
57 | - ) | ||
58 | - endif() | ||
59 | -endif() | ||
60 | |||
61 | if(WIN32) | ||
62 | include_directories ( | ||
63 | @@ -114,43 +74,6 @@ | ||
64 | add_executable(${API_LOWERCASE}info vulkaninfo.c) | ||
65 | target_link_libraries(${API_LOWERCASE}info ${LIBRARIES}) | ||
66 | |||
67 | -if(NOT WIN32) | ||
68 | - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) | ||
69 | - add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) | ||
70 | - target_link_libraries(cube ${LIBRARIES}) | ||
71 | - endif() | ||
72 | -else() | ||
73 | - if (CMAKE_CL_64) | ||
74 | - set (LIB_DIR "Win64") | ||
75 | - else() | ||
76 | - set (LIB_DIR "Win32") | ||
77 | - endif() | ||
78 | - | ||
79 | - add_executable(cube WIN32 cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) | ||
80 | - target_link_libraries(cube ${LIBRARIES}) | ||
81 | -endif() | ||
82 | - | ||
83 | -if(NOT WIN32) | ||
84 | - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) | ||
85 | - add_executable(cubepp cube.cpp ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) | ||
86 | - target_link_libraries(cubepp ${LIBRARIES}) | ||
87 | - endif() | ||
88 | -else() | ||
89 | - if (CMAKE_CL_64) | ||
90 | - set (LIB_DIR "Win64") | ||
91 | - else() | ||
92 | - set (LIB_DIR "Win32") | ||
93 | - endif() | ||
94 | - | ||
95 | - add_executable(cubepp WIN32 cube.cpp ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) | ||
96 | - target_link_libraries(cubepp ${LIBRARIES}) | ||
97 | -endif() | ||
98 | - | ||
99 | -if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})) | ||
100 | - if ((DEMOS_WSI_SELECTION STREQUAL "XCB") OR (DEMOS_WSI_SELECTION STREQUAL "WAYLAND") OR WIN32 OR (CMAKE_SYSTEM_NAME STREQUAL "Android")) | ||
101 | - add_subdirectory(smoke) | ||
102 | - endif() | ||
103 | -endif() | ||
104 | |||
105 | if(UNIX) | ||
106 | install(TARGETS ${API_LOWERCASE}info DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||