|
1 | 1 | #[[ |
2 | | - Copyright (c) 2019-2025, Arm Limited and Contributors |
3 | | - Copyright (c) 2024-2025, Mobica Limited |
4 | | - Copyright (c) 2024-2025, Sascha Willems |
| 2 | + Copyright (c) 2019-2026, Arm Limited and Contributors |
| 3 | + Copyright (c) 2024-2026, Mobica Limited |
| 4 | + Copyright (c) 2024-2026, Sascha Willems |
5 | 5 |
|
6 | 6 | SPDX-License-Identifier: Apache-2.0 |
7 | 7 |
|
@@ -197,7 +197,7 @@ endif() |
197 | 197 | endif() |
198 | 198 |
|
199 | 199 | # HLSL compilation via DXC |
200 | | - if(Vulkan_dxc_EXECUTABLE AND DEFINED SHADERS_HLSL) |
| 200 | + if(VKB_BUILD_SHADERS AND Vulkan_dxc_EXECUTABLE AND DEFINED SHADERS_HLSL) |
201 | 201 | set(OUTPUT_FILES "") |
202 | 202 | set(HLSL_TARGET_NAME ${PROJECT_NAME}-HLSL) |
203 | 203 | foreach(SHADER_FILE_HLSL ${TARGET_SHADERS_HLSL}) |
@@ -256,16 +256,7 @@ endif() |
256 | 256 | endif() |
257 | 257 |
|
258 | 258 | # Slang shader compilation |
259 | | - # Skip on MacOS/iOS due to CI/CD using potentially broken slang compiler versions from the SDK |
260 | | - # Might revisit once Slang shipped with the SDK is usable |
261 | | - set(SLANG_SKIP_COMPILE false) |
262 | | - if (($ENV{CI} MATCHES true) AND ((CMAKE_SYSTEM_NAME MATCHES "Darwin") OR (CMAKE_SYSTEM_NAME MATCHES "iOS"))) |
263 | | - set(SLANG_SKIP_COMPILE true) |
264 | | - endif() |
265 | | - if(VKB_SKIP_SLANG_SHADER_COMPILATION) |
266 | | - set(SLANG_SKIP_COMPILE true) |
267 | | - endif() |
268 | | - if(NOT SLANG_SKIP_COMPILE AND Vulkan_slang_EXECUTABLE AND DEFINED SHADERS_SLANG) |
| 259 | + if(VKB_BUILD_SHADERS AND NOT VKB_SKIP_SLANG_SHADER_COMPILATION AND Vulkan_slang_EXECUTABLE AND DEFINED SHADERS_SLANG) |
269 | 260 | set(OUTPUT_FILES "") |
270 | 261 | set(SLANG_TARGET_NAME ${PROJECT_NAME}-SLANG) |
271 | 262 | foreach(SHADER_FILE_SLANG ${TARGET_SHADERS_SLANG}) |
@@ -297,7 +288,7 @@ endif() |
297 | 288 | endif() |
298 | 289 |
|
299 | 290 | # GLSL shader compilation |
300 | | - if(Vulkan_glslc_EXECUTABLE AND DEFINED SHADERS_GLSL) |
| 291 | + if(VKB_BUILD_SHADERS AND Vulkan_glslc_EXECUTABLE AND DEFINED SHADERS_GLSL) |
301 | 292 | set(GLSL_TARGET_NAME ${PROJECT_NAME}-GLSL) |
302 | 293 | set(OUTPUT_FILES "") |
303 | 294 | foreach(SHADER_FILE_GLSL ${TARGET_SHADERS_GLSL}) |
@@ -343,7 +334,7 @@ endif() |
343 | 334 | endif() |
344 | 335 |
|
345 | 336 | # spvasm shader compilation |
346 | | - if(Vulkan_spirvas_EXECUTABLE AND DEFINED SHADERS_SPVASM) |
| 337 | + if(VKB_BUILD_SHADERS AND Vulkan_spirvas_EXECUTABLE AND DEFINED SHADERS_SPVASM) |
347 | 338 | set(SPVASM_TARGET_NAME ${PROJECT_NAME}-SPVASM) |
348 | 339 | set(OUTPUT_FILES "") |
349 | 340 | foreach(SHADER_FILE_SPVASM ${TARGET_SHADERS_SPVASM}) |
|
0 commit comments