From a5e08514d4362b18d0fb10ef5640d35105714d60 Mon Sep 17 00:00:00 2001 From: TheJackiMonster Date: Fri, 30 Sep 2022 14:50:32 +0200 Subject: [PATCH] Fix bash permutation of shader compile definitions Signed-off-by: TheJackiMonster --- src/ffx-fsr2-api/CMakeLists.txt | 13 +++++++------ src/ffx-fsr2-api/vk/CMakeLists.txt | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/ffx-fsr2-api/CMakeLists.txt b/src/ffx-fsr2-api/CMakeLists.txt index fc48d80..8b91258 100644 --- a/src/ffx-fsr2-api/CMakeLists.txt +++ b/src/ffx-fsr2-api/CMakeLists.txt @@ -92,12 +92,13 @@ set(FFX_SC_BASE_ARGS set(FFX_SC_PERMUTATION_ARGS # Reproject can use either reference lanczos or LUT - -DFFX_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE={0,1} - -DFFX_FSR2_OPTION_HDR_COLOR_INPUT={0,1} - -DFFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS={0,1} - -DFFX_FSR2_OPTION_JITTERED_MOTION_VECTORS={0,1} - -DFFX_FSR2_OPTION_INVERTED_DEPTH={0,1} - -DFFX_FSR2_OPTION_APPLY_SHARPENING={0,1}) + '-DFFX_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE={0,1}' + '-DFFX_FSR2_OPTION_HDR_COLOR_INPUT={0,1}' + '-DFFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS={0,1}' + '-DFFX_FSR2_OPTION_JITTERED_MOTION_VECTORS={0,1}' + '-DFFX_FSR2_OPTION_INVERTED_DEPTH={0,1}' + '-DFFX_FSR2_OPTION_APPLY_SHARPENING={0,1}' +) file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" diff --git a/src/ffx-fsr2-api/vk/CMakeLists.txt b/src/ffx-fsr2-api/vk/CMakeLists.txt index 933d097..03843df 100644 --- a/src/ffx-fsr2-api/vk/CMakeLists.txt +++ b/src/ffx-fsr2-api/vk/CMakeLists.txt @@ -80,7 +80,7 @@ foreach(PASS_SHADER ${PASS_SHADERS}) # skip 16-bit permutations for the compute luminance pyramid pass set(FFX_SC_ARGS ${FFX_SC_BASE_ARGS} ${FFX_SC_VK_BASE_ARGS} ${FFX_SC_PERMUTATION_ARGS} -DFFX_HALF=0) else() - set(FFX_SC_ARGS ${FFX_SC_BASE_ARGS} ${FFX_SC_VK_BASE_ARGS} ${FFX_SC_PERMUTATION_ARGS} -DFFX_HALF={0,1}) + set(FFX_SC_ARGS ${FFX_SC_BASE_ARGS} ${FFX_SC_VK_BASE_ARGS} ${FFX_SC_PERMUTATION_ARGS} '-DFFX_HALF={0,1}') endif() if(USE_DEPFILE) @@ -107,4 +107,4 @@ add_custom_target(shader_permutations_vk DEPENDS ${PERMUTATION_OUTPUTS}) add_dependencies(${FFX_SC_DEPENDENT_TARGET} shader_permutations_vk) source_group("source" FILES ${VK}) -source_group("shaders" FILES ${SHADERS}) \ No newline at end of file +source_group("shaders" FILES ${SHADERS})