PR Feedback

Author: StayTalm

Assets/Tests/InputSystem/Plugins/XRTests.cs

@@ -473,8 +473,7 @@ private static InputDeviceDescription CreateSimpleDeviceDescriptionByRole(Device
             manufacturer = "Manufacturer",
             capabilities = new XRDeviceDescriptor
             {
-#if UNITY_2019_3_OR_NEWER
-#else
+#if !UNITY_2019_3_OR_NEWER
                 deviceRole = role,
 #endif
                 inputFeatures = new List<XRFeatureDescriptor>()
@@ -498,8 +497,7 @@ private static InputDeviceDescription CreateMangledNameDeviceDescription()
             manufacturer = "__Manufacturer::",
             capabilities = new XRDeviceDescriptor
             {
-#if UNITY_2019_3_OR_NEWER
-#else
+#if !UNITY_2019_3_OR_NEWER
                 deviceRole = DeviceRole.Generic,
 #endif
 
@@ -536,8 +534,7 @@ public static InputDeviceDescription CreateDeviceDescription()
                 manufacturer = "XRManufacturer",
                 capabilities = new XRDeviceDescriptor
                 {
-#if UNITY_2019_3_OR_NEWER
-#else
+#if !UNITY_2019_3_OR_NEWER
                     deviceRole = DeviceRole.Generic,
 #endif
                     inputFeatures = new List<XRFeatureDescriptor>()
@@ -614,8 +611,7 @@ public static InputDeviceDescription CreateDeviceDescription()
                 manufacturer = "XRManufacturer",
                 capabilities = new XRDeviceDescriptor
                 {
-#if UNITY_2019_3_OR_NEWER
-#else
+#if !UNITY_2019_3_OR_NEWER
                     deviceRole = DeviceRole.Generic,
 #endif
                     inputFeatures = new List<XRFeatureDescriptor>()

Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRSupport.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+#if UNITY_INPUT_SYSTEM_ENABLE_XR
 using UnityEngine.XR;
+#endif
 using UnityEngine.InputSystem.Layouts;
 
 namespace UnityEngine.InputSystem.XR
@@ -75,11 +77,13 @@ class XRDeviceDescriptor
         public string deviceName;
         public string manufacturer;
         public string serialNumber;
+#if UNITY_INPUT_SYSTEM_ENABLE_XR
 #if UNITY_2019_3_OR_NEWER
         public InputDeviceCharacteristics characteristics;
-#else
-        public DeviceRole deviceRole;
-#endif
+#else //UNITY_2019_3_OR_NEWER
+        public InputDeviceRole deviceRole;
+#endif //UNITY_2019_3_OR_NEWER
+#endif //UNITY_INPUT_SYSTEM_ENABLE_XR
         public int deviceId;
         public List<XRFeatureDescriptor> inputFeatures;
 

Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRTemplateBuilder.cs

@@ -4,7 +4,9 @@
 using UnityEngine.InputSystem.Utilities;
 using System.Text;
 using UnityEngine.InputSystem.Layouts;
+#if UNITY_INPUT_SYSTEM_ENABLE_XR
 using UnityEngine.XR;
+#endif
 
 namespace UnityEngine.InputSystem.XR
 {