Merge branch 'volumes-improvements' of https://github.com/Unity-Technologies/ScriptableRenderPipeline

ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs

             return mesh;
         }
 
-        public static void DisplayUnsupportedAPIMessage()
+        public static void DisplayUnsupportedMessage(string msg)
-            Debug.LogError("Platform " + SystemInfo.operatingSystem + " with device " + SystemInfo.graphicsDeviceType.ToString() + " is not supported, no rendering will occur");
+            Debug.LogError(msg);
-                sv.ShowNotification(new GUIContent("Platform " + SystemInfo.operatingSystem + " with device " + SystemInfo.graphicsDeviceType.ToString() + " is not supported, no rendering will occur"));
+                sv.ShowNotification(new GUIContent(msg));
+
+        public static void DisplayUnsupportedAPIMessage()
+        {
+            string msg = "Platform " + SystemInfo.operatingSystem + " with device " + SystemInfo.graphicsDeviceType.ToString() + " is not supported, no rendering will occur";
+            DisplayUnsupportedMessage(msg);
+        }
+
+        public static void DisplayUnsupportedXRMessage()
+        {
+            string msg = "AR/VR devices are not supported, no rendering will occur";
+            DisplayUnsupportedMessage(msg);
+        }        
 
         // Returns 'true' if "Animated Materials" are enabled for the view associated with the given camera.
         public static  bool AreAnimatedMaterialsEnabled(Camera camera)

ScriptableRenderPipeline/Core/CoreRP/Volume/VolumeComponent.cs

                 parameter.OnDisable();
         }
 
+        // You can override this to do your own blending. Either loop through the `parameters` list
+        // or reference direct fields (you'll need to cast `state` to your custom type and don't
+        // forget to use `SetValue` on parameters, do not assign directly to the state object - and
+        // of course you'll need to check for the `overrideState` manually).
+        protected internal virtual void Override(VolumeComponent state, float interpFactor)
+        {
+            int count = parameters.Count;
+
+            for (int i = 0; i < count; i++)
+            {
+                var stateParam = state.parameters[i];
+                var toParam = parameters[i];
+
+                // Keep track of the override state for debugging purpose
+                stateParam.overrideState = toParam.overrideState;
+
+                if (toParam.overrideState)
+                    stateParam.Interp(stateParam, toParam, interpFactor);
+            }
+        }
+
         public void SetAllOverridesTo(bool state)
         {
             SetAllOverridesTo(parameters, state);

ScriptableRenderPipeline/Core/CoreRP/Volume/VolumeManager.cs

                 if (!component.active)
                     continue;
 
-                var target = stack.GetComponent(component.GetType());
-                int count = component.parameters.Count;
-
-                for (int i = 0; i < count; i++)
-                {
-                    var fromParam = target.parameters[i];
-                    var toParam = component.parameters[i];
-
-                    // Keep track of the override state for debugging purpose
-                    fromParam.overrideState = toParam.overrideState;
-
-                    if (toParam.overrideState)
-                        fromParam.Interp(fromParam, toParam, interpFactor);
-                }
+                var state = stack.GetComponent(component.GetType());
+                component.Override(state, interpFactor);
             }
         }
 

ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs

 using System.Linq;
 using UnityEngine.Rendering.PostProcessing;
 using UnityEngine.Experimental.GlobalIllumination;
+using UnityEngine.XR;
 
 namespace UnityEngine.Experimental.Rendering.HDPipeline
 {
             if (!IsSupportedPlatform())
             {
                 CoreUtils.DisplayUnsupportedAPIMessage();
+
+                return false;
+            }
+
+            // VR is not supported currently in HD
+            if (XRSettings.isDeviceActive)
+            {
+                CoreUtils.DisplayUnsupportedXRMessage();
 
                 return false;
             }