Merge remote-tracking branch 'refs/remotes/Unity-Technologies/master'

Author: keijiro

PostProcessing/Editor/Models/BuiltinDebugViewsEditor.cs

@@ -86,6 +86,7 @@ public override void OnInspectorGUI()
             else
             {
                 CheckActiveEffect(mode == (int)Mode.AmbientOcclusion && !profile.ambientOcclusion.enabled, "Ambient Occlusion");
+                CheckActiveEffect(mode == (int)Mode.FocusPlane && !profile.depthOfField.enabled, "Depth Of Field");
                 CheckActiveEffect(mode == (int)Mode.EyeAdaptation && !profile.eyeAdaptation.enabled, "Eye Adaptation");
                 CheckActiveEffect((mode == (int)Mode.LogLut || mode == (int)Mode.PreGradingLog) && !profile.colorGrading.enabled, "Color Grading");
                 CheckActiveEffect(mode == (int)Mode.UserLut && !profile.userLut.enabled, "User Lut");

PostProcessing/Resources/Shaders/BuiltinDebugViews.shader

@@ -29,7 +29,13 @@ Shader "Hidden/Post FX/Builtin Debug Views"
         {
             float depth = SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, UnityStereoScreenSpaceUVAdjust(i.uv, _CameraDepthTexture_ST));
             depth = Linear01Depth(depth) * _DepthScale;
-            return float4(depth.xxx, 1.0);
+            float3 d = depth.xxx;
+            
+        #if !UNITY_COLORSPACE_GAMMA
+            d = GammaToLinearSpace(d);
+        #endif
+
+            return float4(d, 1.0);
         }
 
         // -----------------------------------------------------------------------------
@@ -49,6 +55,11 @@ Shader "Hidden/Post FX/Builtin Debug Views"
         float4 FragNormals(VaryingsDefault i) : SV_Target
         {
             float3 n = SampleNormal(UnityStereoScreenSpaceUVAdjust(i.uv, _CameraDepthNormalsTexture_ST));
+
+        #if UNITY_COLORSPACE_GAMMA
+            n = LinearToGammaSpace(n);
+        #endif
+
             return float4(n, 1.0);
         }
 

PostProcessing/Resources/Shaders/DepthOfField.shader

@@ -18,6 +18,7 @@ Shader "Hidden/Post FX/Depth Of Field"
         Pass
         {
             CGPROGRAM
+                #pragma multi_compile __ UNITY_COLORSPACE_GAMMA
                 #pragma vertex VertDOF
                 #pragma fragment FragPrefilter
                 #include "DepthOfField.cginc"