Unity-Technologies · phi-lira · May 20, 2020 · Mar 17, 2020 · Mar 18, 2020 · Mar 18, 2020
@@ -21,8 +21,8 @@ platforms:
 testplatforms:
   - name: Standalone
     args: --suite=playmode --platform=Standalone
-  - name: playmode
-    args: --suite=playmode
+  # - name: playmode
+  #   args: --suite=playmode
   - name: editmode
     args: --suite=editor --platform=editmode
 projects:

@@ -56,6 +56,8 @@ testplatforms:
     args: --suite=playmode --platform=Standalone
   - name: playmode
     args: --suite=playmode
+  - name: playmode XR
+    args: --suite=playmode --extra-editor-arg="-xr-tests"
   - name: editmode
     args: --suite=editor --platform=editmode
 projects:

@@ -21,8 +21,8 @@ platforms:
 testplatforms:
   - name: Standalone
     args: --suite=playmode --platform=Standalone
-  - name: playmode
-    args: --suite=playmode
+  # - name: playmode
+  #   args: --suite=playmode
   - name: editmode
     args: --suite=editor --platform=editmode
 projects:

diff --git a/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json b/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json
@@ -9,10 +9,10 @@
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
     "com.unity.test-framework": "1.1.14",
     "com.unity.test-framework.build": "0.0.1-preview.12",
-    "com.unity.test-framework.utp-reporter": "1.0.0-preview",
-    "com.unity.testframework.graphics": "7.1.13-preview",
+    "com.unity.test-framework.utp-reporter": "1.0.2-preview",
+    "com.unity.testframework.graphics": "7.2.0-preview",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.mock-hmd": "1.0.1-preview.6",
+    "com.unity.xr.mock-hmd": "1.0.1-preview.7",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/TestProjects/UniversalGfxTestStereo/Packages/manifest.json b/TestProjects/UniversalGfxTestStereo/Packages/manifest.json
@@ -9,11 +9,10 @@
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
     "com.unity.test-framework": "1.1.14",
     "com.unity.test-framework.build": "0.0.1-preview.12",
-    "com.unity.test-framework.utp-reporter": "1.0.0-preview",
-    "com.unity.testframework.graphics": "7.1.13-preview",
+    "com.unity.test-framework.utp-reporter": "1.0.2-preview",
+    "com.unity.testframework.graphics": "7.2.0-preview",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.legacyinputhelpers": "2.1.2",
-    "com.unity.xr.mock-hmd": "1.0.1-preview.6",
+    "com.unity.xr.mock-hmd": "1.0.1-preview.7",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/TestProjects/UniversalGfxTestStereo/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGfxTestStereo/ProjectSettings/EditorBuildSettings.asset
@@ -38,9 +38,6 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/018_xr_Particles_Multiply.unity
     guid: dae78502f2e214f498d8e5e4b4adf79d
-  - enabled: 1
-    path: Assets/Scenes/019_xr_Particles_AlphaBlend.unity
-    guid: f5b47e7b559724329bbd9f437a652f52
   - enabled: 1
     path: Assets/Scenes/020_xr_Lighting_ReflectionProbe.unity
     guid: 0feef353efdf045989e9c2b501774338

diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/ForwardRenderer.asset b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/ForwardRenderer.asset
@@ -13,7 +13,9 @@ MonoBehaviour:
   m_Name: ForwardRenderer
   m_EditorClassIdentifier: 
   m_RendererFeatures: []
+  m_RendererFeatureMap: 
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+  xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
   shaders:
     blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
     copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}

diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/118_SkyboxReflectionTestOrthographic.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/118_SkyboxReflectionTestOrthographic.unity
@@ -348,6 +348,7 @@ MonoBehaviour:
     AverageCorrectnessThreshold: 0.001
     UseHDR: 0
   WaitFrames: 0
+  XRCompatible: 0
 --- !u!81 &971756571
 AudioListener:
   m_ObjectHideFlags: 0

diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/123_CameraStackingClear.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/123_CameraStackingClear.unity
@@ -232,6 +232,7 @@ MonoBehaviour:
     UseBackBuffer: 1
     ImageResolution: 4
   WaitFrames: 2
+  XRCompatible: 0
 --- !u!114 &763890391
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT.unity
@@ -1193,6 +1193,7 @@ MonoBehaviour:
     UseBackBuffer: 1
     ImageResolution: 4
   WaitFrames: 2
+  XRCompatible: 0
 --- !u!20 &1203454921
 Camera:
   m_ObjectHideFlags: 0

diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTexture/Unlit.mat
@@ -21,19 +21,20 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Unlit
-  m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
+  m_CustomRenderQueue: 2050
+  stringTagMap:
+    RenderType: Opaque
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 8400000, guid: b5fedf867466f754eaa6898d3fea1f05, type: 2}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -75,6 +76,7 @@ Material:
     - _OcclusionStrength: 1
     - _QueueOffset: 0
     - _ReceiveShadows: 1
+    - _SampleGI: 0
     - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
@@ -83,7 +85,7 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

diff --git a/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs b/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs
@@ -24,6 +24,10 @@ public class UniversalGraphicsTests
 
     public IEnumerator Run(GraphicsTestCase testCase)
     {
+        // XRTODO: Fix XR tests on macOS or disable them from Yamato directly
+        if (XRSystem.testModeEnabled && (Application.platform == RuntimePlatform.OSXEditor || Application.platform == RuntimePlatform.OSXPlayer))
+            Assert.Ignore("Universal XR tests do not run on macOS.");
+
         SceneManager.LoadScene(testCase.ScenePath);
 
         // Always wait one frame for scene load
@@ -33,6 +37,18 @@ public IEnumerator Run(GraphicsTestCase testCase)
         var settings = Object.FindObjectOfType<UniversalGraphicsTestSettings>();
         Assert.IsNotNull(settings, "Invalid test scene, couldn't find UniversalGraphicsTestSettings");        
 
+        if (XRSystem.testModeEnabled)
+        {
+            if (settings.XRCompatible)
+            {
+                XRSystem.automatedTestRunning = true;
+            }
+            else
+            {
+                Assert.Ignore("Test scene is not compatible with XR and will be skipped.");
+            }
+        }
+
         Scene scene = SceneManager.GetActiveScene();
 
         yield return null;
@@ -90,5 +106,11 @@ public void DumpImagesInEditor()
     {
         UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test);
     }
+
+    [TearDown]
+    public void ResetSystemState()
+    {
+        XRSystem.automatedTestRunning = false;
+    }
 #endif
 }
diff --git a/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAssetEditor.cs b/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAssetEditor.cs
@@ -34,7 +34,7 @@ internal class Styles
             // Quality
             public static GUIContent hdrText = EditorGUIUtility.TrTextContent("HDR", "Controls the global HDR settings.");
             public static GUIContent msaaText = EditorGUIUtility.TrTextContent("Anti Aliasing (MSAA)", "Controls the global anti aliasing settings.");
-            public static GUIContent renderScaleText = EditorGUIUtility.TrTextContent("Render Scale", "Scales the camera render target allowing the game to render at a resolution different than native resolution. UI is always rendered at native resolution. When VR is enabled, this is overridden by XRSettings.");
+            public static GUIContent renderScaleText = EditorGUIUtility.TrTextContent("Render Scale", "Scales the camera render target allowing the game to render at a resolution different than native resolution. UI is always rendered at native resolution.");
 
             // Main light
             public static GUIContent mainLightRenderingModeText = EditorGUIUtility.TrTextContent("Main Light", "Main light is the brightest directional light.");
@@ -244,9 +244,7 @@ void DrawQualitySettings()
                 EditorGUI.indentLevel++;
                 EditorGUILayout.PropertyField(m_HDR, Styles.hdrText);
                 EditorGUILayout.PropertyField(m_MSAA, Styles.msaaText);
-                EditorGUI.BeginDisabledGroup(XRGraphics.enabled);
                 m_RenderScale.floatValue = EditorGUILayout.Slider(Styles.renderScaleText, m_RenderScale.floatValue, UniversalRenderPipeline.minRenderScale, UniversalRenderPipeline.maxRenderScale);
-                EditorGUI.EndDisabledGroup();
                 EditorGUI.indentLevel--;
                 EditorGUILayout.Space();
                 EditorGUILayout.Space();

diff --git a/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineCameraEditor.cs b/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineCameraEditor.cs
@@ -154,7 +154,7 @@ void UpdateAnimationValues(bool initialize)
         {
             SetAnimationTarget(m_ShowBGColorAnim, initialize, isSameClearFlags && (camera.clearFlags == CameraClearFlags.SolidColor || camera.clearFlags == CameraClearFlags.Skybox));
             SetAnimationTarget(m_ShowOrthoAnim, initialize, isSameOrthographic && camera.orthographic);
-            SetAnimationTarget(m_ShowTargetEyeAnim, initialize, settings.targetEye.intValue != (int)StereoTargetEyeMask.Both || XRGraphics.tryEnable);
+            SetAnimationTarget(m_ShowTargetEyeAnim, initialize, settings.targetEye.intValue != (int)StereoTargetEyeMask.Both);
         }
 
         void UpdateCameraTypeIntPopupData()
@@ -476,16 +476,6 @@ void DrawStackSettings()
                 return;
             }
 
-            // TODO: Warn when MultiPass is active and enabled so we show in the UI camera stacking is not supported.
-            // Seems like the stereo rendering mode only changes in playmode. Check the reason so we can enable this check.
-//#if ENABLE_VR
-//            if (UnityEngine.XR.XRSettings.stereoRenderingMode == UnityEngine.XR.XRSettings.StereoRenderingMode.MultiPass)
-//            {
-//                EditorGUILayout.HelpBox("Camera Stacking is not supported in Multi Pass stereo mode. Only Base camera will render.", MessageType.Warning);
-//                return;
-//            }
-//#endif
-
             if (m_StackSettingsFoldout.value)
             {
                 m_LayerList.DoLayoutList();

diff --git a/com.unity.render-pipelines.universal/Runtime/Data/XRSystemData.asset b/com.unity.render-pipelines.universal/Runtime/Data/XRSystemData.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 307a736764ebbce44b54d72f8467b6fd, type: 3}
+  m_Name: XRSystemData
+  m_EditorClassIdentifier: 
+  shaders:
+    xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
+    xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
diff --git a/com.unity.render-pipelines.universal/Runtime/Data/XRSystemData.asset.meta b/com.unity.render-pipelines.universal/Runtime/Data/XRSystemData.asset.meta
diff --git a/com.unity.render-pipelines.universal/Runtime/Data/XRSystemData.cs b/com.unity.render-pipelines.universal/Runtime/Data/XRSystemData.cs
@@ -0,0 +1,44 @@
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEditor.ProjectWindowCallback;
+#endif
+using System;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    public class XRSystemData : ScriptableObject
+    {
+#if UNITY_EDITOR
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1812")]
+        internal class CreateXRSystemDataAsset : EndNameEditAction
+        {
+            public override void Action(int instanceId, string pathName, string resourceFile)
+            {
+                var instance = CreateInstance<XRSystemData>();
+                AssetDatabase.CreateAsset(instance, pathName);
+                ResourceReloader.ReloadAllNullIn(instance, UniversalRenderPipelineAsset.packagePath);
+                Selection.activeObject = instance;
+            }
+        }
+
+        [MenuItem("Assets/Create/Rendering/Universal Render Pipeline/XR System Data", priority = CoreUtils.assetCreateMenuPriority3)]
+        static void CreateXRSystemData()
+        {
+            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, CreateInstance<CreateXRSystemDataAsset>(), "CustomXRSystemData.asset", null, null);
+        }
+#endif
+
+        [Serializable, ReloadGroup]
+        public sealed class ShaderResources
+        {
+            [Reload("Shaders/XR/XROcclusionMesh.shader")]
+            public Shader xrOcclusionMeshPS;
+
+            [Reload("Shaders/XR/XRMirrorView.shader")]
+            public Shader xrMirrorViewPS;
+        }
+
+        public ShaderResources shaders;
+    }
+}
diff --git a/com.unity.render-pipelines.universal/Runtime/Data/XRSystemData.cs.meta b/com.unity.render-pipelines.universal/Runtime/Data/XRSystemData.cs.meta
diff --git a/com.unity.render-pipelines.universal/Runtime/DeferredLights.cs b/com.unity.render-pipelines.universal/Runtime/DeferredLights.cs
@@ -344,18 +344,8 @@ void SetupMatrixConstants(CommandBuffer cmd, ref RenderingData renderingData)
             Matrix4x4 proj;
             Matrix4x4 view;
 
-            if (renderingData.cameraData.isXRMultipass)
-            {
-                //Camera.StereoscopicEye eyeIndex = (Camera.StereoscopicEye)renderingData.cameraData.camera.stereoActiveEye; // Always left eye
-                Camera.StereoscopicEye eyeIndex = (Camera.StereoscopicEye)m_EyeIndex;
-                proj = renderingData.cameraData.camera.GetStereoProjectionMatrix(eyeIndex);
-                view = renderingData.cameraData.camera.GetStereoViewMatrix(eyeIndex);
-            }
-            else
-            {
-                proj = renderingData.cameraData.camera.projectionMatrix;
-                view = renderingData.cameraData.camera.worldToCameraMatrix;
-            }
+            proj = renderingData.cameraData.camera.projectionMatrix;
+            view = renderingData.cameraData.camera.worldToCameraMatrix;
 
             // When reading back from depth texture, we need to scale back from [0; 1] to [-1; 1] as Unity defaults to for GL clip-space depth convention.
             // As well, non-GL platforms render upside-down, we don't need to y-reverse again on GL platforms.

diff --git a/com.unity.render-pipelines.universal/Runtime/DeferredRenderer.cs b/com.unity.render-pipelines.universal/Runtime/DeferredRenderer.cs
@@ -182,7 +182,7 @@ public override void Setup(ScriptableRenderContext context, ref RenderingData re
             bool requiresDepthPrepass = cameraData.isSceneViewCamera || m_PreferDepthPrepass || m_DeferredLights.TiledDeferredShading;
 
             // TODO: There's an issue in multiview and depth copy pass. Atm forcing a depth prepass on XR until we have a proper fix.
-            if (cameraData.isStereoEnabled && cameraData.requiresDepthTexture)
+            if (cameraData.xr.enabled && cameraData.requiresDepthTexture)
                 requiresDepthPrepass = true;
 
             // Special path for depth only offscreen cameras. Only write opaques + transparents.
@@ -220,7 +220,7 @@ public override void Setup(ScriptableRenderContext context, ref RenderingData re
 
             // We generate color LUT in the base camera only. This allows us to not break render pass execution for overlay cameras.
             bool generateColorGradingLUT = anyPostProcessing && cameraData.renderType == CameraRenderType.Base;
-            bool isStereoEnabled = cameraData.isStereoEnabled;
+            bool isStereoEnabled = cameraData.xr.enabled;
 
             bool mainLightShadows = m_MainLightShadowCasterPass.Setup(ref renderingData);
             bool additionalLightShadows = m_AdditionalLightsShadowCasterPass.Setup(ref renderingData);