Merge pull request #1472 from alandtse/fix/emscripten-deploy-fork-guard

ci(emscripten): skip SFTP deploy on forks

.github/workflows/emscripten.yml

@@ -69,7 +69,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: build-emscripten
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' && github.repository == 'wolfpld/tracy'
     steps:
     - uses: actions/download-artifact@v4
     - uses: wlixcc/SFTP-Deploy-Action@v1.2.4

profiler/src/profiler/TracyTimelineDraw.hpp

@@ -108,6 +108,15 @@ struct LockDraw
     std::vector<LockDrawItem> data;
 };
 
+struct LockHighlight
+{
+    int64_t id;
+    int64_t begin;
+    int64_t end;
+    uint8_t thread;
+    bool blocked;
+};
+
 }
 
 #endif

profiler/src/profiler/TracyView.hpp

@@ -22,6 +22,7 @@
 #include "TracyMarkdown.hpp"
 #include "TracySourceContents.hpp"
 #include "TracyTimelineController.hpp"
+#include "TracyTimelineDraw.hpp"
 #include "TracyUserData.hpp"
 #include "TracyUtility.hpp"
 #include "TracyViewData.hpp"

server/TracyEvent.hpp

@@ -372,15 +372,6 @@ struct LockMap
     TimeRange range[64];
 };
 
-struct LockHighlight
-{
-    int64_t id;
-    int64_t begin;
-    int64_t end;
-    uint8_t thread;
-    bool blocked;
-};
-
 
 struct GpuEvent
 {