CHANGE: Remove version defines for profiling. (#1980)

* Remove version defines for profiling.

* Fix spelling.

---------

Co-authored-by: Paulius Dervinis <[email protected]>

Author: surfnerd

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs

@@ -6,7 +6,7 @@
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.LowLevel;
-using UnityEngine.InputSystem.Profiler;
+using Unity.Profiling;
 using UnityEngine.InputSystem.Utilities;
 
 using ProfilerMarker = Unity.Profiling.ProfilerMarker;
@@ -124,9 +124,9 @@ internal unsafe class InputActionState : IInputStateChangeMonitor, ICloneable, I
         private InputEventPtr m_CurrentlyProcessingThisEvent;
         private Action m_OnBeforeUpdateDelegate;
         private Action m_OnAfterUpdateDelegate;
-        private static readonly InputProfilerMarker k_InputInitialActionStateCheckMarker = new InputProfilerMarker("InitialActionStateCheck");
-        private static readonly InputProfilerMarker k_InputActionResolveConflictMarker = new InputProfilerMarker("InputActionResolveConflict");
-        private static readonly InputProfilerMarker k_InputActionCallbackMarker = new InputProfilerMarker("InputActionCallback");
+        private static readonly ProfilerMarker k_InputInitialActionStateCheckMarker = new ProfilerMarker("InitialActionStateCheck");
+        private static readonly ProfilerMarker k_InputActionResolveConflictMarker = new ProfilerMarker("InputActionResolveConflict");
+        private static readonly ProfilerMarker k_InputActionCallbackMarker = new ProfilerMarker("InputActionCallback");
 
         /// <summary>
         /// Initialize execution state with given resolved binding information.

Packages/com.unity.inputsystem/InputSystem/Devices/Touchscreen.cs

@@ -6,7 +6,7 @@
 using UnityEngine.InputSystem.Layouts;
 using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.InputSystem.Utilities;
-using UnityEngine.InputSystem.Profiler;
+using Unity.Profiling;
 
 ////TODO: property that tells whether a Touchscreen is multi-touch capable
 
@@ -522,8 +522,8 @@ public class Touchscreen : Pointer, IInputStateCallbackReceiver, IEventMerger, I
         public ReadOnlyArray<TouchControl> touches { get; protected set; }
 
 
-        static readonly InputProfilerMarker k_TouchscreenUpdateMarker = new InputProfilerMarker("Touchscreen.OnNextUpdate");
-        static readonly InputProfilerMarker k_TouchAllocateMarker = new InputProfilerMarker("TouchAllocate");
+        static readonly ProfilerMarker k_TouchscreenUpdateMarker = new ProfilerMarker("Touchscreen.OnNextUpdate");
+        static readonly ProfilerMarker k_TouchAllocateMarker = new ProfilerMarker("TouchAllocate");
 
         protected TouchControl[] touchControlArray
         {

Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputControlTreeView.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine.InputSystem.LowLevel;
-using UnityEngine.InputSystem.Profiler;
+using Unity.Profiling;
 
 ////TODO: make control values editable (create state events from UI and pump them into the system)
 
@@ -23,7 +23,7 @@ internal class InputControlTreeView : TreeView
         public byte[][] multipleStateBuffers;
         public bool showDifferentOnly;
 
-        static readonly InputProfilerMarker k_InputBuildControlTreeMarker = new InputProfilerMarker("BuildControlTree");
+        static readonly ProfilerMarker k_InputBuildControlTreeMarker = new ProfilerMarker("BuildControlTree");
 
         public static InputControlTreeView Create(InputControl rootControl, int numValueColumns, ref TreeViewState treeState, ref MultiColumnHeaderState headerState)
         {

Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputEventTreeView.cs

@@ -4,7 +4,7 @@
 using UnityEditor.IMGUI.Controls;
 using UnityEngine.InputSystem.LowLevel;
 using UnityEditor;
-using UnityEngine.InputSystem.Profiler;
+using Unity.Profiling;
 
 ////FIXME: this performs horribly; the constant rebuilding on every single event makes the debug view super slow when device is noisy
 
@@ -23,7 +23,7 @@ internal class InputEventTreeView : TreeView
     {
         private readonly InputEventTrace m_EventTrace;
         private readonly InputControl m_RootControl;
-        private static readonly InputProfilerMarker k_InputEventTreeBuildRootMarker = new InputProfilerMarker("InputEventTreeView.BuildRoot");
+        private static readonly ProfilerMarker k_InputEventTreeBuildRootMarker = new ProfilerMarker("InputEventTreeView.BuildRoot");
 
         private enum ColumnId
         {

Packages/com.unity.inputsystem/InputSystem/Events/InputEventTrace.cs

@@ -6,7 +6,7 @@
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine.InputSystem.Layouts;
-using UnityEngine.InputSystem.Profiler;
+using Unity.Profiling;
 
 namespace UnityEngine.InputSystem.LowLevel
 {
@@ -27,7 +27,7 @@ namespace UnityEngine.InputSystem.LowLevel
     public sealed unsafe class InputEventTrace : IDisposable, IEnumerable<InputEventPtr>
     {
         private const int kDefaultBufferSize = 1024 * 1024;
-        private static readonly InputProfilerMarker k_InputEvenTraceMarker = new InputProfilerMarker("InputEventTrace");
+        private static readonly ProfilerMarker k_InputEvenTraceMarker = new ProfilerMarker("InputEventTrace");
 
         /// <summary>
         /// If <see name="recordFrameMarkers"/> is enabled, an <see cref="InputEvent"/> with this <see cref="FourCC"/>

Packages/com.unity.inputsystem/InputSystem/InputManager.cs

@@ -13,7 +13,7 @@
 using UnityEngine.InputSystem.Interactions;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.InputSystem.Layouts;
-using UnityEngine.InputSystem.Profiler;
+using Unity.Profiling;
 
 #if UNITY_EDITOR
 using UnityEngine.InputSystem.Editor;
@@ -64,10 +64,10 @@ internal partial class InputManager
         public TypeTable interactions => m_Interactions;
         public TypeTable composites => m_Composites;
 
-        static readonly InputProfilerMarker k_InputUpdateProfilerMarker = new InputProfilerMarker("InputUpdate");
-        static readonly InputProfilerMarker k_InputTryFindMatchingControllerMarker = new InputProfilerMarker("InputSystem.TryFindMatchingControlLayout");
-        static readonly InputProfilerMarker k_InputAddDeviceMarker = new InputProfilerMarker("InputSystem.AddDevice");
-        static readonly InputProfilerMarker k_InputRestoreDevicesAfterReloadMarker = new InputProfilerMarker("InputManager.RestoreDevicesAfterDomainReload");
+        static readonly ProfilerMarker k_InputUpdateProfilerMarker = new ProfilerMarker("InputUpdate");
+        static readonly ProfilerMarker k_InputTryFindMatchingControllerMarker = new ProfilerMarker("InputSystem.TryFindMatchingControlLayout");
+        static readonly ProfilerMarker k_InputAddDeviceMarker = new ProfilerMarker("InputSystem.AddDevice");
+        static readonly ProfilerMarker k_InputRestoreDevicesAfterReloadMarker = new ProfilerMarker("InputManager.RestoreDevicesAfterDomainReload");
 
         public InputMetrics metrics
         {

Packages/com.unity.inputsystem/InputSystem/InputSystem.cs

@@ -13,7 +13,7 @@
 using UnityEngine.InputSystem.Users;
 using UnityEngine.InputSystem.XInput;
 using UnityEngine.InputSystem.Utilities;
-using UnityEngine.InputSystem.Profiler;
+using Unity.Profiling;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -84,9 +84,9 @@ namespace UnityEngine.InputSystem
     public static partial class InputSystem
     {
 #if UNITY_EDITOR
-        static readonly InputProfilerMarker k_InputInitializeInEditorMarker = new InputProfilerMarker("InputSystem.InitializeInEditor");
+        static readonly ProfilerMarker k_InputInitializeInEditorMarker = new ProfilerMarker("InputSystem.InitializeInEditor");
 #endif
-        static readonly InputProfilerMarker k_InputRestMarker = new InputProfilerMarker("InputSystem.Reset");
+        static readonly ProfilerMarker k_InputResetMarker = new ProfilerMarker("InputSystem.Reset");
 
         #region Layouts
 
@@ -3857,7 +3857,7 @@ private static void PerformDefaultPluginInitialization()
         /// </summary>
         private static void Reset(bool enableRemoting = false, IInputRuntime runtime = null)
         {
-            k_InputRestMarker.Begin();
+            k_InputResetMarker.Begin();
 
 #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
             // Note that in a test setup we might enter reset with project-wide actions already enabled but the
@@ -3917,7 +3917,7 @@ private static void Reset(bool enableRemoting = false, IInputRuntime runtime = n
             EnableActions();
             #endif
 
-            k_InputRestMarker.End();
+            k_InputResetMarker.End();
         }
 
         /// <summary>

Packages/com.unity.inputsystem/InputSystem/Plugins/Users/InputUser.cs

@@ -3,7 +3,7 @@
 using Unity.Collections;
 using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.InputSystem.Utilities;
-using UnityEngine.InputSystem.Profiler;
+using Unity.Profiling;
 
 ////REVIEW: remove users automatically when exiting play mode?
 
@@ -37,8 +37,8 @@ public struct InputUser : IEquatable<InputUser>
     {
         public const uint InvalidId = 0;
 
-        static readonly InputProfilerMarker k_InputUserOnChangeMarker = new InputProfilerMarker("InputUser.onChange");
-        static readonly InputProfilerMarker k_InputCheckForUnpairMarker = new InputProfilerMarker("InputCheckForUnpairedDeviceActivity");
+        static readonly ProfilerMarker k_InputUserOnChangeMarker = new ProfilerMarker("InputUser.onChange");
+        static readonly ProfilerMarker k_InputCheckForUnpairMarker = new ProfilerMarker("InputCheckForUnpairedDeviceActivity");
 
         /// <summary>
         /// Whether this is a currently active user record in <see cref="all"/>.