Merge pull request #1225 from UniStuttgart-VISUS/fix-tracy

Fix tracy and enable CI
UniStuttgart-VISUS · Aug 25, 2023 · ceb591b · ceb591b
2 parents e5e4d7c + 4956d3e
commit ceb591b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/vcpkg_cache.yml b/.github/workflows/vcpkg_cache.yml
@@ -22,8 +22,10 @@ jobs:
         cmake -S . -B ${{ github.workspace }}/build -G "Visual Studio 16 2019"
         -DMEGAMOL_STOP_AFTER_VCPKG=ON
         -DMEGAMOL_USE_CGAL=ON
-        -DMEGAMOL_USE_OSPRAY=ON
         -DMEGAMOL_USE_OPENGL=${{ matrix.opengl }}
+        -DMEGAMOL_USE_OSPRAY=ON
+        -DMEGAMOL_USE_STACKTRACE=ON
+        -DMEGAMOL_USE_TRACY=ON
       env:
         VCPKG_BINARY_SOURCES: "clear;http,https://vcpkg-cache.megamol.org/{triplet}-{name}-{sha},readwrite,Authorization: Token ${{ secrets.CACHING_SERVER_SECRET }}"
   linux:
@@ -48,8 +50,10 @@ jobs:
         cmake -S . -B ${{ github.workspace }}/build -G "Unix Makefiles"
         -DMEGAMOL_STOP_AFTER_VCPKG=ON
         -DMEGAMOL_USE_CGAL=ON
-        -DMEGAMOL_USE_OSPRAY=ON
         -DMEGAMOL_USE_OPENGL=${{ matrix.opengl }}
+        -DMEGAMOL_USE_OSPRAY=ON
+        -DMEGAMOL_USE_STACKTRACE=ON
+        -DMEGAMOL_USE_TRACY=ON
       env:
         CC: ${{ matrix.compiler.cc }}
         CXX: ${{ matrix.compiler.cxx }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,8 @@
 cmake_minimum_required(VERSION 3.15...3.26 FATAL_ERROR)
 
 # Vcpkg setup
-set(MEGAMOL_VCPKG_VERSION "2023.08.09") # Update default-registry baseline in vcpkg-configuration.json when changing!
+set(MEGAMOL_VCPKG_VERSION "12640ddf03a5ccd2fda488dc23a4e8144ba4e4df") # Update default-registry baseline in vcpkg-configuration.json when changing!
+# use vcpkg master on 2023-08-24, need tracy fix from https://github.com/microsoft/vcpkg/pull/33098
 
 include(cmake/megamol_vcpkg_setup.cmake)
 include(cmake/megamol_feature_option.cmake)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -12,6 +12,8 @@ variables:
     -DMEGAMOL_PLUGIN_MEGAMOL101_GL=ON
     -DMEGAMOL_USE_CGAL=ON
     -DMEGAMOL_USE_PROFILING=ON
+    -DMEGAMOL_USE_STACKTRACE=ON
+    -DMEGAMOL_USE_TRACY=ON
     -DMEGAMOL_USE_VTKM=ON
   nonGlConfig: >-
     -DMEGAMOL_VCPKG_DOWNLOAD_CACHE=ON

diff --git a/core/include/mmcore/utility/log/Log.inl b/core/include/mmcore/utility/log/Log.inl
@@ -16,7 +16,7 @@ void Log::writeMessage(log_level level, std::string const& msg, Args&&... args)
     auto fmsg = msg;
     if constexpr (sizeof...(Args) > 0) {
         if (msg.find("%") == std::string::npos) {
-            fmsg = fmt::vformat(msg, fmt::make_format_args(std::forward<Args>(args)...));
+            fmsg = fmt::format(msg, std::forward<Args>(args)...);
         } else {
             fmsg = fmt::sprintf(msg, std::forward<Args>(args)...);
         }

diff --git a/frontend/main/src/main.cpp b/frontend/main/src/main.cpp
@@ -258,7 +258,7 @@ int main(const int argc, const char** argv) {
 
     const auto render_next_frame = [&]() -> bool {
 #ifdef MEGAMOL_USE_TRACY
-        ZoneScopedN("RenderNextFrame", 0x0000FF);
+        ZoneScopedNC("RenderNextFrame", 0x0000FF);
 #endif
 
         // services: receive inputs (GLFW poll events [keyboard, mouse, window], network, lua)

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -1,7 +1,7 @@
 {
   "default-registry": {
     "kind": "builtin",
-    "baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2"
+    "baseline": "12640ddf03a5ccd2fda488dc23a4e8144ba4e4df"
   },
   "registries": [
     {