Refactor

CMakeLists.txt

@@ -36,43 +36,62 @@ if(NOT EXISTS "${SLANG_LICENSE_FILE}")
 endif()
 
 set(APP_SOURCES
-	"${APP_DIR}/ControlServer.cpp"
-	"${APP_DIR}/ControlServer.h"
 	"${APP_DIR}/DeckLinkAPI_i.c"
-	"${APP_DIR}/GLExtensions.cpp"
-	"${APP_DIR}/GLExtensions.h"
+	"${APP_DIR}/control/ControlServer.cpp"
+	"${APP_DIR}/control/ControlServer.h"
+	"${APP_DIR}/control/OscServer.cpp"
+	"${APP_DIR}/control/OscServer.h"
+	"${APP_DIR}/control/RuntimeControlBridge.cpp"
+	"${APP_DIR}/control/RuntimeControlBridge.h"
+	"${APP_DIR}/decklink/DeckLinkDisplayMode.cpp"
+	"${APP_DIR}/decklink/DeckLinkDisplayMode.h"
+	"${APP_DIR}/decklink/DeckLinkFrameTransfer.cpp"
+	"${APP_DIR}/decklink/DeckLinkFrameTransfer.h"
+	"${APP_DIR}/gl/GLExtensions.cpp"
+	"${APP_DIR}/gl/GLExtensions.h"
+	"${APP_DIR}/gl/GlScopedObjects.h"
+	"${APP_DIR}/gl/OpenGLComposite.cpp"
+	"${APP_DIR}/gl/OpenGLComposite.h"
+	"${APP_DIR}/gl/OpenGLCompositeRuntimeControls.cpp"
+	"${APP_DIR}/gl/Std140Buffer.h"
+	"${APP_DIR}/gl/TextRasterizer.cpp"
+	"${APP_DIR}/gl/TextRasterizer.h"
+	"${APP_DIR}/gl/TextureAssetLoader.cpp"
+	"${APP_DIR}/gl/TextureAssetLoader.h"
+	"${APP_DIR}/gl/VideoFrameTransfer.cpp"
+	"${APP_DIR}/gl/VideoFrameTransfer.h"
 	"${APP_DIR}/LoopThroughWithOpenGLCompositing.cpp"
 	"${APP_DIR}/LoopThroughWithOpenGLCompositing.h"
 	"${APP_DIR}/LoopThroughWithOpenGLCompositing.rc"
-	"${APP_DIR}/NativeHandles.h"
-	"${APP_DIR}/NativeSockets.h"
-	"${APP_DIR}/OpenGLComposite.cpp"
-	"${APP_DIR}/OpenGLComposite.h"
-	"${APP_DIR}/OscServer.cpp"
-	"${APP_DIR}/OscServer.h"
+	"${APP_DIR}/platform/NativeHandles.h"
+	"${APP_DIR}/platform/NativeSockets.h"
 	"${APP_DIR}/resource.h"
-	"${APP_DIR}/RuntimeHost.cpp"
-	"${APP_DIR}/RuntimeHost.h"
-	"${APP_DIR}/RuntimeJson.cpp"
-	"${APP_DIR}/RuntimeJson.h"
-	"${APP_DIR}/RuntimeParameterUtils.cpp"
-	"${APP_DIR}/RuntimeParameterUtils.h"
-	"${APP_DIR}/ShaderCompiler.cpp"
-	"${APP_DIR}/ShaderCompiler.h"
-	"${APP_DIR}/ShaderPackageRegistry.cpp"
-	"${APP_DIR}/ShaderPackageRegistry.h"
-	"${APP_DIR}/ShaderTypes.h"
+	"${APP_DIR}/runtime/RuntimeHost.cpp"
+	"${APP_DIR}/runtime/RuntimeHost.h"
+	"${APP_DIR}/runtime/RuntimeJson.cpp"
+	"${APP_DIR}/runtime/RuntimeJson.h"
+	"${APP_DIR}/runtime/RuntimeParameterUtils.cpp"
+	"${APP_DIR}/runtime/RuntimeParameterUtils.h"
+	"${APP_DIR}/shader/ShaderCompiler.cpp"
+	"${APP_DIR}/shader/ShaderCompiler.h"
+	"${APP_DIR}/shader/ShaderPackageRegistry.cpp"
+	"${APP_DIR}/shader/ShaderPackageRegistry.h"
+	"${APP_DIR}/shader/ShaderTypes.h"
 	"${APP_DIR}/stdafx.cpp"
 	"${APP_DIR}/stdafx.h"
 	"${APP_DIR}/targetver.h"
-	"${APP_DIR}/VideoFrameTransfer.cpp"
-	"${APP_DIR}/VideoFrameTransfer.h"
 )
 
 add_executable(LoopThroughWithOpenGLCompositing WIN32 ${APP_SOURCES})
 
 target_include_directories(LoopThroughWithOpenGLCompositing PRIVATE
 	"${APP_DIR}"
+	"${APP_DIR}/control"
+	"${APP_DIR}/decklink"
+	"${APP_DIR}/gl"
+	"${APP_DIR}/platform"
+	"${APP_DIR}/runtime"
+	"${APP_DIR}/shader"
 	"${GPUDIRECT_DIR}/include"
 )
 
@@ -100,12 +119,13 @@ if(MSVC)
 endif()
 
 add_executable(RuntimeJsonTests
-	"${APP_DIR}/RuntimeJson.cpp"
+	"${APP_DIR}/runtime/RuntimeJson.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/RuntimeJsonTests.cpp"
 )
 
 target_include_directories(RuntimeJsonTests PRIVATE
 	"${APP_DIR}"
+	"${APP_DIR}/runtime"
 )
 
 if(MSVC)
@@ -116,13 +136,15 @@ enable_testing()
 add_test(NAME RuntimeJsonTests COMMAND RuntimeJsonTests)
 
 add_executable(RuntimeParameterUtilsTests
-	"${APP_DIR}/RuntimeJson.cpp"
-	"${APP_DIR}/RuntimeParameterUtils.cpp"
+	"${APP_DIR}/runtime/RuntimeJson.cpp"
+	"${APP_DIR}/runtime/RuntimeParameterUtils.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/RuntimeParameterUtilsTests.cpp"
 )
 
 target_include_directories(RuntimeParameterUtilsTests PRIVATE
 	"${APP_DIR}"
+	"${APP_DIR}/runtime"
+	"${APP_DIR}/shader"
 )
 
 if(MSVC)
@@ -131,14 +153,31 @@ endif()
 
 add_test(NAME RuntimeParameterUtilsTests COMMAND RuntimeParameterUtilsTests)
 
+add_executable(Std140BufferTests
+	"${CMAKE_CURRENT_SOURCE_DIR}/tests/Std140BufferTests.cpp"
+)
+
+target_include_directories(Std140BufferTests PRIVATE
+	"${APP_DIR}"
+	"${APP_DIR}/gl"
+)
+
+if(MSVC)
+	target_compile_options(Std140BufferTests PRIVATE /W3)
+endif()
+
+add_test(NAME Std140BufferTests COMMAND Std140BufferTests)
+
 add_executable(ShaderPackageRegistryTests
-	"${APP_DIR}/RuntimeJson.cpp"
-	"${APP_DIR}/ShaderPackageRegistry.cpp"
+	"${APP_DIR}/runtime/RuntimeJson.cpp"
+	"${APP_DIR}/shader/ShaderPackageRegistry.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/ShaderPackageRegistryTests.cpp"
 )
 
 target_include_directories(ShaderPackageRegistryTests PRIVATE
 	"${APP_DIR}"
+	"${APP_DIR}/runtime"
+	"${APP_DIR}/shader"
 )
 
 if(MSVC)
@@ -148,12 +187,14 @@ endif()
 add_test(NAME ShaderPackageRegistryTests COMMAND ShaderPackageRegistryTests)
 
 add_executable(OscServerTests
-	"${APP_DIR}/OscServer.cpp"
+	"${APP_DIR}/control/OscServer.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/tests/OscServerTests.cpp"
 )
 
 target_include_directories(OscServerTests PRIVATE
 	"${APP_DIR}"
+	"${APP_DIR}/control"
+	"${APP_DIR}/platform"
 )
 
 target_link_libraries(OscServerTests PRIVATE