Add optimization to ButtonControl

Also updates the mouse test that I believe would be impacted by the change.

Author: kevin-zakszewski

Assets/Tests/InputSystem/CoreTests_Controls.cs

@@ -1428,7 +1428,7 @@ public void Controls_OptimizedControls_TrivialControlsAreOptimized()
         Assert.That(mouse.position.x.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatFloat));
         Assert.That(mouse.position.y.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatFloat));
         Assert.That(mouse.position.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatVector2));
-        Assert.That(mouse.leftButton.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatInvalid));
+        Assert.That(mouse.leftButton.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatBit));
 
         InputSystem.settings.SetInternalFeatureFlag(InputFeatureNames.kUseOptimizedControls, false);
         Assert.That(mouse.position.x.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatInvalid));

Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/ButtonControl.cs

@@ -378,6 +378,20 @@ internal void UpdateWasPressedEditor()
 
 #endif // UNITY_EDITOR
 
+        protected override FourCC CalculateOptimizedControlDataType()
+        {
+            if (clamp == Clamp.None &&
+                invert == false &&
+                normalize == false &&
+                scale == false &&
+                m_StateBlock.format == InputStateBlock.FormatBit &&
+                m_StateBlock.sizeInBits == 1 &&
+                m_StateBlock.bitOffset == 0)
+                return InputStateBlock.FormatBit;
+
+            return base.CalculateOptimizedControlDataType();
+        }
+
         // We make the current global default button press point available as a static so that we don't have to
         // constantly make the hop from InputSystem.settings -> InputManager.m_Settings -> defaultButtonPressPoint.
         internal static float s_GlobalDefaultButtonPressPoint;

Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/XR/Controls/PoseControl.cs

@@ -252,13 +252,7 @@ protected override FourCC CalculateOptimizedControlDataType()
             if (
                 m_StateBlock.sizeInBits == PoseState.kSizeInBytes * 8 &&
                 m_StateBlock.bitOffset == 0 &&
-                isTracked.m_StateBlock.format == InputStateBlock.kFormatBit &&
-                isTracked.m_StateBlock.sizeInBits == 1 &&
-                isTracked.m_StateBlock.bitOffset == 0 &&
-                isTracked.clamp == AxisControl.Clamp.None &&
-                isTracked.invert == false &&
-                isTracked.normalize == false &&
-                isTracked.scale == false &&
+                isTracked.optimizedControlDataType == InputStateBlock.kFormatBit &&
                 trackingState.optimizedControlDataType == InputStateBlock.kFormatInt &&
                 position.optimizedControlDataType == InputStateBlock.kFormatVector3 &&
                 rotation.optimizedControlDataType == InputStateBlock.kFormatQuaternion &&