Changes scope of optimization flags to private scope and added internal getters instead. Removed WindowsGamingInputBackend feature flag from test since generating error. This is handled in a separate PR as well.

Author: ekcoh

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -34,7 +34,6 @@ partial class CoreTests
     [TestCase(InputFeatureNames.kUseReadValueCaching)]
     [TestCase(InputFeatureNames.kUseOptimizedControls)]
     [TestCase(InputFeatureNames.kParanoidReadValueCachingChecks)]
-    [TestCase(InputFeatureNames.kUseWindowsGamingInputBackend)]
     [TestCase(InputFeatureNames.kDisableUnityRemoteSupport)]
     [TestCase(InputFeatureNames.kRunPlayerUpdatesInEditMode)]
     #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS

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

@@ -929,7 +929,7 @@ public void ApplyParameterChanges()
         private void SetOptimizedControlDataType()
         {
             // setting check need to be inline so we clear optimizations if setting is disabled after the fact
-            m_OptimizedControlDataType = InputSystem.s_Manager.m_OptimizedControlsFeatureEnabled
+            m_OptimizedControlDataType = InputSystem.s_Manager.optimizedControlsFeatureEnabled
                 ? CalculateOptimizedControlDataType()
                 : (FourCC)InputStateBlock.kFormatInvalid;
         }
@@ -957,7 +957,7 @@ internal void SetOptimizedControlDataTypeRecursively()
         [Conditional("UNITY_EDITOR")]
         internal void EnsureOptimizationTypeHasNotChanged()
         {
-            if (!InputSystem.s_Manager.m_OptimizedControlsFeatureEnabled)
+            if (!InputSystem.s_Manager.optimizedControlsFeatureEnabled)
                 return;
 
             var currentOptimizedControlDataType = CalculateOptimizedControlDataType();
@@ -1172,7 +1172,7 @@ public ref readonly TValue value
 
                 if (
                     // if feature is disabled we re-evaluate every call
-                    !InputSystem.s_Manager.m_ReadValueCachingFeatureEnabled
+                    !InputSystem.s_Manager.readValueCachingFeatureEnabled
                     // if cached value is stale we re-evaluate and clear the flag
                     || m_CachedValueIsStale
                     // if a processor in stack needs to be re-evaluated, but unprocessedValue is still can be cached
@@ -1183,7 +1183,7 @@ public ref readonly TValue value
                     m_CachedValueIsStale = false;
                 }
 #if DEBUG
-                else if (InputSystem.s_Manager.m_ParanoidReadValueCachingChecksEnabled)
+                else if (InputSystem.s_Manager.paranoidReadValueCachingChecksEnabled)
                 {
                     var oldUnprocessedValue = m_UnprocessedCachedValue;
                     var newUnprocessedValue = unprocessedValue;
@@ -1225,7 +1225,7 @@ internal unsafe ref readonly TValue unprocessedValue
 
                 if (
                     // if feature is disabled we re-evaluate every call
-                    !InputSystem.s_Manager.m_ReadValueCachingFeatureEnabled
+                    !InputSystem.s_Manager.readValueCachingFeatureEnabled
                     // if cached value is stale we re-evaluate and clear the flag
                     || m_UnprocessedCachedValueIsStale
                 )
@@ -1234,7 +1234,7 @@ internal unsafe ref readonly TValue unprocessedValue
                     m_UnprocessedCachedValueIsStale = false;
                 }
 #if DEBUG
-                else if (InputSystem.s_Manager.m_ParanoidReadValueCachingChecksEnabled)
+                else if (InputSystem.s_Manager.paranoidReadValueCachingChecksEnabled)
                 {
                     var currentUnprocessedValue = ReadUnprocessedValueFromState(currentStatePtr);
                     if (CompareValue(ref currentUnprocessedValue, ref m_UnprocessedCachedValue))

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using Unity.Collections;
 using UnityEngine.InputSystem.Composites;
@@ -2118,9 +2119,30 @@ internal struct AvailableDevice
         internal InputSettings m_Settings;
 
         // Extract as booleans (from m_Settings) because feature check is in the hot path
-        internal bool m_OptimizedControlsFeatureEnabled;
-        internal bool m_ReadValueCachingFeatureEnabled;
-        internal bool m_ParanoidReadValueCachingChecksEnabled;
+
+        private bool m_OptimizedControlsFeatureEnabled;
+        internal bool optimizedControlsFeatureEnabled
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => m_OptimizedControlsFeatureEnabled;
+            set => m_OptimizedControlsFeatureEnabled = value;
+        }
+
+        private bool m_ReadValueCachingFeatureEnabled;
+        internal bool readValueCachingFeatureEnabled
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => m_ReadValueCachingFeatureEnabled;
+            set => m_ReadValueCachingFeatureEnabled = value;
+        }
+
+        private bool m_ParanoidReadValueCachingChecksEnabled;
+        internal bool paranoidReadValueCachingChecksEnabled
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => m_ParanoidReadValueCachingChecksEnabled;
+            set => m_ParanoidReadValueCachingChecksEnabled = value;
+        }
 
         #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         private InputActionAsset m_Actions;
@@ -2651,15 +2673,6 @@ internal void ApplySettings()
                 runPlayerUpdatesInEditMode = m_Settings.IsFeatureEnabled(InputFeatureNames.kRunPlayerUpdatesInEditMode);
                 #endif
 
-                #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
-                if (m_Settings.IsFeatureEnabled(InputFeatureNames.kUseWindowsGamingInputBackend))
-                {
-                    var command = UseWindowsGamingInputCommand.Create(true);
-                    if (ExecuteGlobalCommand(ref command) < 0)
-                        Debug.LogError($"Could not enable Windows.Gaming.Input");
-                }
-                #endif
-
                 // Extract feature flags into fields since used in hot-path
                 m_ReadValueCachingFeatureEnabled = m_Settings.IsFeatureEnabled((InputFeatureNames.kUseReadValueCaching));
                 m_OptimizedControlsFeatureEnabled = m_Settings.IsFeatureEnabled((InputFeatureNames.kUseOptimizedControls));