[11.x.x] Batch of PRs (#2390)

* Merge of  #2283

commit 4168f84
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:53:27 2020 -0700

    Fixed typo.
    Updated CHANGELOG.md

commit d9b0581
Merge: 53b2082 8bc58a4
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:50:33 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention

commit 53b2082
Author: thomas-zeng <[email protected]>
Date:   Mon Oct 19 16:47:33 2020 -0700

    Fixed mirror view shader reading wrong viewport region from the eye textures.

* Merge of #2253

commit e5e780c
Author: Elvar Örn Unnþórsson <[email protected]>
Date:   Fri Oct 16 10:53:25 2020 +0200

    Hide warnings about mismatched particle normals

    We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
    This causes the standard particle gui to complain, but we should hide this error.

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md

* Merge of #2222

commit bfb132b
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 13 16:45:52 2020 -0700

    Fixed camera matrix not restored after modification.

* Merge of #2284

commit 502a242
Merge: 2c742d8 acaf95d
Author: Nigel John Williams <[email protected]>
Date:   Thu Oct 22 13:30:58 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 2c742d8
Merge: 00042cb 4acb87d
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:52:38 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 00042cb
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:16:20 2020 +0200

    Fix sun source warning text

    Changed sun source warning message to explicitly specify light window's environment settings.

commit 489e90f
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:00:56 2020 +0200

    Fix code comment about sun light

    Corrected legacy code comment about sun light for selection of main light.

commit 51e3147
Author: Nigel John Williams <[email protected]>
Date:   Fri Oct 16 16:50:03 2020 +0200

    Restrict sun source to only directional lights and display warning message if user changes the sun light type.

* Merge of #2135

commit 6633ec9
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:30:22 2020 -0700

    Updated CHANGELOG.md.

commit 7078aa1
Merge: a706832 52ec802
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:28:14 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/clamp-msaa

commit a706832
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 8 10:34:38 2020 -0700

    Added next power of 2 logic and clamp logic to XR msaa setter.

* Added missing changelog for #2284

Co-authored-by: Nigel John Williams <[email protected]>

Author: phi-lira

com.unity.render-pipelines.universal/CHANGELOG.md

@@ -6,8 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [11.0.0] - 2020-10-21
 
-Version Updated
-The version number for this package has increased due to a version update of a related graphics package.
+### Fixed
+- Removed the warning about mis-matched vertex streams when creating a default Particle System. [case 1285272](https://issuetracker.unity3d.com/issues/particles-urp-default-material-shows-warning-in-inspector)
+- Fixed latest mockHMD renderviewport scale doesn't fill whole view after scaling. [case 1286161] (https://issuetracker.unity3d.com/issues/xr-urp-renderviewportscale-doesnt-fill-whole-view-after-scaling)
+- Fixed camera renders black in XR when user sets invalid MSAA value.
+- Fixed an issue causing additional lights to stop working when set as the sun source. [case 1278768](https://issuetracker.unity3d.com/issues/urp-every-light-type-is-rendered-as-directional-light-if-it-is-set-as-sun-source-of-the-environment)
 
 ## [10.2.0] - 2020-10-19
 
@@ -18,6 +21,7 @@ The version number for this package has increased due to a version update of a r
 - Fixed the Unlit shader not being SRP Batcher compatible on OpenGLES/OpenGLCore. [case 1263720](https://issuetracker.unity3d.com/issues/urp-mobile-srp-batcher-is-not-visible-on-mobile-devices-in-frame-debugger)
 - Fixed an issue with soft particles not rendering correctly for overlay cameras with post processing. [case 1241626](https://issuetracker.unity3d.com/issues/soft-particles-does-not-fade-out-near-the-opaque-surfaces-when-post-processing-is-enabled-on-a-stacked-camera)
 
+
 ## [10.1.0] - 2020-10-12
 ### Added
 - Added support for the Shadowmask Mixed Lighting Mode (Forward only), which supports up to four baked-shadow Lights.

com.unity.render-pipelines.universal/Editor/ShaderGUI/ParticleGUI.cs

@@ -317,9 +317,9 @@ public static void DoVertexStreamsArea(Material material, List<ParticleSystemRen
 
                 bool streamsValid;
                 if (useGPUInstancing && renderer.renderMode == ParticleSystemRenderMode.Mesh && renderer.supportsMeshInstancing)
-                    streamsValid = rendererStreams.SequenceEqual(instancedStreams);
+                    streamsValid = CompareVertexStreams(rendererStreams, instancedStreams);
                 else
-                    streamsValid = rendererStreams.SequenceEqual(streams);
+                    streamsValid = CompareVertexStreams(rendererStreams, instancedStreams);
 
                 if (!streamsValid)
                     Warnings += "-" + renderer.name + "\n";
@@ -346,6 +346,22 @@ public static void DoVertexStreamsArea(Material material, List<ParticleSystemRen
             }
         }
 
+        private static bool CompareVertexStreams(IEnumerable<ParticleSystemVertexStream> a, IEnumerable<ParticleSystemVertexStream> b)
+        {
+            var differenceA = a.Except(b);
+            var differenceB = b.Except(a);
+            var difference = differenceA.Union(differenceB).Distinct();
+            if (!difference.Any())
+                return true;
+            // If normals are the only difference, ignore them, because the default particle streams include normals, to make it easy for users to switch between lit and unlit
+            if (difference.Count() == 1)
+            {
+                if (difference.First() == ParticleSystemVertexStream.Normal)
+                    return true;
+            }
+            return false;
+        }
+
         public static void SetMaterialKeywords(Material material)
         {
             // Setup particle + material color blending

com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineLightEditor.cs

@@ -25,6 +25,7 @@ class Styles
 
             public readonly GUIContent BakingWarning = EditorGUIUtility.TrTextContent("Light mode is currently overridden to Realtime mode. Enable Baked Global Illumination to use Mixed or Baked light modes.");
             public readonly GUIContent DisabledLightWarning = EditorGUIUtility.TrTextContent("Lighting has been disabled in at least one Scene view. Any changes applied to lights in the Scene will not be updated in these views until Lighting has been enabled again.");
+            public readonly GUIContent SunSourceWarning = EditorGUIUtility.TrTextContent("This light is set as the current Sun Source, which requires a directional light. Go to the Lighting Window's Environment settings to edit the Sun Source.");
 
             public readonly GUIContent ShadowsNotSupportedWarning = EditorGUIUtility.TrTextContent("Realtime shadows for point lights are not supported. Either disable shadows or set the light mode to Baked.");
             public static readonly GUIContent ShadowRealtimeSettings = EditorGUIUtility.TrTextContent("Realtime Shadows", "Settings for realtime direct shadows.");
@@ -111,6 +112,12 @@ public override void OnInspectorGUI()
 
             settings.DrawLightType();
 
+            Light light = target as Light;
+            if (LightType.Directional != light.type && light == RenderSettings.sun)
+            {
+                EditorGUILayout.HelpBox(s_Styles.SunSourceWarning.text, MessageType.Warning);
+            }
+
             EditorGUILayout.Space();
 
             // When we are switching between two light types that don't show the range (directional and area lights)
@@ -141,7 +148,6 @@ public override void OnInspectorGUI()
             using (var group = new EditorGUILayout.FadeGroupScope(1.0f - m_AnimAreaOptions.faded))
                 if (group.visible)
                 {
-                    Light light = target as Light;
                     if (light.type != LightType.Disc)
                     {
                         settings.DrawLightmapping();

com.unity.render-pipelines.universal/Runtime/Passes/DrawSkyboxPass.cs

@@ -45,13 +45,19 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
                     context.ExecuteCommandBuffer(cmd);
 
                     CommandBufferPool.Release(cmd);
+
+                    renderingData.cameraData.camera.ResetStereoProjectionMatrices();
+                    renderingData.cameraData.camera.ResetStereoViewMatrices();
                 }
                 else
                 {
                     renderingData.cameraData.camera.projectionMatrix = renderingData.cameraData.GetProjectionMatrix(0);
                     renderingData.cameraData.camera.worldToCameraMatrix = renderingData.cameraData.GetViewMatrix(0);
 
                     context.DrawSkybox(renderingData.cameraData.camera);
+
+                    renderingData.cameraData.camera.ResetProjectionMatrix();
+                    renderingData.cameraData.camera.ResetWorldToCameraMatrix();
                 }
             }
             else

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

@@ -1017,14 +1017,18 @@ static int GetMainLightIndex(UniversalRenderPipelineAsset settings, NativeArray<
                 if (currLight == null)
                     break;
 
-                if (currLight == sunLight)
-                    return i;
-
-                // In case no shadow light is present we will return the brightest directional light
-                if (currVisibleLight.lightType == LightType.Directional && currLight.intensity > brightestLightIntensity)
+                if (currVisibleLight.lightType == LightType.Directional)
                 {
-                    brightestLightIntensity = currLight.intensity;
-                    brightestDirectionalLightIndex = i;
+                    // Sun source needs be a directional light
+                    if (currLight == sunLight)
+                        return i;
+
+                    // In case no sun light is present we will return the brightest directional light
+                    if (currLight.intensity > brightestLightIntensity)
+                    {
+                        brightestLightIntensity = currLight.intensity;
+                        brightestDirectionalLightIndex = i;
+                    }
                 }
             }
 

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

@@ -86,6 +86,12 @@ internal static void XRSystemInit()
 
         internal static void UpdateMSAALevel(int level)
         {
+            if (msaaLevel == level)
+                return;
+
+            level = Mathf.NextPowerOfTwo(level);
+            level = Mathf.Clamp(level, (int)MsaaQuality.Disabled, (int)MsaaQuality._8x);
+
             GetDisplaySubsystem();
 
 #if UNITY_2020_2_OR_NEWER

com.unity.render-pipelines.universal/Shaders/XR/XRMirrorView.hlsl

@@ -28,6 +28,11 @@ Varyings VertQuad(Attributes input)
     Varyings output;
     output.positionCS = GetQuadVertexPosition(input.vertexID) * float4(_ScaleBiasRt.x, _ScaleBiasRt.y, 1, 1) + float4(_ScaleBiasRt.z, _ScaleBiasRt.w, 0, 0);
     output.positionCS.xy = output.positionCS.xy * float2(2.0f, -2.0f) + float2(-1.0f, 1.0f); //convert to -1..1
+
+#if UNITY_UV_STARTS_AT_TOP
+    // Unity viewport convention is bottom left as origin. Adjust Scalebias to read the correct region.
+    _ScaleBias.w = 1 - _ScaleBias.w - _ScaleBias.y;
+#endif
     output.texcoord = GetQuadTexCoord(input.vertexID) * _ScaleBias.xy + _ScaleBias.zw;
     return output;
 }