restructure

CMakeLists.txt

@@ -310,9 +310,9 @@ set(RENDER_CADENCE_APP_SOURCES
 	"${RENDER_CADENCE_APP_DIR}/app/RuntimeLayerController.cpp"
 	"${RENDER_CADENCE_APP_DIR}/app/RuntimeLayerController.h"
 	"${RENDER_CADENCE_APP_DIR}/control/ControlActionResult.h"
-	"${RENDER_CADENCE_APP_DIR}/control/HttpControlServer.cpp"
-	"${RENDER_CADENCE_APP_DIR}/control/HttpControlServer.h"
-	"${RENDER_CADENCE_APP_DIR}/control/HttpControlServerWebSocket.cpp"
+	"${RENDER_CADENCE_APP_DIR}/control/http/HttpControlServer.cpp"
+	"${RENDER_CADENCE_APP_DIR}/control/http/HttpControlServer.h"
+	"${RENDER_CADENCE_APP_DIR}/control/http/HttpControlServerWebSocket.cpp"
 	"${RENDER_CADENCE_APP_DIR}/control/RuntimeStateJson.h"
 	"${RENDER_CADENCE_APP_DIR}/frames/SystemFrameExchange.cpp"
 	"${RENDER_CADENCE_APP_DIR}/frames/SystemFrameExchange.h"
@@ -323,23 +323,23 @@ set(RENDER_CADENCE_APP_SOURCES
 	"${RENDER_CADENCE_APP_DIR}/logging/Logger.h"
 	"${RENDER_CADENCE_APP_DIR}/platform/HiddenGlWindow.cpp"
 	"${RENDER_CADENCE_APP_DIR}/platform/HiddenGlWindow.h"
-	"${RENDER_CADENCE_APP_DIR}/render/Bgra8ReadbackPipeline.cpp"
-	"${RENDER_CADENCE_APP_DIR}/render/Bgra8ReadbackPipeline.h"
-	"${RENDER_CADENCE_APP_DIR}/render/PboReadbackRing.cpp"
-	"${RENDER_CADENCE_APP_DIR}/render/PboReadbackRing.h"
+	"${RENDER_CADENCE_APP_DIR}/render/readback/Bgra8ReadbackPipeline.cpp"
+	"${RENDER_CADENCE_APP_DIR}/render/readback/Bgra8ReadbackPipeline.h"
+	"${RENDER_CADENCE_APP_DIR}/render/readback/PboReadbackRing.cpp"
+	"${RENDER_CADENCE_APP_DIR}/render/readback/PboReadbackRing.h"
 	"${RENDER_CADENCE_APP_DIR}/render/RenderCadenceClock.cpp"
 	"${RENDER_CADENCE_APP_DIR}/render/RenderCadenceClock.h"
 	"${RENDER_CADENCE_APP_DIR}/render/RenderThread.cpp"
 	"${RENDER_CADENCE_APP_DIR}/render/RenderThread.h"
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeShaderRenderer.cpp"
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeShaderRenderer.h"
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeShaderParams.cpp"
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeShaderParams.h"
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeRenderScene.cpp"
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeRenderScene.h"
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeShaderPrepareWorker.cpp"
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeShaderPrepareWorker.h"
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeShaderProgram.h"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeShaderRenderer.cpp"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeShaderRenderer.h"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeShaderParams.cpp"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeShaderParams.h"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeRenderScene.cpp"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeRenderScene.h"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeShaderPrepareWorker.cpp"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeShaderPrepareWorker.h"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeShaderProgram.h"
 	"${RENDER_CADENCE_APP_DIR}/render/SimpleMotionRenderer.cpp"
 	"${RENDER_CADENCE_APP_DIR}/render/SimpleMotionRenderer.h"
 	"${RENDER_CADENCE_APP_DIR}/runtime/RuntimeLayerModel.cpp"
@@ -372,11 +372,14 @@ target_include_directories(RenderCadenceCompositor PRIVATE
 	"${RENDER_CADENCE_APP_DIR}"
 	"${RENDER_CADENCE_APP_DIR}/app"
 	"${RENDER_CADENCE_APP_DIR}/control"
+	"${RENDER_CADENCE_APP_DIR}/control/http"
 	"${RENDER_CADENCE_APP_DIR}/frames"
 	"${RENDER_CADENCE_APP_DIR}/json"
 	"${RENDER_CADENCE_APP_DIR}/logging"
 	"${RENDER_CADENCE_APP_DIR}/platform"
 	"${RENDER_CADENCE_APP_DIR}/render"
+	"${RENDER_CADENCE_APP_DIR}/render/readback"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime"
 	"${RENDER_CADENCE_APP_DIR}/runtime"
 	"${RENDER_CADENCE_APP_DIR}/telemetry"
 	"${RENDER_CADENCE_APP_DIR}/video"
@@ -815,7 +818,7 @@ endif()
 add_test(NAME RenderCadenceCompositorTelemetryTests COMMAND RenderCadenceCompositorTelemetryTests)
 
 add_executable(RenderCadenceCompositorRuntimeShaderParamsTests
-	"${RENDER_CADENCE_APP_DIR}/render/RuntimeShaderParams.cpp"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime/RuntimeShaderParams.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/RenderCadenceCompositorRuntimeShaderParamsTests.cpp"
 )
 
@@ -823,6 +826,7 @@ target_include_directories(RenderCadenceCompositorRuntimeShaderParamsTests PRIVA
 	"${APP_DIR}/gl/shader"
 	"${APP_DIR}/shader"
 	"${RENDER_CADENCE_APP_DIR}/render"
+	"${RENDER_CADENCE_APP_DIR}/render/runtime"
 	"${RENDER_CADENCE_APP_DIR}/runtime"
 )
 
@@ -936,8 +940,8 @@ endif()
 add_test(NAME RenderCadenceCompositorRuntimeStateJsonTests COMMAND RenderCadenceCompositorRuntimeStateJsonTests)
 
 add_executable(RenderCadenceCompositorHttpControlServerTests
-	"${RENDER_CADENCE_APP_DIR}/control/HttpControlServer.cpp"
-	"${RENDER_CADENCE_APP_DIR}/control/HttpControlServerWebSocket.cpp"
+	"${RENDER_CADENCE_APP_DIR}/control/http/HttpControlServer.cpp"
+	"${RENDER_CADENCE_APP_DIR}/control/http/HttpControlServerWebSocket.cpp"
 	"${RENDER_CADENCE_APP_DIR}/json/JsonWriter.cpp"
 	"${RENDER_CADENCE_APP_DIR}/logging/Logger.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/RenderCadenceCompositorHttpControlServerTests.cpp"
@@ -945,6 +949,7 @@ add_executable(RenderCadenceCompositorHttpControlServerTests
 
 target_include_directories(RenderCadenceCompositorHttpControlServerTests PRIVATE
 	"${RENDER_CADENCE_APP_DIR}/control"
+	"${RENDER_CADENCE_APP_DIR}/control/http"
 	"${RENDER_CADENCE_APP_DIR}/json"
 	"${RENDER_CADENCE_APP_DIR}/logging"
 )

apps/RenderCadenceCompositor/README.md

@@ -264,11 +264,13 @@ This app keeps the same core behavior but splits it into modules that can grow:
 
 - `frames/`: system-memory handoff
 - `platform/`: COM/Win32/hidden GL context support
-- `render/`: cadence, simple rendering, PBO readback
-- `render/RuntimeRenderScene`: render-thread-owned GL scene for ready runtime shader layers
-- `render/RuntimeShaderPrepareWorker`: shared-context runtime shader program compile/link worker
+- `render/`: cadence thread, clock, and simple renderer
+- `render/readback/`: PBO-backed BGRA8 readback and completed-frame publication
+- `render/runtime/RuntimeRenderScene`: render-thread-owned GL scene for ready runtime shader layers
+- `render/runtime/RuntimeShaderPrepareWorker`: shared-context runtime shader program compile/link worker
 - `runtime/`: app-owned shader layer readiness model, runtime Slang build bridge, and completed artifact handoff
-- `control/`: local HTTP API edge and runtime-state JSON presentation
+- `control/`: control action results and runtime-state JSON presentation
+- `control/http/`: local HTTP API, static UI serving, OpenAPI serving, and WebSocket updates
 - `json/`: compact JSON serialization helpers
 - `video/`: DeckLink output wrapper and scheduling thread
 - `telemetry/`: cadence telemetry

apps/RenderCadenceCompositor/app/AppConfig.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../control/HttpControlServer.h"
+#include "../control/http/HttpControlServer.h"
 #include "../logging/Logger.h"
 #include "../telemetry/TelemetryHealthMonitor.h"
 #include "../video/DeckLinkOutput.h"

apps/RenderCadenceCompositor/render/RenderThread.cpp

@@ -4,10 +4,10 @@
 #include "../frames/SystemFrameTypes.h"
 #include "../logging/Logger.h"
 #include "../platform/HiddenGlWindow.h"
-#include "Bgra8ReadbackPipeline.h"
+#include "readback/Bgra8ReadbackPipeline.h"
 #include "GLExtensions.h"
-#include "RuntimeRenderScene.h"
-#include "RuntimeShaderRenderer.h"
+#include "runtime/RuntimeRenderScene.h"
+#include "runtime/RuntimeShaderRenderer.h"
 #include "SimpleMotionRenderer.h"
 
 #include <algorithm>

apps/RenderCadenceCompositor/render/RenderThread.h

@@ -3,7 +3,7 @@
 #include "RenderCadenceClock.h"
 #include "../runtime/RuntimeLayerModel.h"
 #include "../runtime/RuntimeShaderArtifact.h"
-#include "RuntimeRenderScene.h"
+#include "runtime/RuntimeRenderScene.h"
 
 #include <atomic>
 #include <condition_variable>

apps/RenderCadenceCompositor/render/runtime/RuntimeRenderScene.cpp

@@ -1,6 +1,6 @@
 #include "RuntimeRenderScene.h"
 
-#include "../platform/HiddenGlWindow.h"
+#include "../../platform/HiddenGlWindow.h"
 
 #include <algorithm>
 #include <functional>

apps/RenderCadenceCompositor/render/runtime/RuntimeShaderPrepareWorker.cpp

@@ -1,6 +1,6 @@
 #include "RuntimeShaderPrepareWorker.h"
 
-#include "../platform/HiddenGlWindow.h"
+#include "../../platform/HiddenGlWindow.h"
 #include "RuntimeShaderRenderer.h"
 
 #include <algorithm>

apps/RenderCadenceCompositor/render/runtime/RuntimeShaderPrepareWorker.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "RuntimeShaderProgram.h"
-#include "../runtime/RuntimeLayerModel.h"
+#include "../../runtime/RuntimeLayerModel.h"
 
 #include <windows.h>
 

apps/RenderCadenceCompositor/render/runtime/RuntimeShaderProgram.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "GLExtensions.h"
-#include "../runtime/RuntimeShaderArtifact.h"
+#include "../../runtime/RuntimeShaderArtifact.h"
 
 #include <string>
 

apps/RenderCadenceCompositor/render/runtime/RuntimeShaderRenderer.h

@@ -2,7 +2,7 @@
 
 #include "GLExtensions.h"
 #include "RuntimeShaderProgram.h"
-#include "../runtime/RuntimeShaderArtifact.h"
+#include "../../runtime/RuntimeShaderArtifact.h"
 
 #include <cstdint>
 #include <string>