GPU Display: Move different source files to subfolders to clean up display folders a bit"

Author: davidrohr

GPU/GPUTracking/display/CMakeLists.txt

@@ -51,23 +51,23 @@ endif()
 
 set(SRCS ../utils/qsem.cxx
          GPUDisplay.cxx
-         GPUDisplayMagneticField.cxx
-         GPUDisplayFrontend.cxx
-         GPUDisplayBackend.cxx
-         GPUDisplayBackendOpenGL.cxx
-         GPUDisplayFrontendGlfw.cxx)
+         helpers/GPUDisplayMagneticField.cxx
+         frontend/GPUDisplayFrontend.cxx
+         frontend/GPUDisplayFrontendGlfw.cxx
+         backend/GPUDisplayBackend.cxx
+         backend/GPUDisplayBackendOpenGL.cxx)
 
-set(SRCS_NO_H GPUDisplayLoader.cxx
-              GPUDisplayBackendOpenGLMagneticField.cxx
-              GPUDisplayQuaternion.cxx
-              GPUDisplayInterpolation.cxx
-              GPUDisplayKeys.cxx
-              GPUDisplayROOT.cxx)
+set(SRCS_NO_H helpers/GPUDisplayLoader.cxx
+              helpers/GPUDisplayBackendOpenGLMagneticField.cxx
+              helpers/GPUDisplayQuaternion.cxx
+              helpers/GPUDisplayInterpolation.cxx
+              helpers/GPUDisplayROOT.cxx
+              frontend/GPUDisplayKeys.cxx)
 
-set(HDRS_INSTALL GPUDisplayShaders.h)
+set(HDRS_INSTALL shaders/GPUDisplayShaders.h)
 
 if(GPUCA_EVENT_DISPLAY_VULKAN)
-  set(SRCS ${SRCS} GPUDisplayBackendVulkan.cxx)
+  set(SRCS ${SRCS} backend/GPUDisplayBackendVulkan.cxx)
   if(GPUCA_EVENT_DISPLAY_WAYLAND)
     add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-shell-client-protocol.h
@@ -94,28 +94,28 @@ if(GPUCA_EVENT_DISPLAY_VULKAN)
       MAIN_DEPENDENCY ${O2GPUWayland_PROTOCOLS_DIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
       COMMENT "Preparing Wayland xdg-decoration-protocol.c")
 
-    set_property(SOURCE GPUDisplayFrontendWayland.cxx ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-shell-protocol.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-shell-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-decoration-client-protocol.h)
-    set_property(SOURCE GPUDisplayFrontendWayland.cxx APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/)
+    set_property(SOURCE frontend/GPUDisplayFrontendWayland.cxx ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-shell-protocol.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-shell-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-decoration-client-protocol.h)
+    set_property(SOURCE frontend/GPUDisplayFrontendWayland.cxx APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/)
 
-    set(SRCS_NO_H ${SRCS_NO_H} GPUDisplayFrontendWayland.cxx ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-shell-protocol.c ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-decoration-protocol.c)
+    set(SRCS_NO_H ${SRCS_NO_H} frontend/GPUDisplayFrontendWayland.cxx ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-shell-protocol.c ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/xdg-decoration-protocol.c)
   endif()
 endif()
 
 if(X11_FOUND)
-  set(SRCS ${SRCS} GPUDisplayFrontendX11.cxx)
+  set(SRCS ${SRCS} frontend/GPUDisplayFrontendX11.cxx)
 endif()
 
 if(GLUT_FOUND)
-  set(SRCS ${SRCS} GPUDisplayFrontendGlut.cxx)
+  set(SRCS ${SRCS} frontend/GPUDisplayFrontendGlut.cxx)
 endif()
 
 if(GPUCA_EVENT_DISPLAY_QT)
   set(CMAKE_AUTOMOC ON)
   set(CMAKE_AUTORCC ON)
   set(CMAKE_AUTOUIC ON)
 
-  set(SRCS ${SRCS} GPUDisplayGUI.cxx GPUDisplayGUIWrapper.cxx)
-  set(SRCS_NO_H ${SRCS_NO_H} GPUDisplayGUI.ui)
+  set(SRCS ${SRCS} frontend/GPUDisplayGUI.cxx frontend/GPUDisplayGUIWrapper.cxx)
+  set(SRCS_NO_H ${SRCS_NO_H} frontend/GPUDisplayGUI.ui)
 endif()
 
 string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
@@ -136,7 +136,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
           TARGETVARNAME exporterName
           COMPONENT_NAME gpu
           PUBLIC_LINK_LIBRARIES O2::Field O2::GPUTracking Boost::program_options
-          SOURCES tools/field-uniform-exporter.cxx GPUDisplayMagneticField.cxx)
+      SOURCES helpers/field-uniform-exporter.cxx helpers/GPUDisplayMagneticField.cxx)
 
   target_compile_definitions(${exporterName} PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
 endif()
@@ -156,6 +156,7 @@ endif()
 
 message(STATUS "Building GPU Event Display (Vulkan ${GPUCA_EVENT_DISPLAY_VULKAN}, Wayland ${GPUCA_EVENT_DISPLAY_WAYLAND}, Freetype ${GPUCA_EVENT_DISPLAY_FREETYPE}, Fontconfig ${Fontconfig_FOUND}, Qt ${GPUCA_EVENT_DISPLAY_QT})")
 target_link_libraries(${targetName} PUBLIC ${GLFW_LIBRARIES} OpenGL::GL)
+target_include_directories(${targetName} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(X11_FOUND)
   target_link_libraries(${targetName} PRIVATE X11::X11)

GPU/GPUTracking/display/GPUDisplay.cxx

@@ -29,7 +29,7 @@
 #include <type_traits>
 
 #ifndef _WIN32
-#include "bitmapfile.h"
+#include "helpers/bitmapfile.h"
 #include "../utils/linux_helpers.h"
 #endif
 #ifdef WITH_OPENMP
@@ -69,8 +69,8 @@
 #include "ITSMFTBase/DPLAlpideParam.h"
 #endif
 
-#include "GPUDisplayFrontend.h"
-#include "GPUDisplayBackend.h"
+#include "frontend/GPUDisplayFrontend.h"
+#include "backend/GPUDisplayBackend.h"
 
 constexpr hmm_mat4 MY_HMM_IDENTITY = {{{1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}, {0, 0, 0, 1}}};
 constexpr hmm_mat4 MY_HMM_FROM(float (&v)[16]) { return {{{v[0], v[1], v[2], v[3]}, {v[4], v[5], v[6], v[7]}, {v[8], v[9], v[10], v[11]}, {v[12], v[13], v[14], v[15]}}}; }

GPU/GPUTracking/display/GPUDisplay.h

@@ -16,8 +16,8 @@
 #define GPUDISPLAY_H
 
 #include "GPUSettings.h"
-#include "GPUDisplayFrontend.h"
-#include "GPUDisplayBackend.h"
+#include "frontend/GPUDisplayFrontend.h"
+#include "backend/GPUDisplayBackend.h"
 #include "GPUDisplayInterface.h"
 
 #include "GPUChainTracking.h"

…PUTracking/display/GPUDisplayBackend.cxx …ng/display/backend/GPUDisplayBackend.cxxGPU/GPUTracking/display/GPUDisplayBackend.cxx renamed to GPU/GPUTracking/display/backend/GPUDisplayBackend.cxx GPU/GPUTracking/display/GPUDisplayBackend.cxx renamed to GPU/GPUTracking/display/backend/GPUDisplayBackend.cxx

@@ -13,7 +13,7 @@
 /// \author David Rohr
 
 #include "GPUDisplayBackend.h"
-#include "GPUDisplayMagneticField.h"
+#include "helpers/GPUDisplayMagneticField.h"
 
 #include "GPUDisplayBackendOpenGL.h"
 

…/GPUTracking/display/GPUDisplayBackend.h …king/display/backend/GPUDisplayBackend.hGPU/GPUTracking/display/GPUDisplayBackend.h renamed to GPU/GPUTracking/display/backend/GPUDisplayBackend.h GPU/GPUTracking/display/GPUDisplayBackend.h renamed to GPU/GPUTracking/display/backend/GPUDisplayBackend.h

@@ -25,7 +25,7 @@
 
 #include "GPUCommonDef.h"
 #include "GPUDisplayBackendOpenGL.h"
-#include "GPUDisplayShaders.h"
+#include "shaders/GPUDisplayShaders.h"
 #include "GPUDisplay.h"
 
 #define OPENGL_EMULATE_MULTI_DRAW 0