aiden/video-shader-toys
1
0
Fork 1
Code Issues Pull Requests Actions Releases 5 Wiki Activity

Cmake fixes
Some checks failed
CI / React UI Build (push) Successful in 11s
Details
CI / Native Windows Build And Tests (push) Failing after 2m28s
Details
CI / Windows Release Package (push) Has been skipped
Details

Browse Source
This commit is contained in:
Aiden
2026-05-22 14:48:27 +10:00
parent 0b6a2300ea
commit 35801601a5
2 changed files with 67 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
CMakeLists.txt
View File

@@ -62,6 +62,46 @@ function(add_video_shader_test name)
add_test(NAME ${name} COMMAND ${name}) add_test(NAME ${name} COMMAND ${name})
endfunction() endfunction()
set(RUNTIME_JSON_SOURCES
"${SRC_DIR}/runtime/state/RuntimeJson.cpp"
)
set(RUNTIME_PARAMETER_SOURCES
${RUNTIME_JSON_SOURCES}
"${SRC_DIR}/runtime/state/RuntimeParameterUtils.cpp"
)
set(RUNTIME_STATE_SOURCES
${RUNTIME_JSON_SOURCES}
"${SRC_DIR}/runtime/state/RuntimeStatePersistence.cpp"
)
set(RUNTIME_LAYER_SOURCES
"${SRC_DIR}/runtime/layers/RuntimeLayerModel.cpp"
"${SRC_DIR}/runtime/layers/RuntimeLayerReload.cpp"
"${SRC_DIR}/runtime/layers/RuntimeLayerSnapshot.cpp"
"${SRC_DIR}/runtime/layers/RuntimeLayerStateRestore.cpp"
)
set(RUNTIME_TEXT_SOURCES
"${SRC_DIR}/runtime/text/FontAtlasBuilder.cpp"
"${SRC_DIR}/runtime/text/FontAtlasImageLoader.cpp"
"${SRC_DIR}/runtime/text/FontAtlasMetadata.cpp"
"${SRC_DIR}/runtime/text/FontAtlasProcess.cpp"
"${SRC_DIR}/runtime/text/RuntimeTextTextureComposer.cpp"
)
set(RUNTIME_CATALOG_SOURCES
"${SRC_DIR}/runtime/catalog/SupportedShaderCatalog.cpp"
)
set(SHADER_MANIFEST_SOURCES
"${SRC_DIR}/shader/ShaderManifestAssets.cpp"
"${SRC_DIR}/shader/ShaderManifestParameters.cpp"
"${SRC_DIR}/shader/ShaderManifestParser.cpp"
"${SRC_DIR}/shader/ShaderPackageRegistry.cpp"
)
set(SLANG_RUNTIME_FILES set(SLANG_RUNTIME_FILES
"${SLANG_ROOT}/bin/slangc.exe" "${SLANG_ROOT}/bin/slangc.exe"
"${SLANG_ROOT}/bin/slang-compiler.dll" "${SLANG_ROOT}/bin/slang-compiler.dll"
@@ -83,32 +123,11 @@ set(RENDER_CADENCE_APP_REQUIRED_FILES
"${SRC_DIR}/RenderCadenceCompositor.cpp" "${SRC_DIR}/RenderCadenceCompositor.cpp"
"${SRC_DIR}/video/DeckLinkAPI_i.c" "${SRC_DIR}/video/DeckLinkAPI_i.c"
"${SRC_DIR}/video/DeckLinkAPI_h.h" "${SRC_DIR}/video/DeckLinkAPI_h.h"
"${SRC_DIR}/video/DeckLinkDisplayMode.cpp"
"${SRC_DIR}/video/DeckLinkDisplayMode.h"
"${SRC_DIR}/video/DeckLinkSession.cpp"
"${SRC_DIR}/video/DeckLinkSession.h"
"${SRC_DIR}/video/DeckLinkVideoIOFormat.cpp"
"${SRC_DIR}/video/DeckLinkVideoIOFormat.h"
"${SRC_DIR}/video/VideoIOFormat.cpp"
"${SRC_DIR}/video/VideoIOFormat.h"
"${SRC_DIR}/video/VideoIOTypes.h"
"${SRC_DIR}/render/GLExtensions.cpp"
"${SRC_DIR}/render/GLExtensions.h"
"${SRC_DIR}/render/Std140Buffer.h"
"${SRC_DIR}/runtime/state/RuntimeJson.cpp"
"${SRC_DIR}/runtime/state/RuntimeJson.h"
"${SRC_DIR}/runtime/state/RuntimeParameterUtils.cpp"
"${SRC_DIR}/runtime/state/RuntimeParameterUtils.h"
"${SRC_DIR}/shader/ShaderCompiler.cpp"
"${SRC_DIR}/shader/ShaderCompiler.h"
"${SRC_DIR}/shader/ShaderPackageRegistry.cpp"
"${SRC_DIR}/shader/ShaderPackageRegistry.h"
"${SRC_DIR}/shader/ShaderTypes.h"
) )
video_shader_files_exist(RENDER_CADENCE_APP_MISSING_FILES ${RENDER_CADENCE_APP_REQUIRED_FILES}) video_shader_files_exist(RENDER_CADENCE_APP_MISSING_FILES ${RENDER_CADENCE_APP_REQUIRED_FILES})
if(RENDER_CADENCE_APP_MISSING_FILES) if(RENDER_CADENCE_APP_MISSING_FILES)
message(STATUS "RenderCadenceCompositor target skipped; source reorganization has not provided these legacy shared files:") message(STATUS "RenderCadenceCompositor target skipped; required app entry or external DeckLink SDK shim files are missing:")
foreach(missing_file IN LISTS RENDER_CADENCE_APP_MISSING_FILES) foreach(missing_file IN LISTS RENDER_CADENCE_APP_MISSING_FILES)
message(STATUS " ${missing_file}") message(STATUS " ${missing_file}")
endforeach() endforeach()

94
tests/CMakeLists.txt
View File

@@ -40,56 +40,32 @@ add_video_shader_test(RenderCadenceCompositorRuntimeShaderParamsTests
) )
add_video_shader_test(RenderCadenceCompositorRuntimeLayerModelTests add_video_shader_test(RenderCadenceCompositorRuntimeLayerModelTests
"${SRC_DIR}/runtime/text/FontAtlasBuilder.cpp" ${RUNTIME_LAYER_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasImageLoader.cpp" ${RUNTIME_TEXT_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasMetadata.cpp" ${RUNTIME_PARAMETER_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasProcess.cpp" ${RUNTIME_CATALOG_SOURCES}
"${SRC_DIR}/runtime/layers/RuntimeLayerModel.cpp" ${SHADER_MANIFEST_SOURCES}
"${SRC_DIR}/runtime/layers/RuntimeLayerReload.cpp"
"${SRC_DIR}/runtime/layers/RuntimeLayerSnapshot.cpp"
"${SRC_DIR}/runtime/layers/RuntimeLayerStateRestore.cpp"
"${SRC_DIR}/runtime/state/RuntimeJson.cpp"
"${SRC_DIR}/runtime/state/RuntimeParameterUtils.cpp"
"${SRC_DIR}/runtime/text/RuntimeTextTextureComposer.cpp"
"${SRC_DIR}/runtime/catalog/SupportedShaderCatalog.cpp"
"${SRC_DIR}/shader/ShaderManifestAssets.cpp"
"${SRC_DIR}/shader/ShaderManifestParameters.cpp"
"${SRC_DIR}/shader/ShaderManifestParser.cpp"
"${SRC_DIR}/shader/ShaderPackageRegistry.cpp"
"${TEST_DIR}/RenderCadenceCompositorRuntimeLayerModelTests.cpp" "${TEST_DIR}/RenderCadenceCompositorRuntimeLayerModelTests.cpp"
) )
add_video_shader_test(RuntimeStatePersistenceTests add_video_shader_test(RuntimeStatePersistenceTests
"${SRC_DIR}/logging/Logger.cpp" "${SRC_DIR}/logging/Logger.cpp"
"${SRC_DIR}/runtime/state/RuntimeJson.cpp" ${RUNTIME_STATE_SOURCES}
"${SRC_DIR}/runtime/state/RuntimeStatePersistence.cpp"
"${TEST_DIR}/RuntimeStatePersistenceTests.cpp" "${TEST_DIR}/RuntimeStatePersistenceTests.cpp"
) )
add_video_shader_test(FontAtlasBuilderTests add_video_shader_test(FontAtlasBuilderTests
"${SRC_DIR}/runtime/text/FontAtlasBuilder.cpp" ${RUNTIME_TEXT_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasImageLoader.cpp" ${RUNTIME_JSON_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasMetadata.cpp" ${SHADER_MANIFEST_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasProcess.cpp"
"${SRC_DIR}/runtime/state/RuntimeJson.cpp"
"${SRC_DIR}/shader/ShaderManifestAssets.cpp"
"${SRC_DIR}/shader/ShaderManifestParameters.cpp"
"${SRC_DIR}/shader/ShaderManifestParser.cpp"
"${SRC_DIR}/shader/ShaderPackageRegistry.cpp"
"${TEST_DIR}/FontAtlasBuilderTests.cpp" "${TEST_DIR}/FontAtlasBuilderTests.cpp"
) )
add_video_shader_test(RenderCadenceCompositorSupportedShaderCatalogTests add_video_shader_test(RenderCadenceCompositorSupportedShaderCatalogTests
"${SRC_DIR}/runtime/text/FontAtlasBuilder.cpp" ${RUNTIME_TEXT_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasImageLoader.cpp" ${RUNTIME_JSON_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasMetadata.cpp" ${RUNTIME_CATALOG_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasProcess.cpp" ${SHADER_MANIFEST_SOURCES}
"${SRC_DIR}/runtime/state/RuntimeJson.cpp"
"${SRC_DIR}/runtime/catalog/SupportedShaderCatalog.cpp"
"${SRC_DIR}/shader/ShaderManifestAssets.cpp"
"${SRC_DIR}/shader/ShaderManifestParameters.cpp"
"${SRC_DIR}/shader/ShaderManifestParser.cpp"
"${SRC_DIR}/shader/ShaderPackageRegistry.cpp"
"${TEST_DIR}/RenderCadenceCompositorSupportedShaderCatalogTests.cpp" "${TEST_DIR}/RenderCadenceCompositorSupportedShaderCatalogTests.cpp"
) )
@@ -97,22 +73,11 @@ add_video_shader_test(RenderCadenceCompositorRuntimeStateJsonTests
"${SRC_DIR}/app/AppConfig.cpp" "${SRC_DIR}/app/AppConfig.cpp"
"${SRC_DIR}/app/AppConfigProvider.cpp" "${SRC_DIR}/app/AppConfigProvider.cpp"
"${SRC_DIR}/json/JsonWriter.cpp" "${SRC_DIR}/json/JsonWriter.cpp"
"${SRC_DIR}/runtime/text/FontAtlasBuilder.cpp" ${RUNTIME_LAYER_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasImageLoader.cpp" ${RUNTIME_TEXT_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasMetadata.cpp" ${RUNTIME_PARAMETER_SOURCES}
"${SRC_DIR}/runtime/text/FontAtlasProcess.cpp" ${RUNTIME_CATALOG_SOURCES}
"${SRC_DIR}/runtime/state/RuntimeJson.cpp" ${SHADER_MANIFEST_SOURCES}
"${SRC_DIR}/runtime/layers/RuntimeLayerModel.cpp"
"${SRC_DIR}/runtime/layers/RuntimeLayerReload.cpp"
"${SRC_DIR}/runtime/layers/RuntimeLayerSnapshot.cpp"
"${SRC_DIR}/runtime/layers/RuntimeLayerStateRestore.cpp"
"${SRC_DIR}/runtime/state/RuntimeParameterUtils.cpp"
"${SRC_DIR}/runtime/text/RuntimeTextTextureComposer.cpp"
"${SRC_DIR}/runtime/catalog/SupportedShaderCatalog.cpp"
"${SRC_DIR}/shader/ShaderManifestAssets.cpp"
"${SRC_DIR}/shader/ShaderManifestParameters.cpp"
"${SRC_DIR}/shader/ShaderManifestParser.cpp"
"${SRC_DIR}/shader/ShaderPackageRegistry.cpp"
"${TEST_DIR}/RenderCadenceCompositorRuntimeStateJsonTests.cpp" "${TEST_DIR}/RenderCadenceCompositorRuntimeStateJsonTests.cpp"
) )
@@ -123,7 +88,7 @@ add_video_shader_test(RenderCadenceCompositorHttpControlServerTests
"${SRC_DIR}/control/http/HttpControlServerWebSocket.cpp" "${SRC_DIR}/control/http/HttpControlServerWebSocket.cpp"
"${SRC_DIR}/json/JsonWriter.cpp" "${SRC_DIR}/json/JsonWriter.cpp"
"${SRC_DIR}/logging/Logger.cpp" "${SRC_DIR}/logging/Logger.cpp"
"${SRC_DIR}/runtime/state/RuntimeJson.cpp" ${RUNTIME_JSON_SOURCES}
"${TEST_DIR}/RenderCadenceCompositorHttpControlServerTests.cpp" "${TEST_DIR}/RenderCadenceCompositorHttpControlServerTests.cpp"
) )
target_link_libraries(RenderCadenceCompositorHttpControlServerTests PRIVATE Ws2_32) target_link_libraries(RenderCadenceCompositorHttpControlServerTests PRIVATE Ws2_32)
@@ -131,37 +96,30 @@ target_link_libraries(RenderCadenceCompositorHttpControlServerTests PRIVATE Ws2_
add_video_shader_test(RenderCadenceCompositorAppConfigProviderTests add_video_shader_test(RenderCadenceCompositorAppConfigProviderTests
"${SRC_DIR}/app/AppConfig.cpp" "${SRC_DIR}/app/AppConfig.cpp"
"${SRC_DIR}/app/AppConfigProvider.cpp" "${SRC_DIR}/app/AppConfigProvider.cpp"
"${SRC_DIR}/runtime/state/RuntimeJson.cpp" ${RUNTIME_JSON_SOURCES}
"${TEST_DIR}/RenderCadenceCompositorAppConfigProviderTests.cpp" "${TEST_DIR}/RenderCadenceCompositorAppConfigProviderTests.cpp"
) )
add_video_shader_test(RuntimeJsonTests add_video_shader_test(RuntimeJsonTests
"${SRC_DIR}/runtime/state/RuntimeJson.cpp" ${RUNTIME_JSON_SOURCES}
"${TEST_DIR}/RuntimeJsonTests.cpp" "${TEST_DIR}/RuntimeJsonTests.cpp"
) )
add_video_shader_test(RuntimeParameterUtilsTests add_video_shader_test(RuntimeParameterUtilsTests
"${SRC_DIR}/runtime/state/RuntimeJson.cpp" ${RUNTIME_PARAMETER_SOURCES}
"${SRC_DIR}/runtime/state/RuntimeParameterUtils.cpp"
"${TEST_DIR}/RuntimeParameterUtilsTests.cpp" "${TEST_DIR}/RuntimeParameterUtilsTests.cpp"
) )
add_video_shader_test(ShaderPackageRegistryTests add_video_shader_test(ShaderPackageRegistryTests
"${SRC_DIR}/runtime/state/RuntimeJson.cpp" ${RUNTIME_JSON_SOURCES}
"${SRC_DIR}/shader/ShaderManifestAssets.cpp" ${SHADER_MANIFEST_SOURCES}
"${SRC_DIR}/shader/ShaderManifestParameters.cpp"
"${SRC_DIR}/shader/ShaderManifestParser.cpp"
"${SRC_DIR}/shader/ShaderPackageRegistry.cpp"
"${TEST_DIR}/ShaderPackageRegistryTests.cpp" "${TEST_DIR}/ShaderPackageRegistryTests.cpp"
) )
add_video_shader_test(ShaderSlangValidationTests add_video_shader_test(ShaderSlangValidationTests
"${SRC_DIR}/runtime/state/RuntimeJson.cpp" ${RUNTIME_JSON_SOURCES}
"${SRC_DIR}/shader/ShaderCompiler.cpp" "${SRC_DIR}/shader/ShaderCompiler.cpp"
"${SRC_DIR}/shader/ShaderManifestAssets.cpp" ${SHADER_MANIFEST_SOURCES}
"${SRC_DIR}/shader/ShaderManifestParameters.cpp"
"${SRC_DIR}/shader/ShaderManifestParser.cpp"
"${SRC_DIR}/shader/ShaderPackageRegistry.cpp"
"${TEST_DIR}/ShaderSlangValidationTests.cpp" "${TEST_DIR}/ShaderSlangValidationTests.cpp"
) )