diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 70 |
1 files changed, 33 insertions, 37 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f939bc..e90cb4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -612,46 +612,42 @@ if(DEMO_BUILD_TESTS) ) endif() -#-- - Extra Tools -- - -if(DEMO_BUILD_TOOLS OR DEMO_BUILD_TESTS) - add_demo_executable(spectool tools/spectool.cc ${PLATFORM_SOURCES} ${GEN_DEMO_CC} ${GENERATED_MUSIC_DATA_CC}) - target_compile_definitions(spectool PRIVATE DEMO_BUILD_TOOLS) - target_link_libraries(spectool PRIVATE audio util procedural ${DEMO_LIBS}) - add_dependencies(spectool generate_tracker_music generate_demo_assets) +# Sub-task 7: Integrate validation tool into CI/build system - add_executable(specview tools/specview.cc) +# Ensure the Python validation script is available +add_custom_target(validate_uniforms_script ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/validate_uniforms.py) - add_demo_executable(specplay tools/specplay.cc ${PLATFORM_SOURCES} ${GEN_DEMO_CC} ${GENERATED_MUSIC_DATA_CC}) - target_link_libraries(specplay PRIVATE audio util ${DEMO_LIBS}) - add_dependencies(specplay generate_demo_assets) -endif() +# Find all WGSL files recursively in src/gpu +file(GLOB WGSL_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/*.wgsl ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/**/*.wgsl) -#-- - Global Target Configuration -- - -# NOTE: "final" target moved to line ~329 (FINAL_STRIP build) -# Old "final" target (gen_assets + crunch_demo) removed - run scripts manually +# List of C++ files containing uniform struct definitions and shader code +# Add more C++ files here if new effects with structs are added. +set(VALIDATION_CPP_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/effects/heptagon_effect.cc + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/effects/post_process_helper.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/effects/fade_effect.cc + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/effects/theme_modulation_effect.cc + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/effects/chroma_aberration_effect.cc + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/effects/vignette_effect.cc + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/effects/gaussian_blur_effect.cc + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/effects/distort_effect.cc + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/demo_effects.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpu/effects/circle_mask_effect.h +) -add_custom_target(pack_source - COMMAND tar -czf demo_all.tgz --exclude=.git --exclude=build* --exclude=.gemini* --exclude=*.tgz --exclude=*.zip --exclude=.DS_Store . - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +# Add custom command to run the validator +# It depends on the script itself, WGSL files, and the C++ files being validated. +# Outputting a flag file to signal completion. +set(VALIDATION_FLAG ${CMAKE_CURRENT_BINARY_DIR}/uniform_validation_complete.flag) +add_custom_command( + OUTPUT ${VALIDATION_FLAG} + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/tools/validate_uniforms.py ${VALIDATION_FLAG} + COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/tools/validate_uniforms.py ${CMAKE_CURRENT_SOURCE_DIR}/assets/final/shaders ${VALIDATION_CPP_FILES} + DEPENDS validate_uniforms_script ${WGSL_FILES} ${VALIDATION_CPP_FILES} + COMMENT "Validating uniform buffer sizes and alignments..." ) -#-- - Configuration Summary -- - -message(STATUS "") -message(STATUS "═══════════════════════════════════════════════════════════") -message(STATUS " 64k Demo Project - Configuration Summary") -message(STATUS "═══════════════════════════════════════════════════════════") -message(STATUS "") -message(STATUS "Build Options:") -message(STATUS " DEMO_SIZE_OPT: ${DEMO_SIZE_OPT}") -message(STATUS " DEMO_STRIP_ALL: ${DEMO_STRIP_ALL}") -message(STATUS " DEMO_BUILD_TESTS: ${DEMO_BUILD_TESTS}") -message(STATUS " DEMO_BUILD_TOOLS: ${DEMO_BUILD_TOOLS}") -message(STATUS " DEMO_ENABLE_COVERAGE: ${DEMO_ENABLE_COVERAGE}") -message(STATUS " DEMO_ENABLE_DEBUG_LOGS: ${DEMO_ENABLE_DEBUG_LOGS}") -message(STATUS " DEMO_ALL_OPTIONS: ${DEMO_ALL_OPTIONS}") -message(STATUS "") -message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}") -message(STATUS "C++ Compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") -message(STATUS "") -message(STATUS "═══════════════════════════════════════════════════════════") -message(STATUS "") +# Add custom target that depends on the validation output flag +add_custom_target(validate_uniforms ALL DEPENDS ${VALIDATION_FLAG}) + + |