Merge branch 'master' into HDRP/staging

Author: sebastienlagarde

TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs

@@ -6,6 +6,7 @@
 using UnityEngine.XR;
 using UnityEngine.TestTools.Graphics;
 using UnityEngine.SceneManagement;
+using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
 using UnityEngine.Experimental.Rendering.Universal;
 
@@ -24,9 +25,9 @@ public class UniversalGraphicsTests
 
     public IEnumerator Run(GraphicsTestCase testCase)
     {
-#if ENABLE_VR && ENABLE_XR_MODULE
+#if ENABLE_VR
         // XRTODO: Fix XR tests on macOS or disable them from Yamato directly
-        if (XRSystem.testModeEnabled && (Application.platform == RuntimePlatform.OSXEditor || Application.platform == RuntimePlatform.OSXPlayer))
+        if (XRGraphicsAutomatedTests.enabled && (Application.platform == RuntimePlatform.OSXEditor || Application.platform == RuntimePlatform.OSXPlayer))
             Assert.Ignore("Universal XR tests do not run on macOS.");
 #endif
         SceneManager.LoadScene(testCase.ScenePath);
@@ -36,14 +37,14 @@ public IEnumerator Run(GraphicsTestCase testCase)
 
         var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x=>x.GetComponent<Camera>());
         var settings = Object.FindObjectOfType<UniversalGraphicsTestSettings>();
-        Assert.IsNotNull(settings, "Invalid test scene, couldn't find UniversalGraphicsTestSettings");        
+        Assert.IsNotNull(settings, "Invalid test scene, couldn't find UniversalGraphicsTestSettings");
 
-#if ENABLE_VR && ENABLE_XR_MODULE
-        if (XRSystem.testModeEnabled)
+#if ENABLE_VR
+        if (XRGraphicsAutomatedTests.enabled)
         {
             if (settings.XRCompatible)
             {
-                XRSystem.automatedTestRunning = true;
+                XRGraphicsAutomatedTests.running = true;
             }
             else
             {
@@ -104,11 +105,11 @@ public void DumpImagesInEditor()
         UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test);
     }
 
-#if ENABLE_VR && ENABLE_XR_MODULE
+#if ENABLE_VR
     [TearDown]
     public void ResetSystemState()
     {
-        XRSystem.automatedTestRunning = false;
+        XRGraphicsAutomatedTests.running = false;
     }
 #endif
 #endif

com.unity.render-pipelines.universal/Runtime/ForwardRendererData.cs

@@ -53,8 +53,10 @@ public sealed class ShaderResources
         [Reload("Runtime/Data/PostProcessData.asset")]
         public PostProcessData postProcessData = null;
 
+#if ENABLE_VR && ENABLE_XR_MODULE
         [Reload("Runtime/Data/XRSystemData.asset")]
         public XRSystemData xrSystemData = null;
+#endif
 
         public ShaderResources shaders = null;
 
@@ -70,7 +72,9 @@ protected override ScriptableRenderer Create()
             {
                 ResourceReloader.TryReloadAllNullIn(this, UniversalRenderPipelineAsset.packagePath);
                 ResourceReloader.TryReloadAllNullIn(postProcessData, UniversalRenderPipelineAsset.packagePath);
+#if ENABLE_VR && ENABLE_XR_MODULE
                 ResourceReloader.TryReloadAllNullIn(xrSystemData, UniversalRenderPipelineAsset.packagePath);
+#endif
             }
 #endif
             return new ForwardRenderer(this);
@@ -139,7 +143,9 @@ protected override void OnEnable()
 #if UNITY_EDITOR
             ResourceReloader.TryReloadAllNullIn(this, UniversalRenderPipelineAsset.packagePath);
             ResourceReloader.TryReloadAllNullIn(postProcessData, UniversalRenderPipelineAsset.packagePath);
+#if ENABLE_VR && ENABLE_XR_MODULE
             ResourceReloader.TryReloadAllNullIn(xrSystemData, UniversalRenderPipelineAsset.packagePath);
+#endif
 #endif
         }
     }

com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs

@@ -551,6 +551,7 @@ static void InitializeStackedCameraData(Camera baseCamera, UniversalAdditionalCa
 
 #if ENABLE_VR && ENABLE_XR_MODULE
             cameraData.xr = m_XRSystem.emptyPass;
+            XRSystem.UpdateMSAALevel(msaaSamples);
             XRSystem.UpdateRenderScale(cameraData.renderScale);
 #else
             cameraData.xr = XRPass.emptyPass;

com.unity.render-pipelines.universal/Runtime/XR/XRSystem.cs

@@ -27,13 +27,6 @@ internal partial class XRSystem
         Material mirrorViewMaterial = null;
         MaterialPropertyBlock mirrorViewMaterialProperty = new MaterialPropertyBlock();
 
-        // Set by test framework
-        internal static bool automatedTestRunning = false;
-
-        // Used by test framework and to enable debug features
-        static bool testModeEnabledInitialization { get => Array.Exists(Environment.GetCommandLineArgs(), arg => arg == "-xr-tests"); }
-        internal static bool testModeEnabled = testModeEnabledInitialization;
-
         RenderTexture testRenderTexture = null;
 
         const string k_XRMirrorTag = "XR Mirror View";
@@ -109,7 +102,7 @@ internal int GetMaxViews()
                 // XRTODO : replace by API from XR SDK, assume we have 2 slices until then
                 maxViews = 2;
             }
-            else if (testModeEnabled)
+            else if (XRGraphicsAutomatedTests.enabled)
             {
                 maxViews = Math.Max(maxViews, 2);
             }
@@ -144,7 +137,7 @@ internal List<XRPass> SetupFrame(CameraData cameraData)
             bool isGameCamera = (camera.cameraType == CameraType.Game || camera.cameraType == CameraType.VR);
             bool xrSupported = isGameCamera && camera.targetTexture == null;
 
-            if (testModeEnabled && automatedTestRunning && isGameCamera && LayoutSinglePassTestMode(cameraData, new XRLayout() { camera = camera, xrSystem = this }))
+            if (XRGraphicsAutomatedTests.enabled && XRGraphicsAutomatedTests.running && isGameCamera && LayoutSinglePassTestMode(cameraData, new XRLayout() { camera = camera, xrSystem = this }))
             {
                 // test layout in used
             }