re organisation

CMakeLists.txt

@@ -102,32 +102,34 @@ set(APP_SOURCES
 	"${APP_DIR}/platform/NativeHandles.h"
 	"${APP_DIR}/platform/NativeSockets.h"
 	"${APP_DIR}/resource.h"
-	"${APP_DIR}/runtime/HealthTelemetry.cpp"
-	"${APP_DIR}/runtime/HealthTelemetry.h"
-	"${APP_DIR}/runtime/LayerStackStore.cpp"
-	"${APP_DIR}/runtime/LayerStackStore.h"
-	"${APP_DIR}/runtime/RenderSnapshotBuilder.cpp"
-	"${APP_DIR}/runtime/RenderSnapshotBuilder.h"
-	"${APP_DIR}/runtime/RuntimeConfigStore.cpp"
-	"${APP_DIR}/runtime/RuntimeConfigStore.h"
-	"${APP_DIR}/runtime/RuntimeCoordinator.cpp"
-	"${APP_DIR}/runtime/RuntimeCoordinator.h"
-	"${APP_DIR}/runtime/RuntimeSnapshotProvider.cpp"
-	"${APP_DIR}/runtime/RuntimeSnapshotProvider.h"
-	"${APP_DIR}/runtime/RuntimeStateJson.cpp"
-	"${APP_DIR}/runtime/RuntimeStateJson.h"
-	"${APP_DIR}/runtime/RuntimeStatePresenter.cpp"
-	"${APP_DIR}/runtime/RuntimeStatePresenter.h"
-	"${APP_DIR}/runtime/RuntimeClock.cpp"
-	"${APP_DIR}/runtime/RuntimeClock.h"
-	"${APP_DIR}/runtime/RuntimeJson.cpp"
-	"${APP_DIR}/runtime/RuntimeJson.h"
-	"${APP_DIR}/runtime/RuntimeParameterUtils.cpp"
-	"${APP_DIR}/runtime/RuntimeParameterUtils.h"
-	"${APP_DIR}/runtime/RuntimeStore.cpp"
-	"${APP_DIR}/runtime/RuntimeStore.h"
-	"${APP_DIR}/runtime/ShaderPackageCatalog.cpp"
-	"${APP_DIR}/runtime/ShaderPackageCatalog.h"
+	"${APP_DIR}/runtime/coordination/RuntimeCoordinator.cpp"
+	"${APP_DIR}/runtime/coordination/RuntimeCoordinator.h"
+	"${APP_DIR}/runtime/legacy/RuntimeHost.cpp"
+	"${APP_DIR}/runtime/legacy/RuntimeHost.h"
+	"${APP_DIR}/runtime/presentation/RuntimeStateJson.cpp"
+	"${APP_DIR}/runtime/presentation/RuntimeStateJson.h"
+	"${APP_DIR}/runtime/presentation/RuntimeStatePresenter.cpp"
+	"${APP_DIR}/runtime/presentation/RuntimeStatePresenter.h"
+	"${APP_DIR}/runtime/snapshot/RenderSnapshotBuilder.cpp"
+	"${APP_DIR}/runtime/snapshot/RenderSnapshotBuilder.h"
+	"${APP_DIR}/runtime/snapshot/RuntimeSnapshotProvider.cpp"
+	"${APP_DIR}/runtime/snapshot/RuntimeSnapshotProvider.h"
+	"${APP_DIR}/runtime/store/LayerStackStore.cpp"
+	"${APP_DIR}/runtime/store/LayerStackStore.h"
+	"${APP_DIR}/runtime/store/RuntimeConfigStore.cpp"
+	"${APP_DIR}/runtime/store/RuntimeConfigStore.h"
+	"${APP_DIR}/runtime/store/RuntimeStore.cpp"
+	"${APP_DIR}/runtime/store/RuntimeStore.h"
+	"${APP_DIR}/runtime/store/ShaderPackageCatalog.cpp"
+	"${APP_DIR}/runtime/store/ShaderPackageCatalog.h"
+	"${APP_DIR}/runtime/support/RuntimeJson.cpp"
+	"${APP_DIR}/runtime/support/RuntimeJson.h"
+	"${APP_DIR}/runtime/support/RuntimeParameterUtils.cpp"
+	"${APP_DIR}/runtime/support/RuntimeParameterUtils.h"
+	"${APP_DIR}/runtime/telemetry/HealthTelemetry.cpp"
+	"${APP_DIR}/runtime/telemetry/HealthTelemetry.h"
+	"${APP_DIR}/runtime/telemetry/RuntimeClock.cpp"
+	"${APP_DIR}/runtime/telemetry/RuntimeClock.h"
 	"${APP_DIR}/shader/ShaderCompiler.cpp"
 	"${APP_DIR}/shader/ShaderCompiler.h"
 	"${APP_DIR}/shader/ShaderPackageRegistry.cpp"
@@ -156,6 +158,13 @@ target_include_directories(LoopThroughWithOpenGLCompositing PRIVATE
 	"${APP_DIR}/gl/shader"
 	"${APP_DIR}/platform"
 	"${APP_DIR}/runtime"
+	"${APP_DIR}/runtime/coordination"
+	"${APP_DIR}/runtime/legacy"
+	"${APP_DIR}/runtime/presentation"
+	"${APP_DIR}/runtime/snapshot"
+	"${APP_DIR}/runtime/store"
+	"${APP_DIR}/runtime/support"
+	"${APP_DIR}/runtime/telemetry"
 	"${APP_DIR}/shader"
 	"${APP_DIR}/videoio"
 	"${APP_DIR}/videoio/decklink"
@@ -182,13 +191,14 @@ if(MSVC)
 endif()
 
 add_executable(RuntimeJsonTests
-	"${APP_DIR}/runtime/RuntimeJson.cpp"
+	"${APP_DIR}/runtime/support/RuntimeJson.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/RuntimeJsonTests.cpp"
 )
 
 target_include_directories(RuntimeJsonTests PRIVATE
 	"${APP_DIR}"
 	"${APP_DIR}/runtime"
+	"${APP_DIR}/runtime/support"
 )
 
 if(MSVC)
@@ -199,13 +209,14 @@ enable_testing()
 add_test(NAME RuntimeJsonTests COMMAND RuntimeJsonTests)
 
 add_executable(RuntimeClockTests
-	"${APP_DIR}/runtime/RuntimeClock.cpp"
+	"${APP_DIR}/runtime/telemetry/RuntimeClock.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/RuntimeClockTests.cpp"
 )
 
 target_include_directories(RuntimeClockTests PRIVATE
 	"${APP_DIR}"
 	"${APP_DIR}/runtime"
+	"${APP_DIR}/runtime/telemetry"
 )
 
 if(MSVC)
@@ -215,14 +226,15 @@ endif()
 add_test(NAME RuntimeClockTests COMMAND RuntimeClockTests)
 
 add_executable(RuntimeParameterUtilsTests
-	"${APP_DIR}/runtime/RuntimeJson.cpp"
-	"${APP_DIR}/runtime/RuntimeParameterUtils.cpp"
+	"${APP_DIR}/runtime/support/RuntimeJson.cpp"
+	"${APP_DIR}/runtime/support/RuntimeParameterUtils.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/RuntimeParameterUtilsTests.cpp"
 )
 
 target_include_directories(RuntimeParameterUtilsTests PRIVATE
 	"${APP_DIR}"
 	"${APP_DIR}/runtime"
+	"${APP_DIR}/runtime/support"
 	"${APP_DIR}/shader"
 )
 
@@ -249,7 +261,7 @@ endif()
 add_test(NAME Std140BufferTests COMMAND Std140BufferTests)
 
 add_executable(ShaderPackageRegistryTests
-	"${APP_DIR}/runtime/RuntimeJson.cpp"
+	"${APP_DIR}/runtime/support/RuntimeJson.cpp"
 	"${APP_DIR}/shader/ShaderPackageRegistry.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/ShaderPackageRegistryTests.cpp"
 )
@@ -257,6 +269,7 @@ add_executable(ShaderPackageRegistryTests
 target_include_directories(ShaderPackageRegistryTests PRIVATE
 	"${APP_DIR}"
 	"${APP_DIR}/runtime"
+	"${APP_DIR}/runtime/support"
 	"${APP_DIR}/shader"
 )
 
@@ -267,7 +280,7 @@ endif()
 add_test(NAME ShaderPackageRegistryTests COMMAND ShaderPackageRegistryTests)
 
 add_executable(ShaderSlangValidationTests
-	"${APP_DIR}/runtime/RuntimeJson.cpp"
+	"${APP_DIR}/runtime/support/RuntimeJson.cpp"
 	"${APP_DIR}/shader/ShaderCompiler.cpp"
 	"${APP_DIR}/shader/ShaderPackageRegistry.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/ShaderSlangValidationTests.cpp"
@@ -277,6 +290,7 @@ target_include_directories(ShaderSlangValidationTests PRIVATE
 	"${APP_DIR}"
 	"${APP_DIR}/platform"
 	"${APP_DIR}/runtime"
+	"${APP_DIR}/runtime/support"
 	"${APP_DIR}/shader"
 )