Debian Codegraph @

third_party/spirv-tools/filament-specific-changes.patch

raw
1 diff --git a/third_party/spirv-tools/CMakeLists.txt b/third_party/spirv-tools/CMakeLists.txt
2 index 6ed56a81..2392dfd8 100755
3 --- a/third_party/spirv-tools/CMakeLists.txt
4 +++ b/third_party/spirv-tools/CMakeLists.txt
5 @@ -24,8 +24,19 @@ if (POLICY CMP0054)
6 endif()
7 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
8
9 +# Filament specific changes
10 +if (APPLE)
11 + set(CMAKE_MACOSX_RPATH ON)
12 +endif (APPLE)
13 +set(SPIRV_SKIP_EXECUTABLES_OPTION ON)
14 +set(SPIRV_SKIP_TESTS_OPTION ON)
15 +set(SKIP_SPIRV_TOOLS_INSTALL ON)
16 +# End Filament specific changes
17 +
18 project(spirv-tools)
19 -enable_testing()
20 +# Filament specific changes
21 +# enable_testing()
22 +# End Filament specific changes
23 set(SPIRV_TOOLS "SPIRV-Tools")
24
25 include(GNUInstallDirs)
26 @@ -68,7 +79,9 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
27 set(CMAKE_BUILD_TYPE "Debug")
28 endif()
29
30 -option(SKIP_SPIRV_TOOLS_INSTALL "Skip installation" ${SKIP_SPIRV_TOOLS_INSTALL})
31 +# Filament specific changes
32 +# option(SKIP_SPIRV_TOOLS_INSTALL "Skip installation" ${SKIP_SPIRV_TOOLS_INSTALL})
33 +# End Filament specific changes
34 if(NOT ${SKIP_SPIRV_TOOLS_INSTALL})
35 set(ENABLE_SPIRV_TOOLS_INSTALL ON)
36 endif()
37 @@ -231,11 +244,13 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
38 endif()
39
40 # Defaults to OFF if the user didn't set it.
41 +# Filament specific changes
42 option(SPIRV_SKIP_EXECUTABLES
43 "Skip building the executable and tests along with the library"
44 - ${SPIRV_SKIP_EXECUTABLES})
45 + ${SPIRV_SKIP_EXECUTABLES_OPTION})
46 option(SPIRV_SKIP_TESTS
47 - "Skip building tests along with the library" ${SPIRV_SKIP_TESTS})
48 + "Skip building tests along with the library" ${SPIRV_SKIP_TESTS_OPTION})
49 +# End Filament specific changes
50 if ("${SPIRV_SKIP_EXECUTABLES}")
51 set(SPIRV_SKIP_TESTS ON)
52 endif()
53 @@ -279,8 +294,10 @@ endif()
54 add_subdirectory(source)
55 add_subdirectory(tools)
56
57 -add_subdirectory(test)
58 -add_subdirectory(examples)
59 +# Filament specific changes
60 +#add_subdirectory(test)
61 +#add_subdirectory(examples)
62 +# End Filament specific changes
63
64 if(ENABLE_SPIRV_TOOLS_INSTALL)
65 install(
66 @@ -305,28 +322,30 @@ set(SPIRV_SHARED_LIBRARIES "-lSPIRV-Tools-shared")
67
68 # Build pkg-config file
69 # Use a first-class target so it's regenerated when relevant files are updated.
70 -add_custom_target(spirv-tools-pkg-config ALL
71 - COMMAND ${CMAKE_COMMAND}
72 - -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
73 - -DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools.pc.in
74 - -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc
75 - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
76 - -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
77 - -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
78 - -DSPIRV_LIBRARIES=${SPIRV_LIBRARIES}
79 - -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
80 - DEPENDS "CHANGES" "cmake/SPIRV-Tools.pc.in" "cmake/write_pkg_config.cmake")
81 -add_custom_target(spirv-tools-shared-pkg-config ALL
82 - COMMAND ${CMAKE_COMMAND}
83 - -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
84 - -DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools-shared.pc.in
85 - -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
86 - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
87 - -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
88 - -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
89 - -DSPIRV_SHARED_LIBRARIES=${SPIRV_SHARED_LIBRARIES}
90 - -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
91 - DEPENDS "CHANGES" "cmake/SPIRV-Tools-shared.pc.in" "cmake/write_pkg_config.cmake")
92 +# Filament specific changes
93 +# add_custom_target(spirv-tools-pkg-config ALL
94 +# COMMAND ${CMAKE_COMMAND}
95 +# -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
96 +# -DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools.pc.in
97 +# -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc
98 +# -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
99 +# -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
100 +# -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
101 +# -DSPIRV_LIBRARIES=${SPIRV_LIBRARIES}
102 +# -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
103 +# DEPENDS "CHANGES" "cmake/SPIRV-Tools.pc.in" "cmake/write_pkg_config.cmake")
104 +# add_custom_target(spirv-tools-shared-pkg-config ALL
105 +# COMMAND ${CMAKE_COMMAND}
106 +# -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
107 +# -DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools-shared.pc.in
108 +# -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
109 +# -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
110 +# -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
111 +# -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
112 +# -DSPIRV_SHARED_LIBRARIES=${SPIRV_SHARED_LIBRARIES}
113 +# -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
114 +# DEPENDS "CHANGES" "cmake/SPIRV-Tools-shared.pc.in" "cmake/write_pkg_config.cmake")
115 +# End Filament specific changes
116
117 # Install pkg-config file
118 if (ENABLE_SPIRV_TOOLS_INSTALL)
119 @@ -201,7 +201,11 @@ if(NOT COMMAND find_host_program)
120 endif()
121
122 # Tests require Python3
123 -find_host_package(PythonInterp 3 REQUIRED)
124 +if(CMAKE_VERSION VERSION_LESS "3.12" OR ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
125 + find_host_package(PythonInterp 3 REQUIRED)
126 +else()
127 + find_package(Python3 COMPONENTS Interpreter)
128 +endif()
129
130 # Check for symbol exports on Linux.
131 # At the moment, this check will fail on the OSX build machines for the Android NDK.
132 diff --git a/third_party/spirv-tools/external/CMakeLists.txt b/third_party/spirv-tools/external/CMakeLists.txt
133 index 179a4012f..152cfc421 100644
134 --- a/third_party/spirv-tools/external/CMakeLists.txt
135 +++ b/third_party/spirv-tools/external/CMakeLists.txt
136 @@ -45,8 +45,10 @@ if (IS_DIRECTORY ${SPIRV_HEADER_DIR})
137 # Do this so enclosing projects can use SPIRV-Headers_SOURCE_DIR to find
138 # headers to include.
139 if (NOT DEFINED SPIRV-Headers_SOURCE_DIR)
140 - set(SPIRV_HEADERS_SKIP_INSTALL ON)
141 - set(SPIRV_HEADERS_SKIP_EXAMPLES ON)
142 +# Filament specific changes
143 + #set(SPIRV_HEADERS_SKIP_INSTALL ON)
144 + #set(SPIRV_HEADERS_SKIP_EXAMPLES ON)
145 +# End Filament specific changes
146 add_subdirectory(${SPIRV_HEADER_DIR})
147 endif()
148 else()
149 diff --git a/third_party/spirv-tools/external/spirv-headers/CMakeLists.txt b/third_party/spirv-tools/external/spirv-headers/CMakeLists.txt
150 index eb4694786..d3940532d 100644
151 --- a/third_party/spirv-tools/external/spirv-headers/CMakeLists.txt
152 +++ b/third_party/spirv-tools/external/spirv-headers/CMakeLists.txt
153 @@ -49,11 +49,11 @@ add_custom_target(install-headers
154 COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv
155 $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/include/spirv)
156
157 -option(SPIRV_HEADERS_SKIP_EXAMPLES "Skip building examples"
158 - ${SPIRV_HEADERS_SKIP_EXAMPLES})
159 +# Filament specific changes
160 +option(SPIRV_HEADERS_SKIP_EXAMPLES "Skip building examples" ON)
161
162 -option(SPIRV_HEADERS_SKIP_INSTALL "Skip install"
163 - ${SPIRV_HEADERS_SKIP_INSTALL})
164 +option(SPIRV_HEADERS_SKIP_INSTALL "Skip install" ON)
165 +# End Filament specific changes
166
167 if(NOT ${SPIRV_HEADERS_SKIP_EXAMPLES})
168 set(SPIRV_HEADERS_ENABLE_EXAMPLES ON)
169 diff --git a/third_party/spirv-tools/source/CMakeLists.txt b/third_party/spirv-tools/source/CMakeLists.txt
170 index 65087f2c..38101ab2 100644
171 --- a/third_party/spirv-tools/source/CMakeLists.txt
172 +++ b/third_party/spirv-tools/source/CMakeLists.txt
173 @@ -364,13 +364,15 @@ endfunction()
174
175 # Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and
176 # unlike the other SPIRV_TOOLS target, defaults to hidden symbol visibility.
177 -add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
178 -spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
179 -set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
180 -target_compile_definitions(${SPIRV_TOOLS}-shared
181 - PRIVATE SPIRV_TOOLS_IMPLEMENTATION
182 - PUBLIC SPIRV_TOOLS_SHAREDLIB
183 -)
184 +# Filament specific changes
185 +# add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
186 +# spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
187 +# set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
188 +# target_compile_definitions(${SPIRV_TOOLS}-shared
189 +# PRIVATE SPIRV_TOOLS_IMPLEMENTATION
190 +# PUBLIC SPIRV_TOOLS_SHAREDLIB
191 +# )
192 +# End Filament specific changes
193
194 if(SPIRV_TOOLS_BUILD_STATIC)
195 add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES})
196 @@ -386,11 +388,17 @@ if(SPIRV_TOOLS_BUILD_STATIC)
197 add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static)
198 endif()
199
200 - set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared)
201 +# Filament specific changes
202 + # set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared)
203 + set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static)
204 +# End Filament specific changes
205 else()
206 add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES})
207 spirv_tools_default_target_options(${SPIRV_TOOLS})
208 - set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared)
209 +# Filament specific changes
210 + # set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared)
211 + set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS})
212 +# End Filament specific changes
213 endif()
214
215 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")