From 18f7d8c261f450991356d2581035c111e7753da3 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Sun, 19 Nov 2017 02:42:04 +0100
Subject: [PATCH] Reorder StringTransfer to enable easier dispatch.

---
 common/TracyQueue.hpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/common/TracyQueue.hpp b/common/TracyQueue.hpp
index 46523e63..d453a0ad 100644
--- a/common/TracyQueue.hpp
+++ b/common/TracyQueue.hpp
@@ -12,25 +12,25 @@ enum class QueueType : uint8_t
     ZoneBegin,
     ZoneBeginAllocSrcLoc,
     ZoneEnd,
-    StringData,
-    ThreadName,
-    CustomStringData,
     FrameMarkMsg,
     SourceLocation,
-    SourceLocationPayload,
     ZoneText,
     LockWait,
     LockObtain,
     LockRelease,
     LockMark,
     PlotData,
-    PlotName,
     Message,
     MessageLiteral,
     GpuNewContext,
     GpuZoneBegin,
     GpuZoneEnd,
     GpuTime,
+    StringData,
+    ThreadName,
+    CustomStringData,
+    PlotName,
+    SourceLocationPayload,
     NUM_TYPES
 };
 
@@ -204,25 +204,26 @@ static const size_t QueueDataSize[] = {
     sizeof( QueueHeader ) + sizeof( QueueZoneBegin ),
     sizeof( QueueHeader ) + sizeof( QueueZoneBegin ),       // allocated source location
     sizeof( QueueHeader ) + sizeof( QueueZoneEnd ),
-    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // string data
-    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // thread name
-    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // custom string data
     sizeof( QueueHeader ) + sizeof( QueueFrameMark ),
     sizeof( QueueHeader ) + sizeof( QueueSourceLocation ),
-    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // allocated source location payload
     sizeof( QueueHeader ) + sizeof( QueueZoneText ),
     sizeof( QueueHeader ) + sizeof( QueueLockWait ),
     sizeof( QueueHeader ) + sizeof( QueueLockObtain ),
     sizeof( QueueHeader ) + sizeof( QueueLockRelease ),
     sizeof( QueueHeader ) + sizeof( QueueLockMark ),
     sizeof( QueueHeader ) + sizeof( QueuePlotData ),
-    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // plot name
     sizeof( QueueHeader ) + sizeof( QueueMessage ),
     sizeof( QueueHeader ) + sizeof( QueueMessage ),         // literal
     sizeof( QueueHeader ) + sizeof( QueueGpuNewContext ),
     sizeof( QueueHeader ) + sizeof( QueueGpuZoneBegin ),
     sizeof( QueueHeader ) + sizeof( QueueGpuZoneEnd ),
     sizeof( QueueHeader ) + sizeof( QueueGpuTime ),
+    // keep all QueueStringTransfer below
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // string data
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // thread name
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // custom string data
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // plot name
+    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // allocated source location payload
 };
 
 static_assert( QueueItemSize == 32, "Queue item size not 32 bytes" );