GPU Display: Improvements and modernization, mostly for the Wayland frontend

GPU/GPUTracking/CMakeLists.txt

@@ -27,7 +27,7 @@ set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER} "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_T
 
 include(cmake/helpers.cmake)
 
-if((ALIGPU_BUILD_TYPE STREQUAL "Standalone" AND GPUCA_BUILD_EVENT_DISPLAY) OR (ALIGPU_BUILD_TYPE STREQUAL "O2" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND TARGET AliceO2::DebugGUI AND OPENGL_FOUND AND GLFW_FOUND AND (NOT DEFINED GPUCA_BUILD_EVENT_DISPLAY OR NOT GPUCA_BUILD_EVENT_DISPLAY)))
+if((ALIGPU_BUILD_TYPE STREQUAL "Standalone" AND GPUCA_BUILD_EVENT_DISPLAY) OR (ALIGPU_BUILD_TYPE STREQUAL "O2" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND TARGET AliceO2::DebugGUI AND (NOT DEFINED GPUCA_BUILD_EVENT_DISPLAY OR GPUCA_BUILD_EVENT_DISPLAY)))
   set(GPUCA_EVENT_DISPLAY ON)
 endif()
 if(ROOT_FOUND)

GPU/GPUTracking/Definitions/GPUSettingsList.h

@@ -499,12 +499,13 @@ AddOption(camLookOrigin, bool, false, "", 0, "Make the camera look at the origin
 AddOption(camYUp, bool, false, "", 0, "Orient the camera such that the y-axis is always upwards")
 AddOption(cameraMode, int32_t, 0, "", 0, "Camera mode")
 AddOption(fullScreen, bool, false, "", 0, "Full Screen")
-AddOption(maximized, bool, false, "", 0, "Full Screen")
-AddOption(openGLCore, bool, false, "", 0, "Use renderer path for OpenGL core profile")
+AddOption(maximized, bool, true, "", 0, "Maximized window")
+AddOption(rendererCompatSmoothing, bool, false, "", 0, "Use compat smoothing (if available) of instad of shader for smooth lines / points")
 AddOption(drawQualityMSAA, int32_t, 0, "", 0, "MultiSample Anti Aliasing")
 AddOption(drawQualityDownsampleFSAA, int32_t, 0, "", 0, "Downsampling Anti Aliasing")
 AddOption(drawQualityVSync, bool, true, "", 0, "Enable Vertical Sync")
-AddOption(maxFPSRate, int32_t, 0, "", 0, "Do not limit FPS but run at maximum possible rate")
+AddOption(maxFPSRate, bool, false, "", 0, "Do not limit FPS but run at maximum possible rate")
+AddOption(fpsRate, int32_t, 100, "", 0, "Target frame rate (frames per second) if not running at maximum rate (0 = no limit)")
 AddOption(useGLIndirectDraw, bool, true, "", 0, "Use OpenGL indirect draws to reduce number of draw calls")
 AddOption(screenshotScaleFactor, int32_t, 1, "", 0, "Resolution scale factor when taking screenshots")
 AddOption(fov, int32_t, 45, "", 0, "Display FOV")
@@ -513,7 +514,7 @@ EndConfig()
 
 // Vulkan Display Settings
 BeginSubConfig(GPUSettingsDisplayVulkan, vulkan, configStandalone.display, "GLV", 0, "Vulkan display settings", display_vulkan)
-AddOption(nFramesInFlight, int32_t, 0, "", 0, "Max number of render frames in flight (0 = as many as swapchain images)")
+AddOption(nFramesInFlight, uint32_t, 3, "", 0, "Max number of render frames in flight")
 AddOption(uniformBuffersInDeviceMemory, bool, 1, "", 0, "Have uniform buffers in host-accessible device memory")
 AddOption(forceDevice, int32_t, -1, "", 0, "Force Vulkan device number to use")
 AddHelp("help", 'h')

GPU/GPUTracking/Global/GPUChainTracking.cxx

@@ -68,7 +68,12 @@ GPUChainTracking::GPUChainTracking(GPUReconstruction* rec, uint32_t maxTPCHits,
   mFlatObjectsDevice.mChainTracking = this;
 }
 
-GPUChainTracking::~GPUChainTracking() = default;
+GPUChainTracking::~GPUChainTracking()
+{
+  if (mDisplayRunning) {
+    GetProcessingSettings().eventDisplay->StopDisplay();
+  }
+}
 
 void GPUChainTracking::RegisterPermanentMemoryAndProcessors()
 {
@@ -861,16 +866,13 @@ int32_t GPUChainTracking::RunChainFinalize()
         } else if (iKey == 'n') {
           break;
         } else if (iKey) {
-          while (GetProcessingSettings().eventDisplay->getSendKey() != 0) {
-            usleep(1000);
-          }
-          GetProcessingSettings().eventDisplay->setSendKey(iKey);
+          GetProcessingSettings().eventDisplay->sendKey(iKey);
         }
       }
     } while (GetProcessingSettings().eventDisplay->getDisplayControl() == 0);
     if (GetProcessingSettings().eventDisplay->getDisplayControl() == 2) {
       mDisplayRunning = false;
-      GetProcessingSettings().eventDisplay->DisplayExit();
+      GetProcessingSettings().eventDisplay->StopDisplay();
       const_cast<GPUSettingsProcessing&>(GetProcessingSettings()).eventDisplay = nullptr; // TODO: fixme - eventDisplay should probably not be put into ProcessingSettings in the first place
       return GPUReconstruction::retValValue::retDoExit;
     }

GPU/GPUTracking/Interface/GPUO2InterfaceDisplay.cxx

@@ -39,7 +39,7 @@ GPUO2InterfaceDisplay::GPUO2InterfaceDisplay(const GPUO2InterfaceConfiguration*
 
 GPUO2InterfaceDisplay::~GPUO2InterfaceDisplay() = default;
 
-int32_t GPUO2InterfaceDisplay::startDisplay()
+int32_t GPUO2InterfaceDisplay::StartUnmanagedDisplay()
 {
   int32_t retVal = mDisplay->StartDisplay();
   if (retVal) {
@@ -71,9 +71,9 @@ int32_t GPUO2InterfaceDisplay::show(const GPUTrackingInOutPointers* ptrs)
   return 0;
 }
 
-int32_t GPUO2InterfaceDisplay::endDisplay()
+int32_t GPUO2InterfaceDisplay::StopUnmanagedDisplay()
 {
-  mFrontend->DisplayExit();
+  mFrontend->StopDisplay();
   return 0;
 }
 

GPU/GPUTracking/Interface/GPUO2InterfaceDisplay.h

@@ -37,9 +37,9 @@ class GPUO2InterfaceDisplay
 
   void UpdateCalib(const GPUCalibObjectsConst* calib);
   void UpdateGRP(const GPUSettingsGRP* grp);
-  int32_t startDisplay();
+  int32_t StartUnmanagedDisplay();
   int32_t show(const GPUTrackingInOutPointers* ptrs);
-  int32_t endDisplay();
+  int32_t StopUnmanagedDisplay();
 
  private:
   std::unique_ptr<GPUDisplayInterface> mDisplay;

GPU/GPUTracking/Standalone/CMakeLists.txt

@@ -96,7 +96,7 @@ if(GPUCA_BUILD_EVENT_DISPLAY)
     find_package(Fontconfig REQUIRED)
   endif()
   if(GPUCA_BUILD_EVENT_DISPLAY_VULKAN)
-    find_package(Vulkan REQUIRED)
+    find_package(Vulkan 1.4.328 REQUIRED)
     if (Vulkan_GLSLC_EXECUTABLE STREQUAL "Vulkan_GLSLC_EXECUTABLE-NOTFOUND")
       message(FATAL_ERROR ${Vulkan_GLSLC_EXECUTABLE})
     endif()