Namespace Streamline annotation handles (#7)

Author: solidpixel

README.md

@@ -5,8 +5,8 @@ This project is a Unity package for integrating the Mobile Studio tool suite
 into game development workflows. This version of the package has the following
 features for integrating with the Streamline profiler.
 
-* C# language bindings for emiting event annotations.
-* C# language bindings for emiting software counters.
+* C# language bindings for emitting event annotations.
+* C# language bindings for emitting software counters.
 
 License
 =======
@@ -24,7 +24,7 @@ Technical details
 Requirements
 ------------
 
-This version of the package is compatible with the Unity Editor version 2018.4
+This version of the package is compatible with the Unity Editor version 2020.3
 LTS and later.
 
 Building
@@ -39,8 +39,18 @@ This package is built using the Unity bee compiler.
    `\Editor\Data\il2cpp\build\BeeSettings\offline\bee.exe`
 3) To trigger a build, run `bee.exe` in the `Native~` directory.
 
+Compatibility
+-------------
+
+This package uses application-generated Streamline annotations to add more
+context to captured data. It allocates annotation handles in the ID range 16384-32767; other users of Streamline in the same process should avoid using
+this range to avoid collisions.
+
 Installing and using
 --------------------
 
 For instructions on how to install and use this package, see the
 [full documentation page](Documentation/Mobile-Studio.md).
+
+
+

Runtime/MobileStudio.cs

@@ -125,9 +125,9 @@ private static extern void gator_annotate_counter_value(
         private static UInt32 colorToGatorInt(Color32 color)
         {
             UInt32 colorInt = ((uint)(color.b) << 24) +
-                             ((uint)(color.g) << 16) +
-                             ((uint)(color.r) << 8) +
-                             ((uint)0x1b);
+                              ((uint)(color.g) << 16) +
+                              ((uint)(color.r) <<  8) +
+                              ((uint)0x1b);
 
             return colorInt;
         }
@@ -208,7 +208,9 @@ public static UInt64 getTime()
         public class Counter
         {
             // Maintain a unique ID for each counter.
-            static UInt32 counterCount = 0;
+            // Allocate in a namespace block starting from 16384 to reduce
+            // chances of collisions with other users of annotations.
+            static UInt32 counterCount = 0x4000;
 
             // The scaling modifier used to display series as float to 2dp.
             const UInt32 modifier = 100;
@@ -278,7 +280,9 @@ public void set_value(float value)
         public class Channel
         {
             // Maintain a unique ID for each channel.
-            static UInt32 channelCount = 0;
+            // Allocate in a namespace block starting from 16384 to reduce
+            // chances of collisions with other users of annotations.
+            static UInt32 channelCount = 0x4000;
 
             // Our channel ID.
             UInt32 channel;
@@ -397,7 +401,9 @@ public interface CAMJob
 
 
             // Maintain a unique ID for each CAM.
-            private static UInt32 camCount = 1;
+            // Allocate in a namespace block starting from 16384 to reduce
+            // chances of collisions with other users of annotations.
+            private static UInt32 camCount = 0x4000;
 
             private UInt32 trackCount;
             private UInt32 jobCount;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.arm.mobile-studio",
   "description": "Unity C# bindings for Mobile Studio.",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "unity": "2020.3",
   "displayName": "Mobile Studio"
 }